fix LEDs

2026-03-20 08:40:58 +03:00 · 2014-08-12 01:10:45 +04:00
parent f923706b9b
commit c83210631f
10 changed files with 278 additions and 188 deletions
--- a/DRUM/CD74HC154_LEDs.c
+++ b/DRUM/CD74HC154_LEDs.c
@@ -21,8 +21,29 @@

 #include "CD74HC154_LEDs.h"

+
 // bits array: contains numbers of LED's bits to shine (0..6) with zero 4th bit or 0x1x for OFF
 U8 LED_bits[LEDS_AMOUNT];
+U8 effect_cntr = 0;
+char effect_increment = 1; // adds to effect_cntr (1 or -1)
+
+U8 *current_effect = NULL;
+
+U8 LED_effect = 0;
+
+// arrays of LED effects, array should be ended with 0
+#define EFFECTS_NUM 4
+U8 growing_strip[] = {64, 1, 3, 7, 15, 31, 63, 0}; // *; **; ***; ****; ...
+U8 collider[] = {33, 18, 12, 12, 18, 33, 0}; // *....*; .*..*.; ..**..; ...
+U8 harvest[] = {32, 16, 8,  4, 2, 1, // *.....; .*....; ..*...; ...*..; ....*.; .....*;
+                33, 17, 9,  5, 3,    // *....*; .*...*; ..*..*; ...*.*; ....**;
+                35, 19, 11, 7,       // *...**; .*..**; ..*.**; ...***;
+                39, 23, 15,          // *..***; .*.***; ..****;
+                47, 31,              // *.****; .*****;
+                63,               0};// ******
+U8 reflections[] = {1,2,4,8,16,32,0}; // <-*->
+U8 *EFFECTS[EFFECTS_NUM] = {growing_strip, collider,
+		harvest, reflections}; // array of avaialable effects

 /**
 * Initialize bit array for LEDs blinking
@@ -52,4 +73,28 @@ void reset_LEDs(){
 	U8 i;
 	for(i = 0; i < LEDS_AMOUNT; i++)
 		LED_bits[i] = 0x10;
+	LED_effect = 0;
+}
+
+/**
+ * Increment effect counter & set new LED number
+ */
+void next_LED_in_effects(){
+	if(!current_effect) return;
+	set_LEDs(current_effect[effect_cntr]);
+	if(effect_cntr == 0 && effect_increment == -1){ // left border - go to the right
+		effect_increment = 1;
+	}
+	effect_cntr += effect_increment;
+	if(current_effect[effect_cntr] == 0){ // right border - go to the left
+		effect_increment = -1;
+		effect_cntr -= 2; // and go to left from previous element
+	}
+}
+
+void set_effect(U8 n){
+	if(n < EFFECTS_NUM){
+		current_effect = EFFECTS[n];
+		LED_effect = 1;
+	}
 }
--- a/DRUM/CD74HC154_LEDs.h
+++ b/DRUM/CD74HC154_LEDs.h
@@ -25,11 +25,13 @@

 #include "ports_definition.h"

-#define LEDS_AMOUNT 6    // we have only 6 LEDs on drum
+extern U8 LED_effect;

 void set_LEDs(U16 mask);
 void blink_next_LED();
 void reset_LEDs();
+void next_LED_in_effects();
+void set_effect(U8 n);

 #endif // __CD74HC154_LEDS_H__

--- a/DRUM/interrupts.c
+++ b/DRUM/interrupts.c
@@ -96,7 +96,8 @@ INTERRUPT_HANDLER(TIM5_CAP_COM_IRQHandler, 14){}
 #else // STM8S208, STM8S207, STM8S105 or STM8S103 or STM8AF62Ax or STM8AF52Ax or STM8AF626x

 // Timer2 Update/Overflow/Break Interrupt
-INTERRUPT_HANDLER(TIM2_UPD_OVF_BRK_IRQHandler, 13){ // generate pulses for stepper CLK
+// Timer2 runs with F*16 to change voltage level (F - frequency of sound)
+INTERRUPT_HANDLER(TIM2_UPD_OVF_BRK_IRQHandler, 13){
 	if(TIM2_SR1 & TIM_SR1_UIF){
 		sample_flag = 1;
 		TIM2_SR1 &= ~TIM_SR1_UIF;
--- a/DRUM/main.c
+++ b/DRUM/main.c
@@ -215,11 +215,15 @@ int main() {
 				}
 			}
 		}
+		// paused_val is period of LEDs effects -> move to next number if EFFECT != 0
 		if((Global_time - T > paused_val) || (T > Global_time)){
 			T = Global_time;
 			#ifdef UART
 			PORT(LED_PORT, ODR) ^= LED_PIN; // blink on-board LED
 			#endif
+			if(LED_effect){
+				next_LED_in_effects();
+			}
 		}
 		#ifdef UART
 		if(UART_read_byte(&rb)){ // buffer isn't empty
@@ -231,7 +235,9 @@ int main() {
 						"P/p\tBoom\n"
 						"F\tSet frequency\n"
 						"L\tChange boom length (in ms)\n"
-						"l\tblink LEDs by mask"
+						"l\tblink LEDs by mask\n"
+						"r\treset LEDs\n"
+						"E\tset effect\n"
 						);
 				break;
 				break;
@@ -264,6 +270,12 @@ int main() {
 						set_LEDs(Ival);
 					}else error_msg("bad bitmask");
 				break;
+				case 'r':
+					reset_LEDs();
+				break;
+				case 'E':
+					if(readInt(&Ival)) set_effect(Ival);
+				break;
 			}
 		}
 		#endif
--- a/DRUM/ports_definition.h
+++ b/DRUM/ports_definition.h
@@ -39,7 +39,7 @@

 // LEDs on drum: PB0..3 - LED number, PB4 - on(0)/off(1)
 #define LEDS_PORT		PB
-
+#define LEDS_AMOUNT 6    // we have only 6 LEDs on drum


 #endif // __PORTS_DEFINITION_H__
--- a/DRUM/testproj.ihx
+++ b/DRUM/testproj.ihx
@@ -5,7 +5,7 @@
 :2081200004A5202751AE5241F66B017B04A4804D27FD7B0188CD81F484AE00011F02C600E7
 :208140001E97C6001E4CC7001E4F9572FB027B01F7C6001DC1001E2612C6001D4CC7001D82
 :20816000C6001DA1082604725F001DC6001EA1082604725F001E5B048080AE5342F64424B5
-:208180001E90CE001172A90001C60010A90097C6000FA9009590CF0011CF000FCD8781AE3C
+:208180001E90CE001172A90001C60010A90097C6000FA9009590CF0011CF000FCD87DAAEE3
 :2081A00053427F8080AE52607FAE5261A603F7AE530CA604F7AE52627FAE5263A610F7AE7E
 :2081C00052657FAE5266A608F7AE5258A660F7AE525CA601F7AE530DA67FF7AE530E7FAEA9
 :1481E00052547FAE5301A601F7AE526DF6AA80AE526DF78154
@@ -13,76 +13,84 @@
 :20802000820080FA820080FB8200000082000000820080FC820080FD820080FE820080FF45
 :2080400082008112820081138200811482000000820000008200811582008116820081178F
 :20806000820081798200817A820081A48200000082000000820000008200000082000000D6
-:1D808300AE000E2707724F00005A26F9AE00122709D68A45D7000E5A26F7CC8080FF
-:03808000CC8407A6
+:1D808300AE000E2707724F00005A26F9AE004B2709D68B15D7000E5A26F7CC8080F5
+:03808000CC8406A7
 :2081F400AE52417B03F7AE5240F6A54027F881160390F64D2710905CAE5241F7AE5240F67D
 :20821400A54026ED20F6815202C6001EC1001D26034F20271605AE00011F01C6001D97C6BC
 :20823400001D4CC7001D4F9572FB01F690F7C6001DA1082604725F001DA6015B0281521C77
 :208254005F1F101F0E7B21A1042303CC83287B21A1032603CC83280D212603CC8328965CD1
-:208274001F1B4F5F9772FB1B7F4CA10C25F51E1B1C000AA60AF77B21A101270E7B21A10299
-:20829400271C7B21A104272120301E1FF66B1A5F0F171F0F7B1A6B117B176B0E201C161FB6
-:2082B40090FE5F17101F0E20111E1FE6036B16E602FE6B101F0E7B166B11A6096B0D4B0A7A
-:2082D4005F894B001E14891E1489CD87C55B089F887B0E6B13840A0D5F417B124172FB1BA6
-:2082F400AB30F74B0A5F894B001E14891E1489CD88425B081F10170E1E1026041E0E27069B
-:208314007B0DA1FF2CB87B0D4C5F9772FB1B89CD82035B025B1C815217CE00111F0ACE007C
-:208334000F1F085F1F061F040F020F01961C000389CD821B5B024D276B7B03A1302403CC05
-:2083540083DA7B03A1392303CC83DAA6016B021E06891E06894B0A5F894B00CD88E15B0876
-:208374001F1617147B030F125F90977B12909572F9169F1915979E19149572A200309FA2E8
-:20839400006B0D9EA20017066B047B0D6B05AEFFFF13064F12054F120424095F1F061F0429
-:2083B400A6016B0190CE001172F20AC60010120995C6000F12089790A327109EA2009FA2C2
-:2083D400002403CC83400D0126040D0226034F200716061E1AFFA6015B1781AE86BB89CDBB
-:2083F40082035B021E0389CD82035B024B0ACD81F4848152115F1F061F04AE7F60F6AA015A
-:20841400AE7F60F7AE50C67FAE5345A607F7AE5346A67DF7AE5341A601F7AE5340A685F7F3
-:20843400AE50A0A610F7AE500CF6AA04AE500CF7AE500DF6AA04AE500DF7AE5011F6AA20AE
-:20845400AE5011F7AE500FF6A4DFAE500FF7AE5007F6AA1FAE5007F7AE5008F6AA1FAE50F5
-:2084740008F7AE500CF6AA02AE500CF7AE500AF6A4FDAE500AF7AE5242A611F7AE5243A6C5
-:2084940006F7AE5245A62CF7CD81A59A725D001C2603CC8520C60012C000169097C60011FF
-:2084B400C200159095C60010C2001495C6000FC2001390C300172214CE0011C30015C600A4
-:2084D40010C20014C6000FC200132410AE5250F6AA08AE5250F7AE53007F2030935858581A
-:2084F4005890CE001765A61089100285725D001B270EAE52657FAE52667F725F001B200C60
-:20851400AE52657FAE5266F73501001BCE001172F0061F10C6001012056B0FC6000F1204ED
-:20853400CE0019905F881311909F1210909E12015B012511CE00111306C600101205C600D6
-:208554000F12042414CE00111F06CE000F1F04AE500AF6A804AE500AF7965C89CD821B5BBD
-:20857400024D2603CC84A07B01A12B273EA12D2759A1462603CC85FDA1482723A14C2603DD
-:20859400CC8658A1502603CC8637A1682711A16C2603CC8686A1702603CC8637CC84A0AECA
-:2085B40086C489CD82035B02CC84A0CE00191C0064CF0019CE0019A327102203CC84A035DB
-:2085D400F4001A35010019CC84A0CE00191D0064CF0019CE0019A300642503CC84A035F4BB
-:2085F400001A35010019CC84A0965C5C89CD832B5B024D27221E02A30040231B1E02A610B2
-:20861400629E0F0CAE530DF71E02A610620F0A9FAE530EF7CC84A0AE872689CD83EF5B02C0
-:20863400CC84A090CE0011CE000F90CF0015CF0013725F001BAE5250A685F7AE5300A6850A
-:20865400F7CC84A0965C5C89CD832B5B024D27161E02A303E8240F1E02A3000123081E02F6
-:20867400CF0017CC84A0AE873189CD83EF5B02CC84A0965C5C89CD832B5B024D27197B03DB
-:20869400A43F6B090F081E021308260B1E0289CD87485B02CC84A0AE873C89CD83EF5B02C4
-:2086B400CC84A05B1181010A4552524F523A20000A50524F544F3A0A2B2F2D094C45442073
-:2086D400706572696F640A502F7009426F6F6D0A4609536574206672657175656E63790AF3
-:2086F4004C094368616E676520626F6F6D206C656E6774682028696E206D73290A6C096233
-:208714006C696E6B204C454473206279206D61736B0062616420706572696F640062616477
-:14873400206C656E67746800626164206269746D61736B005D
-:118A46000000000000000000006401F40000000000C6
-:208748005206AE00091F050F015F7B019772FB057B0AA4016B040F03160327067B016B0210
-:208768002004A6106B027B02F70C011E09541F097B01A10625D35B06815202AE00091F015E
-:20878800C6002097C600204CC700204F9572FB01F6AE5005F7C60020A1062604725F002051
-:1D87A8005B02815202AE00091F014F5F9772FB0188A610F7844CA10625F15B028158
-:018A5700001E
-:2087C50052040F020F017B0B484F494D262E160D1E0B905859170D1F0B1E09130D7B08125F
-:2087E5000C7B07120B240D160D1E0B549056170D1F0B20080C017B016B0220CA7B026B04D0
-:208805001E09130D7B08120C7B07120B2513160972F20D7B08120C977B07120B9517091F59
-:2088250007160D1E0B549056170D1F0B7B046B030A040D0326CA1E0916075B048152125F76
-:208845001F051F03A6206B027B15484F496B0116171E1590585917171F157B036B0F1E04A1
-:20886500887B076B1384081259090F1F047B126B067B0F6B030D01271A7B06AA016B0A7BD8
-:20888500056B097B046B087B036B0716091705160717031E05131B7B04121A7B031219253C
-:2088A5002B160572F21B7B04121A6B0C7B03121917056B037B0C6B047B18AA0190977B17AC
-:2088C50090957B16977B159517171F150A020D022703CC884D1E1716155B128152409096D3
-:2088E500905C961C00431F0B1E0BE603961C00471F151E151F171E171F3F1E3F88E60197CA
-:20890500844290FF72A900021E0BE6031E151F111E111F131E131F191E1988E6039784429C
-:2089250090FF965C1F1B1E1BF66B1D1E0BF697161590E603429F1B1D1E1BF71E1BF66B1E65
-:208945001E0BE60197161590E602429F1B1E1E1BF79096905C93FE1F1F1E0BE6011E151F3B
-:20896500211E211F231E231F251E2588E60397844272FB1F90FF93FE1F271E0BE6021E1584
-:208985001F291E291F2B1E2B1F2F1E2F88E60297844272FB2790FF160B1E0BE6021E151FA1
-:2089A500311E311F331E331F351E3588E6019784429F90F71E0B5C1F371E0BE60290971EC5
-:2089C50015E60390421E37FF16151E0BE6031E151F3D1E3D1F051E0588F69784429F90F7FF
-:2089E5001E155C1F2D1E0BE60390971E15E60290421E2DFF1E151C00037F1E0B1C00037F8F
-:208A0500965CE6036B0AE6026B09E6016B08F61643170D164572F909173B887B09190F6B18
-:208A25003B84190D6B39163BEF021639FFFE16491E4772F93B9F193A979E193995515B40B6
-:018A450081AF
+:208274001F124F5F9772FB127F4CA10C25F51E121C000AA60AF77B21A101270E7B21A102B4
+:20829400271C7B21A104272120301E1FF66B185F0F151F0F7B186B117B156B0E201C161FBE
+:2082B40090FE5F17101F0E20111E1FE6036B1CE602FE6B101F0E7B1C6B11A6096B0D4B0A6E
+:2082D4005F894B001E14891E1489CD88955B089F887B0E6B15840A0D5F417B144172FB12DA
+:2082F400AB30F74B0A5F894B001E14891E1489CD89125B081F10170E1E1026041E0E2706CA
+:208314007B0DA1FF2CB87B0D4C5F9772FB1289CD82035B025B1C815217CE00111F09CE0086
+:208334000F1F075F1F051F030F010F0B965C5C89CD821B5B024D276B7B02A1302403CC83E4
+:20835400D97B02A1392303CC83D9A6016B011E05891E05894B0A5F894B00CD89B15B081F0F
+:208374001217107B020F0E5F90977B0E909572F9129F1911979E19109572A200309FA20024
+:208394006B159EA20017056B037B156B04AEFFFF13054F12044F120324095F1F051F03A67B
+:2083B400016B0B90CE001172F209C60010120895C6000F12079790A327109EA2009FA20061
+:2083D4002403CC83400D0B26040D0126034F200716051E1AFFA6015B1781AE86F989CD82F3
+:2083F400035B021E0389CD82035B024B0ACD81F4848152115F1F051F03AE7F60F6AA01AE30
+:208414007F60F7AE50C67FAE5345A607F7AE5346A67DF7AE5341A601F7AE5340A685F7AEF3
+:2084340050A0A610F7AE500CF6AA04AE500CF7AE500DF6AA04AE500DF7AE5011F6AA20AEAE
+:208454005011F7AE500FF6A4DFAE500FF7AE5007F6AA1FAE5007F7AE5008F6AA1FAE50089B
+:20847400F7AE500CF6AA02AE500CF7AE500AF6A4FDAE500AF7AE5242A611F7AE5243A606C7
+:20849400F7AE5245A62CF7CD81A59A725D001C2603CC851FC60012C000169097C60011C244
+:2084B40000159095C60010C2001495C6000FC2001390C300172214CE0011C30015C6001056
+:2084D400C20014C6000FC200132410AE5250F6AA08AE5250F7AE53007F20309358585858D2
+:2084F40090CE001765A61089100285725D001B270EAE52657FAE52667F725F001B200CAE0A
+:2085140052657FAE5266F73501001BCE001172F0051F0EC6001012046B0DC6000F1203CED4
+:208534000019905F88130F909F120E909E12015B012511CE00111305C600101204C6000F9B
+:208554001203241DCE00111F05CE000F1F03AE500AF6A804AE500AF7725D00242703CD8894
+:2085740022961C000789CD821B5B024D2603CC849F7B07A12B274FA12D2603CC85F9A1456C
+:208594002603CC86DDA1462603CC8618A148272AA14C2603CC867AA1502603CC8651A16813
+:2085B4002718A16C2603CC86A7A1702603CC8651A1722603CC86D7CC849FAE870289CD82F9
+:2085D400035B02CC849FCE00191C0064CF0019CE0019A327102203CC849F35F4001A35019B
+:2085F4000019CC849FCE00191D0064CF0019CE0019A300642503CC849F35F4001A35010091
+:2086140019CC849F965C89CD832B5B024D27221E01A30040231B1E01A610629E0F0AAE5326
+:208634000DF71E01A610620F089FAE530EF7CC849FAE877F89CD83EE5B02CC849F90CE001B
+:20865400111714CE000F7B15C700167B14C70015CF0013725F001BAE5250A685F7AE5300D4
+:20867400A685F7CC849F965C89CD832B5B024D27161E01A303E8240F1E01A3000123081E0C
+:2086940001CF0017CC849FAE878A89CD83EE5B02CC849F965C89CD832B5B024D27197B02C1
+:2086B400A43F6B110F101E011310260B1E0189CD87A15B02CC849FAE879589CD83EE5B02DE
+:2086D400CC849FCD8804CC849F965C89CD832B5B024D2603CC849F7B0288CD887584CC84F4
+:2086F4009F5B1181010A4552524F523A20000A50524F544F3A0A2B2F2D094C4544207065AF
+:2087140072696F640A502F7009426F6F6D0A4609536574206672657175656E63790A4C0932
+:208734004368616E676520626F6F6D206C656E6774682028696E206D73290A6C09626C6972
+:208754006E6B204C454473206279206D61736B0A72097265736574204C4544730A45097322
+:208774006574206566666563740A0062616420706572696F6400626164206C656E677468E2
+:0D87940000626164206269746D61736B00A6
+:118B16000000000000000000006401F40000000000F5
+:2087A1005206AE00091F050F015F7B019772FB057B0AA4016B040F03160327067B016B02B7
+:2087C1002004A6106B027B02F70C011E09541F097B01A10625D35B06815202AE00091F0105
+:2087E100C6005997C600594CC700594F9572FB01F6AE5005F7C60059A1062604725F0059DB
+:208801005B02815202AE00091F014F5F9772FB0188A610F7844CA10625F1725F00245B0287
+:2088210081CE0022274DC60023CB002097C60022A90095F65F9789CD87A15B02725D00200B
+:20884100260BC60021A1FF260435010021C60020CB0021C70020C60023CB002097C60022D2
+:20886100A90095F64D260C35FF0021C60020A002C700208152027B05A1042415AE00511F2F
+:14888100015F7B05975872FB01FECF0022350100245B02817F
+:208B27000001000000400103070F1F3F0021120C0C12210020100804020121110905032352
+:1A8B4700130B0727170F2F1F3F00010204081020000025002D0034004A0006
+:2088950052040F020F017B0B484F494D262E160D1E0B905859170D1F0B1E09130D7B08128E
+:2088B5000C7B07120B240D160D1E0B549056170D1F0B20080C017B016B0220CA7B026B04FF
+:2088D5001E09130D7B08120C7B07120B2513160972F20D7B08120C977B07120B9517091F89
+:2088F50007160D1E0B549056170D1F0B7B046B030A040D0326CA1E0916075B048152125FA6
+:208915001F051F03A6206B027B15484F496B0116171E1590585917171F157B036B0F1E04D0
+:20893500887B076B1384081259090F1F047B126B067B0F6B030D01271A7B06AA016B0A7B07
+:20895500056B097B046B087B036B0716091705160717031E05131B7B04121A7B031219256B
+:208975002B160572F21B7B04121A6B0C7B03121917056B037B0C6B047B18AA0190977B17DB
+:2089950090957B16977B159517171F150A020D022703CC891D1E1716155B12815240909631
+:2089B500905C961C00431F0B1E0BE603961C00471F151E151F171E171F3F1E3F88E60197F9
+:2089D500844290FF72A900021E0BE6031E151F111E111F131E131F191E1988E603978442CC
+:2089F50090FF965C1F1B1E1BF66B1D1E0BF697161590E603429F1B1D1E1BF71E1BF66B1E95
+:208A15001E0BE60197161590E602429F1B1E1E1BF79096905C93FE1F1F1E0BE6011E151F6A
+:208A3500211E211F231E231F251E2588E60397844272FB1F90FF93FE1F271E0BE6021E15B3
+:208A55001F291E291F2B1E2B1F2F1E2F88E60297844272FB2790FF160B1E0BE6021E151FD0
+:208A7500311E311F331E331F351E3588E6019784429F90F71E0B5C1F371E0BE60290971EF4
+:208A950015E60390421E37FF16151E0BE6031E151F3D1E3D1F051E0588F69784429F90F72E
+:208AB5001E155C1F2D1E0BE60390971E15E60290421E2DFF1E151C00037F1E0B1C00037FBE
+:208AD500965CE6036B0AE6026B09E6016B08F61643170D164572F909173B887B09190F6B48
+:208AF5003B84190D6B39163BEF021639FFFE16491E4772F93B9F193A979E193995515B40E6
+:018B150081DE
 :00000001FF