Skip to content

Commit

Permalink
fixed typo
Browse files Browse the repository at this point in the history
  • Loading branch information
dekuNukem committed Jun 10, 2018
1 parent 5467197 commit fc297ef
Show file tree
Hide file tree
Showing 26 changed files with 996 additions and 878 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ void loop()
break;
}

my_tube1.set_led(127, 0, 127); // purple;
my_tube2.set_led(127, 127, 0); // yellow;
delay(250);
my_tube1.set_led(127, 40, 0); // orange;
my_tube2.set_led(127, 0, 127); // purple;

delay(500);
}
46 changes: 23 additions & 23 deletions firmware/exixe12/MDK-ARM/exixe.uvguix.Allen

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion firmware/exixe12/MDK-ARM/exixe.uvoptx
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>ST-LINKIII-KEIL_SWO</Key>
<Name>-U51FF6B064967535537120487 -O2254 -S1 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO11 -FD20000000 -FC800 -FN1 -FF0STM32F0xx_32.FLM -FS08000000 -FL08000 -FP0($$Device:STM32F042K6$Flash\STM32F0xx_32.FLM)</Name>
<Name>-U51FF6B064967535537120487 -O2254 -S1 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F0xx_32.FLM -FS08000000 -FL08000 -FP0($$Device:STM32F042K6$Flash\STM32F0xx_32.FLM)</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint/>
Expand Down
2 changes: 1 addition & 1 deletion firmware/exixe12/MDK-ARM/exixe.uvprojx
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
<RunIndependent>0</RunIndependent>
<UpdateFlashBeforeDebugging>1</UpdateFlashBeforeDebugging>
<Capability>1</Capability>
<DriverSelection>4100</DriverSelection>
<DriverSelection>4103</DriverSelection>
</Flash1>
<bUseTDR>1</bUseTDR>
<Flash2>STLink\ST-LINKIII-KEIL_SWO.dll</Flash2>
Expand Down
42 changes: 21 additions & 21 deletions firmware/exixe14/MDK-ARM/exixe.uvguix.Allen

Large diffs are not rendered by default.

Binary file modified firmware/exixe14/MDK-ARM/exixe/exixe.axf
Binary file not shown.
3 changes: 3 additions & 0 deletions firmware/exixe14/MDK-ARM/exixe/exixe.build_log.htm
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ <h2>Project:</h2>
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 1 (build 61)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
Build target 'exixe'
linking...
Program Size: Code=9980 RO-data=248 RW-data=8 ZI-data=1720
FromELF: creating hex file...
"exixe\exixe.axf" - 0 Error(s), 0 Warning(s).

<h2>Software Packages used:</h2>
Expand Down
2 changes: 1 addition & 1 deletion firmware/exixe14/MDK-ARM/exixe/exixe.htm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<title>Static Call Graph - [exixe\exixe.axf]</title></head>
<body><HR>
<H1>Static Call Graph for image exixe\exixe.axf</H1><HR>
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060061: Last Updated: Tue Feb 06 12:50:47 2018
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060061: Last Updated: Sun May 13 17:01:21 2018
<BR><P>
<H3>Maximum Stack Usage = 212 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
Call chain for Maximum Stack Depth:</H3>
Expand Down
1,652 changes: 826 additions & 826 deletions firmware/exixe14/MDK-ARM/exixe/exixe_exixe.dep

Large diffs are not rendered by default.

Binary file modified firmware/exixe14/MDK-ARM/exixe/stm32f0xx_hal_dma.crf
Binary file not shown.
Binary file modified firmware/exixe14/MDK-ARM/exixe/stm32f0xx_hal_dma.o
Binary file not shown.
Binary file modified firmware/exixe14/MDK-ARM/exixe/stm32f0xx_hal_flash_ex.crf
Binary file not shown.
Binary file modified firmware/exixe14/MDK-ARM/exixe/stm32f0xx_hal_flash_ex.o
Binary file not shown.
Binary file modified firmware/exixe14/MDK-ARM/exixe/stm32f0xx_hal_pwr_ex.crf
Binary file not shown.
Binary file modified firmware/exixe14/MDK-ARM/exixe/stm32f0xx_hal_pwr_ex.o
Binary file not shown.
Binary file modified firmware/exixe14/MDK-ARM/exixe/stm32f0xx_hal_rcc.crf
Binary file not shown.
Binary file modified firmware/exixe14/MDK-ARM/exixe/stm32f0xx_hal_rcc.o
Binary file not shown.
Binary file modified firmware/exixe14/MDK-ARM/exixe/stm32f0xx_hal_rcc_ex.crf
Binary file not shown.
Binary file modified firmware/exixe14/MDK-ARM/exixe/stm32f0xx_hal_rcc_ex.o
Binary file not shown.
Binary file modified firmware/exixe14/MDK-ARM/exixe/stm32f0xx_hal_tim.crf
Binary file not shown.
Binary file modified firmware/exixe14/MDK-ARM/exixe/stm32f0xx_hal_tim.o
Binary file not shown.
4 changes: 2 additions & 2 deletions making_some.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ Full BOM here: [exixe12](resources/exixe12_bom.xlsx), [exixe14](resources/exixe1

## Upload Firmware

Once you have soldered the board together, you will need to uplaod the firmware to the STM32 microcontroller in order for the boards to function.
Once you have soldered the board together, you will need to upload the firmware to the STM32 microcontroller in order for the boards to function.

To do that you need a ST-Link V2 programmer, they are dirt cheap on ebay (around $4), just search "ST-Link V2". It should look like this:
To do that you need a ST-Link V2 programmer. Just search "ST-Link V2" on ebay, they are dirt cheap (around $3). It should look like this:

![Alt text](resources/st-link-dongle.jpg)

Expand Down
Binary file modified resources/exixe12_bom.xlsx
Binary file not shown.
63 changes: 63 additions & 0 deletions resources/exixe_led_crossfade/5_multiple_tubes_crossfade.ino
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
/*
exixe modules:
https://github.com/dekuNukem/exixe
library docs:
https://github.com/dekuNukem/exixe/tree/master/arduino_library
Demo 5: Loop digits on two tubes with crossfade animation
*/

#define RAINBOW_COLORS 6

#include "exixe.h"

// change those to the cs pins you're using
int cs1 = 10;
int cs2 = 9;
unsigned char count;

unsigned char cl_red[RAINBOW_COLORS] = {148, 0, 0, 255, 255, 255};
unsigned char cl_green[RAINBOW_COLORS] = {0, 0, 255, 255, 127, 0};
unsigned char cl_blue[RAINBOW_COLORS] = {211, 255, 0, 0, 0, 0};


exixe my_tube1 = exixe(cs1);
exixe my_tube2 = exixe(cs2);

void setup()
{
// ONLY CALL THIS ONCE
my_tube1.spi_init();

my_tube1.clear();
my_tube2.clear();
randomSeed(analogRead(0));
}

void loop()
{
count = (count + 1) % 10; // keep count between 0 to 9
unsigned char cc1 = random(RAINBOW_COLORS);
unsigned char cc2 = random(RAINBOW_COLORS);

my_tube1.crossfade_init(count, 15, 127, 0, cl_red[cc1]/2, cl_green[cc1]/2, cl_blue[cc1]/2);
my_tube2.crossfade_init(10-count, 15, 127, 0, cl_red[cc2]/2, cl_green[cc2]/2, cl_blue[cc2]/2);

/*
again, crossfade_run() is non-blocking, that means
you can run other tasks in the loop.
just make sure to call it at least every 33ms
and check its return value to see if it's finished.
*/
while(1)
{
unsigned char result1 = my_tube1.crossfade_run();
unsigned char result2 = my_tube2.crossfade_run();
// exit when both animations are finished
if(result1 == EXIXE_ANIMATION_FINISHED && result2 == EXIXE_ANIMATION_FINISHED)
break;
}

delay(500);
}
51 changes: 51 additions & 0 deletions resources/exixe_led_crossfade/colortest/colortest.ino
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
exixe modules:
https://github.com/dekuNukem/exixe
library docs:
https://github.com/dekuNukem/exixe/tree/master/arduino_library
Demo 3: Loop digits with crossfade animation
*/

#define RAINBOW_COLORS 6

#include "exixe.h"

// change this to the cs pin you're using
int cs_pin = 10;
unsigned char count;
exixe my_tube = exixe(cs_pin);

unsigned char cl_red[RAINBOW_COLORS] = {148, 0, 0, 255, 255, 255};
unsigned char cl_green[RAINBOW_COLORS] = {0, 0, 255, 255, 127, 0};
unsigned char cl_blue[RAINBOW_COLORS] = {211, 255, 0, 0, 0, 0};

void setup()
{
my_tube.spi_init();
my_tube.clear();
}

void loop()
{
count = (count + 1) % RAINBOW_COLORS;
/*
1st arg: Digit to show, 0 to 9
2nd arg: how many frames does crossfade last, 30 frames = 1 second
3rd arg: digit brightness, 0 to 127
4th arg: overdrive, 0 disable 1 enable
This function sets up the crossfade animation
call crossfade_run() to actually start it
*/
my_tube.crossfade_init(count, 15, 127, 0, cl_red[count]/2, cl_green[count]/2, cl_blue[count]/2);

// crossfade_run() is non-blocking and returns right away
// call it regularly(at least every 33ms) for a smooth animation
// check its return value to see if the animation is finished
while(my_tube.crossfade_run() == EXIXE_ANIMATION_IN_PROGRESS)
;

delay(250);
}
Binary file added resources/exixe_led_crossfade/exixe_ledfade.zip
Binary file not shown.

0 comments on commit fc297ef

Please sign in to comment.