Misc. fixes.

Poti is now a multiplication, from 1 to 3,5. Also added basic noise
filtering. UploadTest can now send a specific byte as frame data.

AudioFirmware/eq.c

@@ -43,13 +43,19 @@ uint8_t result[7] = {128, 128, 128, 128, 128, 128, 128};
 #define STROBEON STROBEPORT |= (1 << STROBE)
 #define STROBEOFF STROBEPORT &= ~(1 << STROBE)
 
+void equalizerInit(void);
+uint8_t *equalizerGet(void);
+void calcMultiplicator(uint8_t *d);
+void filterNoise(uint8_t *data);
+uint8_t getOffset(void);
+
 void equalizerInit(void) {
 	RESETON;
 	STROBEOFF;
 }
 
 uint8_t *equalizerGet(void) {
-	uint8_t i, offset = getOffset();
+	uint8_t i;
 
 	RESETOFF;
 	_delay_us(Trs);
@@ -60,19 +66,39 @@ uint8_t *equalizerGet(void) {
 		STROBEOFF;
 		_delay_us(To); // Wait for result
 
-		// Get result, takes ca. 29ms
 		adcStartConversion(0);
-		result[i] = offset + adcGetByte();
+		result[i] = adcGetByte();
 	}
 
 	RESETON;
-	asm volatile ("nop");
-	asm volatile ("nop");   // Ensure minimal reset pulse width
-							// 2 NOPs at 16MHz are enough...
+	asm volatile ("nop"); // Ensure minimal reset pulse width
+	asm volatile ("nop"); // 2 NOPs at 16MHz are enough...
+
+	filterNoise(result);
+	calcMultiplicator(result);
+
 	return result;
 }
 
+void calcMultiplicator(uint8_t *d) {
+	uint8_t i;
+	uint16_t multiplicator = ((uint16_t)getOffset() + 100) / 10;
+
+	for (i = 0; i < 7; i++) {
+		d[i] = (d[i] * multiplicator) / 10;
+	}
+}
+
+void filterNoise(uint8_t *data) {
+	uint8_t i;
+	for (i = 0; i < 7; i++) {
+		if (data[i] <= 40) {
+			data[i] = 0;
+		}
+	}
+}
+
 uint8_t getOffset(void) {
 	adcStartConversion(0x01);
-	return (adcGetByte() / 2);
+	return adcGetByte();
 }

AudioFirmware/eq.h

@@ -28,6 +28,3 @@ void equalizerInit(void);
 // 7 elements in byte array
 // lowest to highest frequency
 uint8_t *equalizerGet(void);
-
-void eqLed(uint8_t *d);
-uint8_t getOffset(void);

AudioFirmware/main.c

@@ -60,10 +60,6 @@ int main(void) {
 			music = equalizerGet();
 			twiSetDataToSend(music);
 		}
-
-		// Heartbeat
-		PORTB ^= (1 << PB1);
-
 		wdt_reset();
 	}
 

AudioFirmware/main.hex

@@ -1,39 +1,47 @@
 :1000000012C02CC02BC02AC029C028C027C026C0BF
 :1000100025C024C023C022C021C020C01FC01EC0D4
-:100020001DC0A1C01BC011241FBECFE5D4E0DEBFA0
-:10003000CDBF10E0A0E6B0E0EEE4F2E002C0059033
+:100020001DC0CEC01BC011241FBECFE5D4E0DEBF73
+:10003000CDBF10E0A0E6B0E0E0EDF2E002C0059038
 :100040000D92AE36B107D9F710E0AEE6B0E001C0D0
-:100050001D92A037B107E1F702D0F7C0D1CFCF93FF
-:10006000DF9314BE88E10FB6F89481BD11BC0FBEBA
-:1000700086E087BB8CE084BB11BA82E4C8D032D062
-:1000800041D078942DE088E190E00FB6F894A895DF
-:1000900081BD0FBE21BD80E690E0C2D0D4E0C2E0B9
-:1000A000CDD0882329F088B38D2788BB33D0B8D032
-:1000B00088B38C2788BBA895F3CF97B1907F97B969
-:1000C00097B18F70892B87B9369A089581E0369958
-:1000D00080E00895FBDF8823E9F3369824B135B139
-:1000E000C901089517B83E9A86B1856086B9379AD6
-:1000F00080E0E3DFEFDF0895EDDF96958795969535
-:1001000087950895AB9AAA98089581E0D6DFF4DF29
-:10011000869508951F93CF93DF93F7DF182FAB9841
-:100120008FE191E00197F1F700C00000C0E6D0E058
-:10013000AA9A95E69A95F1F70000AA9880EC8A951C
-:10014000F1F780E0BADFD8DF810F899390E0C736FE
-:10015000D90771F7AB9A00000000CE010797DF9135
-:10016000CF911F9108951F920F920FB60F921124F5
-:100170008F939F93EF93FF9381B190E0887F883BAB
-:100180009105C1F0893B91053CF4883A910559F0FD
-:10019000803B910581F507C0803C910531F1883C99
-:1001A000910549F522C081E080936F00809167003E
-:1001B00083B915C080916F00863040F010926F00B7
-:1001C00080916D0083B986B78F7B11C0E82FF0E076
-:1001D000E959FF4F908193B98F5F80936F0086B785
-:1001E000806486BF10926E0006C086B7806486BFAA
-:1001F00081E080936E0086B7806886BFFF91EF91A3
-:100200009F918F910F900FBE0F901F90189588238C
-:1002100011F481E001C08E7F82B985E486BF089524
-:10022000282F392FD901E7E6F0E08D91819380E006
-:10023000EE36F807D1F710926E00089581E09091A4
-:0E0240006E00992309F480E00895F894FFCF32
-:0E024E00808080808080804242424242424254
+:100050001D92A037B107E1F702D038C1D1CFCF93BD
+:1000600014BE88E10FB6F89481BD11BC0FBE86E0C6
+:1000700087BB8CE084BB11BA82E4F6D02ED03DD091
+:1000800078942DE088E190E00FB6F894A89581BDB2
+:100090000FBE21BD80E690E0F0D0C4E0FCD0882304
+:1000A00029F088B38C2788BB61D0E7D0A895F6CF1C
+:1000B00097B1907F97B997B18F70892B87B9369A8E
+:1000C000089581E0369980E00895FBDF8823E9F305
+:1000D000369824B135B1C901089517B83E9A86B152
+:1000E000856086B9379A80E0E3DFEFDF0895EDDFC2
+:1000F00096958795969587950895AB9AAA980895B1
+:10010000E82FF92F87E09081993208F4108281500E
+:1001100031968823C1F7089581E0CADFE8DF0895AA
+:100120001F93CF93DF93D82FC92FF6DF90E08C5920
+:100130009F4F6AE070E0B6D09B01CE01E92FF82F07
+:1001400010E0CAE0D0E0408150E0249FC001259F2C
+:10015000900D349F900D1124BE01A4D061931F5FB8
+:10016000173089F7DF91CF911F910895CF93DF93D7
+:10017000AB988FE191E00197F1F700C00000C0E675
+:10018000D0E0AA9A95E69A95F1F70000AA9880EC3B
+:100190008A95F1F780E08CDFAADF899390E0C7367B
+:1001A000D90779F7AB9A00000000CE010797A8DFC6
+:1001B000CE010797B5DFCE010797DF91CF91089564
+:1001C0001F920F920FB60F9211248F939F93EF936C
+:1001D000FF9381B190E0887F883B9105C1F0893B16
+:1001E00091053CF4883A910559F0803B910581F5E1
+:1001F00007C0803C910531F1883C910549F522C04A
+:1002000081E080936F008091670083B915C0809171
+:100210006F00863040F010926F0080916D0083B9BE
+:1002200086B78F7B11C0E82FF0E0E959FF4F90812E
+:1002300093B98F5F80936F0086B7806486BF1092FA
+:100240006E0006C086B7806486BF81E080936E0032
+:1002500086B7806886BFFF91EF919F918F910F9035
+:100260000FBE0F901F901895882311F481E001C0F4
+:100270008E7F82B985E486BF0895282F392FD90152
+:10028000E7E6F0E08D91819380E0EE36F807D1F754
+:1002900010926E00089581E090916E00992309F408
+:1002A00080E00895AA1BBB1B51E107C0AA1FBB1F1A
+:1002B000A617B70710F0A61BB70B881F991F5A95F2
+:1002C000A9F780959095BC01CD010895F894FFCFD2
+:0E02D0008080808080808042424242424242D2
 :00000001FF

CubeFirmware/main.hex

@@ -71,21 +71,21 @@
 :10046000038A03A003BA03D903E603F20306045385
 :100470007472696E67206E6F7420666F756E64218A
 :100480000A0011241FBECFE5D8E0DEBFCDBF11E0CA
-:10049000A0E6B0E0E4E9F3E202C005900D92AE37C9
-:1004A000B107D9F712E0AEE7B1E001C01D92A23664
-:1004B000B107E1F70E94A7020C94C8110C94000048
+:10049000A0E6B0E0ECE1F6E202C005900D92A638CD
+:1004A000B107D9F712E0A6E8B1E001C01D92AA3663
+:1004B000B107E1F70E94A7020C940C130C94000002
 :1004C000863561F1873580F4873411F1883438F44A
 :1004D0008234E1F08434C1F08F3331F513C08834B5
 :1004E00089F0833509F517C0883661F0893628F41C
 :1004F000843651F08736C1F40BC0833761F08637FC
 :1005000099F40CC086E00BC00E94BD0882E40DC0C7
-:100510000E947F0F08950E94490B089580E00E9479
+:100510000E94C31008950E948D0C089580E00E94EF
 :1005200026090E942D05089583E20E94ED04089596
-:10053000B0990AC080917F01882321F481E08093E3
-:100540007F0102C010927F0180917F0108954F9238
+:10053000B0990AC080918701882321F481E08093DB
+:10054000870102C0109287018091870108954F9220
 :100550005F926F927F928F929F92AF92BF92CF9253
 :10056000DF92EF92FF920F931F93CF93DF9384B7A5
-:1005700080939A0114BE98E10FB6F89491BD11BC16
+:100570008093A20114BE98E10FB6F89491BD11BC0E
 :100580000FBE8FEF8ABB8CEF81BB97BB84BB87B359
 :10059000866087BBB8980E94B30589E190E068E067
 :1005A00040E021E00E9457040E94A4060E941D081A
@@ -93,20 +93,20 @@
 :1005C0000FBE21BD81E690E00E945A050E9498026C
 :1005D000D82E0E948B08C22EB32EA42E952E862EC6
 :1005E000772E582E492E0E94DC08EC01FF24662449
-:1005F000EE2480917E01882309F4A895DD2069F01E
+:1005F000EE2480918601882309F4A895DD2069F016
 :100600000E94AF05882309F460C00E94FF0700978D
 :1006100009F45BC00E94960958C08091600088234D
 :1006200031F00E94DC08EC0110926000EE2420976B
 :10063000F1F00E94AF05681608F047C02E2D30E09B
 :10064000CE0101972817390710F4E39401C0EE2476
 :100650008E2D90E00E949C088C01FC01E05CFF4F15
-:1006600060800E945A05C8010E94F7102EC0809138
-:10067000800182FD2AC081FF0FC00E943A0BF8164C
-:1006800038F40F2D0F5F8F2D0E943C0BF02E1DC0F4
-:10069000809180018D7F16C00E94AF058033A8F045
+:1006600060800E945A05C8010E943B122EC08091F2
+:10067000880182FD2AC081FF0FC00E947E0CF816FF
+:1006800038F40F2D0F5F8F2D0E94800CF02E1DC0AF
+:10069000809188018D7F16C00E94AF058033A8F03D
 :1006A000EF2DF0E0EE0FFF1FEF59FE4F808191819B
 :1006B0000E945A053F2D333010F4F39406C0809108
-:1006C0008001826080938001FF240E948904882336
+:1006C0008801826080938801FF240E948904882326
 :1006D00021F00E9497040E9460020E948B08F22F72
 :1006E000FC19A1E02F1708F0A0E0232F2B19E1E05F
 :1006F000321708F0E0E0322F3A1BA32F31E02A171F
@@ -123,18 +123,18 @@
 :1007A000EE2329F4AA2319F4F73908F422CF0E9482
 :1007B0009802D82E0E948B08C22EB32EA42E952EFE
 :1007C000862E772E582E492E14CF1F920F920FB6D9
-:1007D0000F9211248F939F93EF93FF93E0918301E6
-:1007E000F09184018CB1E556FE4F808380918301A6
-:1007F000909184018F31910550F480918301909103
-:1008000084010196909384018093830104C0109227
-:10081000840110928301FF91EF919F918F910F902E
+:1007D0000F9211248F939F93EF93FF93E0918B01DE
+:1007E000F0918C018CB1ED55FE4F808380918B018F
+:1007F00090918C018F31910550F480918B019091F3
+:100800008C01019690938C0180938B0104C010920F
+:100810008C0110928B01FF91EF919F918F910F901E
 :100820000FBE0F901F9018951F920F920FB60F9248
 :1008300011242F933F938F939F93EF93FF932091D6
-:100840008501309186018091870190918801281758
-:100850003907F1F0E0918501F0918601E554FE4FF2
-:1008600080818CB980918501909186018F319105AD
-:1008700050F48091850190918601019690938601B4
-:100880008093850109C0109286011092850104C0F1
+:100840008D0130918E0180918F0190919001281738
+:100850003907F1F0E0918D01F0918E01ED53FE4FDB
+:1008600080818CB980918D0190918E018F3191059D
+:1008700050F480918D0190918E01019690938E019C
+:1008800080938D0109C010928E0110928D0104C0D9
 :1008900081E0809367015598FF91EF919F918F912F
 :1008A0003F912F910F900FBE0F901F9018954330DE
 :1008B00060F5362F3550343040F5322F315032301C
@@ -143,52 +143,52 @@
 :1008E000653061F0663011F0683029F420B522607F
 :1008F00020BD663019F020B5246020BD90BD89B9B7
 :100900008AB188698AB980E0089581E0089581E01C
-:10091000089540918101509182012091830130918D
-:10092000840181E04217530709F480E00895209183
-:100930008101309182018091830190918401281777
-:10094000390729F1E0918101F0918201E556FE4FCE
-:100950008081E0918101F0918201E556FE4F108285
-:1009600020918101309182012F31310558F420917D
-:100970008101309182012F5F3F4F3093820120939C
-:10098000810108951092820110928101089580E002
-:10099000089580918701909188012091850130917F
-:1009A000860101968217930791F0809185019091BD
-:1009B0008601009779F4209187013091880181E0C8
+:1009100008954091890150918A0120918B01309175
+:100920008C0181E04217530709F480E0089520917B
+:10093000890130918A0180918B0190918C01281757
+:10094000390729F1E0918901F0918A01ED55FE4FB7
+:100950008081E0918901F0918A01ED55FE4F10826E
+:100960002091890130918A012F31310558F420916D
+:10097000890130918A012F5F3F4F30938A01209384
+:100980008901089510928A0110928901089580E0EA
+:10099000089580918F019091900120918D01309167
+:1009A0008E0101968217930791F080918D019091AD
+:1009B0008E01009779F420918F013091900181E0B0
 :1009C00090E02F31310541F080E090E0089581E022
-:1009D00090E0089580E090E00895209187013091A3
-:1009E000880140918501509186012F5F3F4F241768
-:1009F000350799F320918501309186012115310544
-:100A000039F420918701309188012F31310529F384
-:100A1000E0918701F0918801E554FE4F8083809139
-:100A20008701909188018F31910550F48091870161
-:100A3000909188010196909388018093870104C06A
-:100A4000109288011092870180916701813021F412
+:1009D00090E0089580E090E0089520918F0130919B
+:1009E000900140918D0150918E012F5F3F4F241750
+:1009F000350799F320918D0130918E012115310534
+:100A000039F420918F01309190012F31310529F374
+:100A1000E0918F01F0919001ED53FE4F8083809122
+:100A20008F01909190018F31910550F480918F0149
+:100A30009091900101969093900180938F0104C052
+:100A40001092900110928F0180916701813021F402
 :100A500010926701559A5D9A0895CF93DF93C82F3E
 :100A6000D92F02C00E94ED0489918823D9F7DF9124
-:100A7000CF9108951AB810BC10BC19B81092820119
-:100A800010928101109286011092850110928401CA
-:100A9000109283011092880110928701089520918D
-:100AA0008D0130918E0140918F0150919001B901DB
-:100AB000CA0108957FB7F89421E02093890110922C
-:100AC0008A0110928C01482F592F80E090E019C0C4
+:100A7000CF9108951AB810BC10BC19B810928A0111
+:100A80001092890110928E0110928D0110928C01AA
+:100A900010928B011092900110928F010895209175
+:100AA0009501309196014091970150919801B901BB
+:100AB000CA0108957FB7F89421E020939101109224
+:100AC000920110929401482F592F80E090E019C0B4
 :100AD0006D916095F901EE0FFF1FEE0FFF1FEE0FF6
-:100AE000FF1FE80FF91FE552FE4F60832F5F3F4F56
+:100AE000FF1FE80FF91FED51FE4F60832F5F3F4F4F
 :100AF0002830310569F70196485F5F4F88309105CE
 :100B000021F0DA0120E030E0E3CF7FBF08959FB706
-:100B1000F89421E02093890110928A0110928C01AF
-:100B200020E030E0809510C0FB01E40FF51FE55296
+:100B1000F89421E020939101109292011092940197
+:100B200020E030E0809510C0FB01E40FF51FED518F
 :100B3000FE4F80834F5F5F4F48305105A9F72F5F0D
 :100B40003F4F2830310549F040E050E0B901E3E083
 :100B5000660F771FEA95E1F7E7CF9FBF0895809171
-:100B60008A01869508958EB589608EBD82EC92EAE1
+:100B60009201869508958EB589608EBD82EC92EAD9
 :100B70009BBD8ABD80E189BF80E00E948705789493
 :100B800080E090E061E01DC07FB7F894FA01E20FC9
-:100B9000F31FE552FE4FA0811082609389011092ED
-:100BA0008A0110928C017FBF70918A017723E1F353
+:100B9000F31FED51FE4FA0811082609391011092DE
+:100BA0009201109294017FBF709192017723E1F33B
 :100BB0002F5F3F4F2830310539F701968830910576
 :100BC00049F020E030E0AC01F3E0440F551FFA9506
-:100BD000E1F7DACFF89410928D0110928E01109205
-:100BE0008F011092900110928A0110928C01089549
+:100BD000E1F7DACFF89410929501109296011092F5
+:100BE0009701109298011092920110929401089529
 :100BF00089B78F7E89BF0895982F9C7F92BB98B349
 :100C0000880F880F880F8871977E892B88BB08957D
 :100C100095B3937095BB98B3997F98BB823058F089
@@ -197,18 +197,18 @@
 :100C400002C0220F331F8A95E2F7422B48BB6BBBD1
 :100C5000000008951F920F920FB60F9211242F9348
 :100C60003F934F935F936F937F938F939F93AF9334
-:100C7000BF93CF93DF93EF93FF9380918C0180918B
-:100C80008901882321F010928B011092890180E064
-:100C90000E94FC05C0E0D0E0E0918B01F0E0A3E011
-:100CA000EE0FFF1FAA95E1F7EC0FFD1FE552FE4F77
+:100C7000BF93CF93DF93EF93FF9380919401809183
+:100C80009101882321F0109293011092910180E04C
+:100C90000E94FC05C0E0D0E0E0919301F0E0A3E009
+:100CA000EE0FFF1FAA95E1F7EC0FFD1FED51FE4F70
 :100CB00060818C2F0E9408062196C830D10561F70B
-:100CC00020918B0181E090E002C0880F991F2A9546
-:100CD000E2F70E94FC0580918B01873030F480910F
-:100CE0008B018F5F80938B0107C010928B018091E5
-:100CF0008A018F5F80938A0110928C0180918D010F
-:100D000090918E01A0918F01B09190010196A11D4B
-:100D1000B11D80938D0190938E01A0938F01B093AC
-:100D20009001FF91EF91DF91CF91BF91AF919F9192
+:100CC0002091930181E090E002C0880F991F2A953E
+:100CD000E2F70E94FC0580919301873030F4809107
+:100CE00093018F5F8093930107C0109293018091CD
+:100CF00092018F5F809392011092940180919501EF
+:100D000090919601A0919701B09198010196A11D33
+:100D1000B11D8093950190939601A0939701B09394
+:100D20009801FF91EF91DF91CF91BF91AF919F918A
 :100D30008F917F916F915F914F913F912F910F9084
 :100D40000FBE0F901F90189511B88CE080B90895D0
 :100D500094EA96BF06B607FEFDCF91B1987F983012
@@ -234,7 +234,7 @@
 :100E9000FF920F931F93CF93DF934B015C0180E090
 :100EA000881680E0980681E0A80680E0B80618F46D
 :100EB00030EAE32E02C022EAE22E042F10E0C8013D
-:100EC0000E945D10EC016C01009759F18E2D0E947B
+:100EC0000E94A111EC016C01009759F18E2D0E9436
 :100ED000A806882321F50E94ED06882D0E94ED06C4
 :100EE0008E2D81600E94E406BB244801089481088D
 :100EF000910807C00E94FA06FE01EE0DFF1D8083D7
@@ -254,26 +254,26 @@
 :100FD000ED068C2FCD2DD82F03C089910E94ED06F0
 :100FE0008C2F8D198C15C8F30E94E706DF91CF91E5
 :100FF0001F910F91FF90EF90DF90CF900895CF93C6
-:10100000DF9383E40E94A806882389F4CBE1D2E031
-:101010000E94FA06899382E0C132D807C9F70E947C
-:101020000107809321020E94E706269702C0C0E0D4
+:10100000DF9383E40E94A806882389F4C3E2D2E038
+:101010000E94FA06899382E0C932D807C9F70E9474
+:101020000107809329020E94E706269702C0C0E0CC
 :10103000D0E0CE01DF91CF91089583B78B6083BF5D
 :101040008AEF8CBF89B7826089BF08951F920F9283
 :101050000FB60F9211242F933F934F935F936F938B
-:101060007F938F939F93AF93EF93FF934091920160
-:101070003091930120919401909195018091960176
-:10108000F0919701E0919801A0919901642F6F5F11
+:101060007F938F939F93AF93EF93FF9340919A0158
+:1010700030919B0120919C0190919D0180919E0156
+:10108000F0919F01E091A001A091A101642F6F5FF9
 :1010900051E0641708F050E0530F41E0531708F097
 :1010A00040E0420F31E0421708F030E0390F21E014
 :1010B000391708F020E0280F91E0281708F090E099
 :1010C0009F0F81E09F1708F080E08E0F71E08E1770
-:1010D00008F070E07A0F609392015093930140936F
-:1010E00094013093950120939601909397018093FA
-:1010F000980170939901FF91EF91AF919F918F911A
+:1010D00008F070E07A0F60939A0150939B0140935F
+:1010E0009C0130939D0120939E0190939F018093DA
+:1010F000A0017093A101FF91EF91AF919F918F910A
 :101100007F916F915F914F913F912F910F900FBE03
-:101110000F901F901895209192013091930140916A
-:101120009401509195016091960170919701809181
-:101130009801909199010895BC0126E0660F771FF0
+:101110000F901F90189520919A0130919B0140915A
+:101120009C0150919D0160919E0170919F01809161
+:10113000A0019091A1010895BC0126E0660F771FE0
 :101140002A95E1F7680F791F605E7F4F80E090E09D
 :1011500041E40E9441070895AB01BC0136E0660FEF
 :10116000771F3A95E1F7680F791F605E7F4F80E047
@@ -292,9 +292,9 @@
 :1012300058F4682F70E06E5F7F4F882777FD8095A8
 :10124000982F0E940807089580E008958A3248F494
 :10125000E82FF0E0EE0FFF1FE55EFB4F2591349184
-:1012600004C0EFE6F4E02591349182E292E0B90106
-:101270000E94901182E292E0089580E490E00E9442
-:101280005D109C01009709F4FFCFE82FF92FCF01E3
+:1012600004C0EFE6F4E0259134918AE292E0B901FE
+:101270000E94D4128AE292E0089580E490E00E94F5
+:10128000A1119C01009709F4FFCFE82FF92FCF019E
 :10129000805C9F4F1192E817F907E1F7C9010895A3
 :1012A000A7E0B0E0FD01E41BF109AD01421B5109CB
 :1012B0009A0143E0220F331F4A95E1F7E20FF31F33
@@ -304,286 +304,327 @@
 :1012F000331F5A95E1F7E20FF31FE80FF91F81E062
 :1013000090E002C0880F991F6A95E2F7809590815E
 :10131000982390830895282F392FF90180E41192A2
-:101320008150E9F708950E94F7100895AF92BF9297
+:101320008150E9F708950E943B120895AF92BF9251
 :10133000DF92EF92FF920F931F93DF93CF9300D032
-:10134000CDB7DEB7F82E092F0E943D095C01802F32
-:101350000F2D182F30E08FE1F82EF80181918F01C9
-:101360006F2D0E943D10D82E50E010C0C501632F94
-:101370004E2D252F3A8359830E945009E3945981B9
-:101380003A81ED149CF35F5F583011F0EE24F9CFF1
-:101390003F5F373011F7C5010E945A05C5010E9411
-:1013A00093090F900F90CF91DF911F910F91FF90B4
-:1013B000EF90DF90BF90AF9008950895EF92FF9265
-:1013C0000F931F93DF93CF930F92CDB7DEB70E9499
-:1013D0003D097C0117E01FC0C701602F432F212F5B
-:1013E00039830E94500939813F5F3830A9F70F5F78
-:1013F000083011F030E0F0CFC7010E945A0501C05B
-:10140000A8950E94AF058230D8F3C7010E948B09CE
-:1014100011501F3F11F000E0EDCFC7010E94F710FF
-:101420000F90CF91DF911F910F91FF90EF90089552
-:10143000EF92FF920F931F93DF93CF930F92CDB74D
-:10144000DEB70E943D097C0110E01FC0C701632F79
-:10145000402F212F39830E94500939813F5F383056
-:10146000A9F70F5F083011F030E0F0CFC7010E94FC
-:101470005A0501C0A8950E94AF058230D8F3C70174
-:101480000E948B091F5F183011F000E0EDCFC701FB
-:101490000E94F7100F90CF91DF911F910F91FF9055
-:1014A000EF900895EF92FF920F931F93DF93CF93E6
-:1014B0000F92CDB7DEB70E943D097C0117E01FC037
-:1014C000C701612F402F232F39830E945009398192
-:1014D0003F5F3830A9F70F5F083011F030E0F0CFF0
-:1014E000C7010E945A0501C0A8950E94AF0582302D
-:1014F000D8F3C7010E948B0911501F3F11F000E083
-:10150000EDCFC7010E94F7100F90CF91DF911F918F
-:101510000F91FF90EF900895EF92FF920F931F931A
-:10152000DF93CF930F92CDB7DEB70E943D097C01C8
-:1015300010E01FC0C701612F402F232F39830E9465
-:10154000500939813F5F3830A9F70F5F083011F03B
-:1015500030E0F0CFC7010E945A0501C0A8950E9453
-:10156000AF058230D8F3C7010E948B091F5F183086
-:1015700011F000E0EDCFC7010E94F7100F90CF915E
-:10158000DF911F910F91FF90EF900895EF92FF92DE
-:101590000F931F93DF93CF930F92CDB7DEB70E94C7
-:1015A0003D097C0117E01FC0C701602F412F232F89
-:1015B00039830E94500939813F5F3830A9F70F5FA6
-:1015C000083011F030E0F0CFC7010E945A0501C089
-:1015D000A8950E94AF058230D8F3C7010E948B09FD
-:1015E00011501F3F11F000E0EDCFC7010E94F7102E
-:1015F0000F90CF91DF911F910F91FF90EF90089581
-:10160000EF92FF920F931F93DF93CF930F92CDB77B
-:10161000DEB70E943D097C0110E01FC0C701602FAA
-:10162000412F232F39830E94500939813F5F383081
-:10163000A9F70F5F083011F030E0F0CFC7010E942A
-:101640005A0501C0A8950E94AF058230D8F3C701A2
-:101650000E948B091F5F183011F000E0EDCFC70129
-:101660000E94F7100F90CF91DF911F910F91FF9083
-:10167000EF90089586E00895863050F4E82FF0E06A
-:10168000EE0FFF1FE859FE4F0190F081E02D099504
-:1016900008952F923F924F925F926F927F928F9216
-:1016A0009F92AF92BF92CF92DF92EF92FF920F93F1
-:1016B0001F93DF93CF93CDB7DEB72B970FB6F89478
-:1016C000DEBF0FBECDBF81E490E00E945D10898334
-:1016D0009A832C010E948B08B22EC32ED42E152F74
-:1016E000062FF72EE82EA92E82E40E94ED046CC08E
-:1016F0000E948B08A22FAB19F1E02A1708F0F0E046
-:10170000232F2C19E1E0321708F0E0E0322F3F1BC5
-:10171000F32F31E02F1708F030E0E32B342F3D1981
-:1017200021E0431708F020E0432F4E1BE42F41E057
-:101730003E1708F040E0242B452F411B31E05417A1
-:1017400008F030E0542F521B21E0451708F020E04C
-:10175000322B462F401B21E0641708F020E0642F55
-:10176000631B31E0461708F030E0232B472F4F1959
-:1017700031E0741708F030E0742F721B21E0471736
-:1017800008F020E0322B482F4E1921E0841708F092
-:1017900020E0842F831B31E0481708F030E0232B32
-:1017A0009A19921789F4882379F4772369F46623C8
-:1017B00059F4552349F4EE2339F4F63028F4F53082
-:1017C00011F4AD3D08F4A8950E948904882309F41A
-:1017D0008FCF0E9497048B8382E40E94ED048824BB
-:1017E00099243324C201805C9F4F9F838E838EC1D6
-:1017F0000E948B08E22FEB19F1E02E1708F0F0E0C1
-:10180000232F2C19A1E0321708F0A0E0322F3F1B44
-:10181000F32F31E02F1708F030E0A32B342F3D19C0
-:1018200021E0431708F020E0432F4A1BA1E03417C2
-:1018300008F0A0E02A2BA52FA11B31E05A1708F0D1
-:1018400030E05A2F521B21E0A51708F020E0322B80
-:10185000B62FB01B21E06B1708F020E0AB2FA31BC5
-:1018600031E0BA1708F030E0232B672F6F1931E011
-:10187000761708F030E0762F721B21E0671708F02A
-:1018800020E0322B682F6E1921E0861708F020E047
-:10189000862F831B31E0681708F030E0232B9A195C
-:1018A000921789F4882379F4772369F4AA2359F4E9
-:1018B000552349F4442339F4F63028F4F53011F473
-:1018C000ED3D08F4A8950E948904882309F490CF7F
-:1018D0000E949704282E82E40E94ED0434010EC178
-:1018E0000E948B08E22FEB19F1E02E1708F0F0E0D0
-:1018F000A32FAC1921E03A1708F020E03A2F3F1B44
-:10190000F1E0A31708F0F0E02F2BA42FAD19F1E0C0
-:101910004A1708F0F0E04A2F421B21E0A41708F014
-:1019200020E0F22BA52FA11B21E05A1708F020E0A0
-:101930005A2F5F1BF1E0A51708F0F0E02F2BA62F20
-:10194000A01BF1E06A1708F0F0E06A2F621B21E0AB
-:10195000A61708F020E0F22B272F2F19A1E072170D
-:1019600008F0A0E0722F7F1BF1E0271708F0F0E0ED
-:10197000AF2BF82FFE1921E08F1708F020E08F2FF2
-:101980008A1BA1E0F81708F0A0E02A2B9A199217F9
-:1019900089F4882379F4772369F4662359F455236D
-:1019A00049F4442339F4363028F4353011F4ED3D50
-:1019B00008F4A8950E948904882309F491CF0E9415
-:1019C0009704EE81FF81808382E40E94ED04998177
-:1019D0008A81292F382FC901805C9F4F9D838C837A
-:1019E000398728876BC00E948B08E22FEB19F1E042
-:1019F0002E1708F0F0E0232F2C19A1E0321708F081
-:101A0000A0E0322F3F1BF32F31E02F1708F030E01A
-:101A1000A32B342F3D1921E0431708F020E0432F7A
-:101A20004A1BA1E0341708F0A0E02A2BA52FA11B28
-:101A300031E05A1708F030E05A2F521B21E0A51769
-:101A400008F020E0322BB62FB01B21E06B1708F016
-:101A500020E0AB2FA31B31E0BA1708F030E0232BB6
-:101A6000672F6F1931E0761708F030E0762F721B80
-:101A700021E0671708F020E0322B682F6E1921E073
-:101A8000861708F020E0862F831B31E0681708F0E6
-:101A900030E0232B9A19921789F4882379F477235D
-:101AA00069F4AA2359F4552349F4442339F4F63050
-:101AB00028F4F53011F4ED3D08F4A8950E9489044E
-:101AC000882309F490CF0E949704E885F9858193D3
-:101AD000F987E8872C813D81E217F30779F782E4E3
-:101AE0000E94ED0493012F5F3F4FC301B2012A878B
-:101AF0003B870E94AC082A853B853901862D8819D1
-:101B0000821508F457CF820C911C33943B81331615
-:101B100008F4D9CEC2010E94F7106CC00E948B0855
-:101B2000A22FAB19F1E02A1708F0F0E0232F2C19AF
-:101B3000E1E0321708F0E0E0322F3F1BF32F31E0F5
-:101B40002F1708F030E0E32B342F3D1921E0431725
-:101B500008F020E0432F4E1BE42F41E03E1708F031
-:101B600040E0242B452F411B31E0541708F030E0B2
-:101B7000542F521B21E0451708F020E0322B462F4E
-:101B8000401B21E0641708F020E0642F631B31E064
-:101B9000461708F030E0232B472F4F1931E0741718
-:101BA00008F030E0742F721B21E0471708F020E0A6
-:101BB000322B482F4E1921E0841708F020E0842FA3
-:101BC000831B31E0481708F030E0232B9A19921755
-:101BD00089F4882379F4772369F4662359F455232B
-:101BE00049F4EE2339F4F63028F4F53011F4AD3D24
-:101BF00008F4A8950E948904882309F48FCF0E94D5
-:101C000097046CC00E948B08A22FAB19F1E02A1731
-:101C100008F0F0E0232F2C19E1E0321708F0E0E0A3
-:101C2000322F3F1BF32F31E02F1708F030E0E32B6A
-:101C3000342F3D1921E0431708F020E0432F4E1BBD
-:101C4000E42F41E03E1708F040E0242B452F411BD4
-:101C500031E0541708F030E0542F521B21E04517B3
-:101C600008F020E0322B462F401B21E0641708F0DB
-:101C700020E0642F631B31E0461708F030E0232B8F
-:101C8000472F4F1931E0741708F030E0742F721BA2
-:101C900021E0471708F020E0322B482F4E1921E0B1
-:101CA000841708F020E0842F831B31E0481708F0E8
-:101CB00030E0232B9A19921789F4882379F477233B
-:101CC00069F4662359F4552349F4EE2339F4F630C8
-:101CD00028F4F53011F4AD3D08F4A8950E9489046C
-:101CE000882309F48FCF0E9497046CC00E948B0850
-:101CF000A22FAB19F1E02A1708F0F0E0232F2C19DE
-:101D0000E1E0321708F0E0E0322F3F1BF32F31E023
-:101D10002F1708F030E0E32B342F3D1921E0431753
-:101D200008F020E0432F4E1BE42F41E03E1708F05F
-:101D300040E0242B452F411B31E0541708F030E0E0
-:101D4000542F521B21E0451708F020E0322B462F7C
-:101D5000401B21E0641708F020E0642F631B31E092
-:101D6000461708F030E0232B472F4F1931E0741746
-:101D700008F030E0742F721B21E0471708F020E0D4
-:101D8000322B482F4E1921E0841708F020E0842FD1
-:101D9000831B31E0481708F030E0232B9A19921783
-:101DA00089F4882379F4772369F4662359F4552359
-:101DB00049F4EE2339F4F63028F4F53011F4AD3D52
-:101DC00008F4A8950E948904882309F48FCF0E9403
-:101DD00097046CC00E948B08A22FAB19F1E02A1760
-:101DE00008F0F0E0232F2C19E1E0321708F0E0E0D2
-:101DF000322F3F1BF32F31E02F1708F030E0E32B99
-:101E0000342F3D1921E0431708F020E0432F4E1BEB
-:101E1000E42F41E03E1708F040E0242B452F411B02
-:101E200031E0541708F030E0542F521B21E04517E1
-:101E300008F020E0322B462F401B21E0641708F009
-:101E400020E0642F631B31E0461708F030E0232BBD
-:101E5000472F4F1931E0741708F030E0742F721BD0
-:101E600021E0471708F020E0322B482F4E1921E0DF
-:101E7000841708F020E0842F831B31E0481708F016
-:101E800030E0232B9A19921789F4882379F4772369
-:101E900069F4662359F4552349F4EE2339F4F630F6
-:101EA00028F4F53011F4AD3D08F4A8950E9489049A
-:101EB000882309F48FCF0E94970482E40E94ED04E6
-:101EC000C4010E94F80881E0809360002B960FB651
-:101ED000F894DEBF0FBECDBFCF91DF911F910F9160
-:101EE000FF90EF90DF90CF90BF90AF909F908F903A
-:101EF0007F906F905F904F903F902F9008956F92DA
-:101F00007F928F929F92AF92BF92CF92DF92EF9289
-:101F1000FF920F931F93CF93DF930E94DC086C0115
-:101F20006FEF70E00E944910009711F4862E02C0F6
-:101F3000862E839482E40E94ED04882D0E94ED0495
-:101F40000E949704823409F058C000E010E041C0BC
-:101F50008FEFC816D10409F010F49C2C02C099240C
-:101F60009A94892D0E94ED040E949704823409F00E
-:101F700044C0780126C0C7010E949C08EC01FC0106
-:101F8000E05CFF4F80810E94ED040E949704823440
-:101F900089F45E0180E4682EF50181915F010E9461
-:101FA000ED046A94C9F70E9497040894E11CF11C9F
-:101FB000823421F0CE010E94F7101FC0CE010E9492
-:101FC000F7108E2D87198915B0F2C918D108015064
-:101FD0001F4F702E802F8195881508F4B9CF82E4A9
-:101FE0000E94ED0482E40E94ED0482E40E94ED046C
-:101FF00082E40E94ED040E949704DF91CF911F912B
-:102000000F91FF90EF90DF90CF90BF90AF909F9097
-:102010008F907F906F9008951F93CF93DF930E94CE
-:10202000FF07EC01009731F485E10E9426090E9428
-:102030002D051FC086E10E9426090E942D0510E390
-:10204000812F0E94ED0484E791E00E942D05899183
-:1020500090E062E272E04AE050E00E94971182E272
-:1020600092E00E942D058AE00E94ED041F5F173365
-:1020700039F7DF91CF911F910895991B79E004C042
-:10208000991F961708F0961B881F7A95C9F78095B7
-:102090000895AA1BBB1B51E107C0AA1FBB1FA617AF
-:1020A000B70710F0A61BB70B881F991F5A95A9F701
-:1020B00080959095BC01CD010895CF93DF93823038
-:1020C000910510F482E090E0E0916002F0916102ED
-:1020D00040E050E020E030E026C060817181681768
-:1020E0007907E0F06817790781F4828193812115DF
-:1020F000310531F0D90113969C938E9312972BC022
-:10210000909361028093600226C04115510519F039
-:102110006417750718F4AB01E901DF019F017281B3
-:102120006381E72FF62F3097C1F64115510501F174
-:10213000481B590B4430510580F412968D919C91A7
-:102140001397209719F09B838A8304C090936102B0
-:1021500080936002FD01329646C0FD01E40FF51F39
-:10216000819391934250504011965C934E933BC0A3
-:1021700020915E0230915F022115310541F42091DA
-:10218000790130917A0130935F0220935E022091B1
-:102190007B0130917C012115310541F42DB73EB70B
-:1021A0004091770150917801241B350BE0915E023C
-:1021B000F0915F02E217F307A0F42E1B3F0B2817E4
-:1021C000390778F0AC014E5F5F4F2417350748F0B0
-:1021D0004E0F5F1F50935F0240935E028193919375
-:1021E00002C0E0E0F0E0CF01DF91CF910895CF93FE
-:1021F000DF93009709F491C0FC0132971382128299
-:1022000060916002709161026115710581F4208115
-:102210003181280F391F80915E0290915F028217F1
-:10222000930799F5F0935F02E0935E0276C0DB01BD
-:1022300080E090E002C0CD01D901AE17BF0748F49D
-:1022400012962D913C91139721153105A1F7CD01DF
-:1022500021C0B383A283EF01499159919E01240FBC
-:10226000351FA217B30779F42D913C911197240FD4
-:10227000351F2E5F3F4F3183208312962D913C9165
-:10228000139733832283009729F4F0936102E0933C
-:10229000600243C0DC011396FC93EE9312974D91BC
-:1022A0005D91A40FB51FEA17FB0769F42081318106
-:1022B000240F351F2E5F3F4FEC0139832883228185
-:1022C00033813B832A83E0E0F0E002C0FB01BC01E4
-:1022D000DB0112968D919C9113970097B9F79B01A2
-:1022E0002E5F3F4F8D919C911197820F931F4091CC
-:1022F0005E0250915F024817590779F4309729F42C
-:10230000109261021092600202C013821282225067
-:10231000304030935F0220935E02DF91CF910895A9
-:10232000FB01DC0105900D920020E1F70895FB010F
-:102330009F01E8944230C4F04532B4F44A3029F4A5
-:1023400097FB1EF4909581959F4F642F77270E94ED
-:102350004910805D8A330CF0895D8193CB01009731
-:10236000A1F716F45DE251931082C9010C94B811E3
-:10237000DC01FC01672F71917723E1F7329704C0EC
-:102380007C916D9370836291AE17BF07C8F3089577
-:04239000F894FFCFEF
-:1023940001FFFFFFFFFFFFFFFFFF8181818181813B
-:1023A400FFFF818181818181FFFF81818181818121
-:1023B400FFFF818181818181FFFF81818181818111
-:1023C400FFFF818181818181FFFFFFFFFFFFFFFF0D
-:1023D400FFFF010101FF8080FFFF010101FF8080F9
-:1023E400FFFF010101FF8080FFFF010101FF8080E9
-:1023F400FFFF010101FF8080FFFF010101FF8080D9
-:10240400FFFF010101FF8080FFFF010101FF8080C8
-:10241400FF7E818181FF8181817E818181FF818134
-:10242400817E818181FF8181817E818181FF8181A2
-:10243400817E818181FF8181817E818181FF818192
-:10244400817E818181FF8181817E818181FF818182
-:10245400811E2222221E0202021E2222221E0202A9
-:10246400021E2222221E0202021E2222221E020218
-:10247400021E2222221E0202021E2222221E020208
-:10248400021E2222221E0202021E2222221E0202F8
-:1024940002A100E100210101000BC60A8C0A520AC4
-:0E24A400180ADE093A20002000620200000043
+:10134000CDB7DEB7F82E092F0E943D095C010E943F
+:101350008B09802F0F2D182F30E08FE1F82EF80128
+:1013600081918F016F2D0E948111D82E50E010C005
+:10137000C501632F4E2D252F3A8359830E945009B2
+:10138000E39459813A81ED149CF35F5F583011F07A
+:10139000EE24F9CF3F5F373011F7C5010E945A059F
+:1013A000C5010E9493090F900F90CF91DF911F917B
+:1013B0000F91FF90EF90DF90BF90AF900895089548
+:1013C0000F931F93CF93DF930E943D09EC0110E030
+:1013D00012C0CE01612F402F20E00E945009CE01A3
+:1013E000612F402F27E00E9450090F5F083089F7D6
+:1013F0001F5F1830B1F000E0ECCFCE0160E0412F6C
+:10140000202F0E945009CE0168E0412F202F0E941A
+:1014100050090F5F083089F71F5F183019F410E08A
+:1014200015C010E000E0E9CFCE01612F40E0202F91
+:101430000E945009CE01612F48E0202F0E945009E0
+:101440000F5F083089F71F5F183011F000E0ECCF14
+:10145000CE010E945A0501C0A8950E94AF058230B6
+:10146000D8F3CE010E948B09CE010E943B12DF917E
+:10147000CF911F910F9108950F931F93CF93DF93F7
+:101480000E943D09EC0111E012C0CE01612F402FF6
+:1014900021E00E945009CE01612F402F26E00E94DA
+:1014A00050090F5F073089F71F5F1730B1F001E077
+:1014B000ECCFCE0161E0412F202F0E945009CE01D8
+:1014C00066E0412F202F0E9450090F5F073089F7F7
+:1014D0001F5F173019F411E015C011E001E0E9CFEA
+:1014E000CE01612F41E0202F0E945009CE01612FD3
+:1014F00046E0202F0E9450090F5F073089F71F5FD9
+:10150000173011F001E0ECCFCE010E945A0501C066
+:10151000A8950E94AF058230D8F3CE010E948B09B6
+:10152000CE010E943B12DF91CF911F910F91089540
+:101530000F931F93CF93DF930E943D09EC0112E0BC
+:1015400012C0CE01612F402F22E00E945009CE012F
+:10155000612F402F25E00E9450090F5F063089F768
+:101560001F5F1630B1F002E0ECCFCE0162E0412FF8
+:10157000202F0E945009CE0165E0412F202F0E94AC
+:1015800050090F5F063089F71F5F163019F412E01B
+:1015900015C012E002E0E9CFCE01612F42E0202F1A
+:1015A0000E945009CE01612F45E0202F0E94500972
+:1015B0000F5F063089F71F5F163011F002E0ECCFA5
+:1015C000CE010E945A0501C0A8950E94AF05823045
+:1015D000D8F3CE010E948B09CE010E943B12DF910D
+:1015E000CF911F910F910895CF93DF930E943D09F2
+:1015F000EC0163E043E023E00E945009CE0164E087
+:1016000043E023E00E945009CE0164E044E023E07F
+:101610000E945009CE0164E044E024E00E94500999
+:10162000CE010E945A0501C0A8950E94AF058230E4
+:10163000D8F3CE010E948B09CE010E943B12DF91AC
+:10164000CF910895EF92FF920F931F93DF93CF9363
+:101650000F92CDB7DEB70E943D097C0117E01FC095
+:10166000C701602F432F212F39830E9450093981F0
+:101670003F5F3830A9F70F5F083011F030E0F0CF4E
+:10168000C7010E945A0501C0A8950E94AF0582308B
+:10169000D8F3C7010E948B0911501F3F11F000E0E1
+:1016A000EDCFC7010E943B120F90CF91DF911F91A8
+:1016B0000F91FF90EF900895EF92FF920F931F9379
+:1016C000DF93CF930F92CDB7DEB70E943D097C0127
+:1016D00010E01FC0C701632F402F212F39830E94C4
+:1016E000500939813F5F3830A9F70F5F083011F09A
+:1016F00030E0F0CFC7010E945A0501C0A8950E94B2
+:10170000AF058230D8F3C7010E948B091F5F1830E4
+:1017100011F000E0EDCFC7010E943B120F90CF9176
+:10172000DF911F910F91FF90EF900895EF92FF923C
+:101730000F931F93DF93CF930F92CDB7DEB70E9425
+:101740003D097C0117E01FC0C701612F402F232FE7
+:1017500039830E94500939813F5F3830A9F70F5F04
+:10176000083011F030E0F0CFC7010E945A0501C0E7
+:10177000A8950E94AF058230D8F3C7010E948B095B
+:1017800011501F3F11F000E0EDCFC7010E943B1246
+:101790000F90CF91DF911F910F91FF90EF900895DF
+:1017A000EF92FF920F931F93DF93CF930F92CDB7DA
+:1017B000DEB70E943D097C0110E01FC0C701612F08
+:1017C000402F232F39830E94500939813F5F3830E1
+:1017D000A9F70F5F083011F030E0F0CFC7010E9489
+:1017E0005A0501C0A8950E94AF058230D8F3C70101
+:1017F0000E948B091F5F183011F000E0EDCFC70188
+:101800000E943B120F90CF91DF911F910F91FF909B
+:10181000EF900895EF92FF920F931F93DF93CF9372
+:101820000F92CDB7DEB70E943D097C0117E01FC0C3
+:10183000C701602F412F232F39830E94500939811E
+:101840003F5F3830A9F70F5F083011F030E0F0CF7C
+:10185000C7010E945A0501C0A8950E94AF058230B9
+:10186000D8F3C7010E948B0911501F3F11F000E00F
+:10187000EDCFC7010E943B120F90CF91DF911F91D6
+:101880000F91FF90EF900895EF92FF920F931F93A7
+:10189000DF93CF930F92CDB7DEB70E943D097C0155
+:1018A00010E01FC0C701602F412F232F39830E94F2
+:1018B000500939813F5F3830A9F70F5F083011F0C8
+:1018C00030E0F0CFC7010E945A0501C0A8950E94E0
+:1018D000AF058230D8F3C7010E948B091F5F183013
+:1018E00011F000E0EDCFC7010E943B120F90CF91A5
+:1018F000DF911F910F91FF90EF9008958AE0089576
+:101900008A3050F4E82FF0E0EE0FFF1FE859FE4F49
+:101910000190F081E02D099508952F923F924F920A
+:101920005F926F927F928F929F92AF92BF92CF926F
+:10193000DF92EF92FF920F931F93DF93CF93CDB778
+:10194000DEB72B970FB6F894DEBF0FBECDBF81E494
+:1019500090E00E94A11189839A832C010E948B0838
+:10196000B22EC32ED42E152F062FF72EE82EA92E19
+:1019700082E40E94ED046CC00E948B08A22FAB1978
+:10198000F1E02A1708F0F0E0232F2C19E1E03217DC
+:1019900008F0E0E0322F3F1BF32F31E02F1708F063
+:1019A00030E0E32B342F3D1921E0431708F020E00D
+:1019B000432F4E1BE42F41E03E1708F040E0242B5C
+:1019C000452F411B31E0541708F030E0542F521BD3
+:1019D00021E0451708F020E0322B462F401B21E084
+:1019E000641708F020E0642F631B31E0461708F00D
+:1019F00030E0232B472F4F1931E0741708F030E007
+:101A0000742F721B21E0471708F020E0322B482F7B
+:101A10004E1921E0841708F020E0842F831B31E069
+:101A2000481708F030E0232B9A19921789F488237D
+:101A300079F4772369F4662359F4552349F4EE23A6
+:101A400039F4F63028F4F53011F4AD3D08F4A895DA
+:101A50000E948904882309F48FCF0E9497048B8306
+:101A600082E40E94ED04882499243324C201805C1E
+:101A70009F4F9F838E838EC10E948B08E22FEB19AC
+:101A8000F1E02E1708F0F0E0232F2C19A1E0321717
+:101A900008F0A0E0322F3F1BF32F31E02F1708F0A2
+:101AA00030E0A32B342F3D1921E0431708F020E04C
+:101AB000432F4A1BA1E0341708F0A0E02A2BA52FE2
+:101AC000A11B31E05A1708F030E05A2F521B21E0D9
+:101AD000A51708F020E0322BB62FB01B21E06B17C2
+:101AE00008F020E0AB2FA31B31E0BA1708F030E07C
+:101AF000232B672F6F1931E0761708F030E0762F2F
+:101B0000721B21E0671708F020E0322B682F6E1956
+:101B100021E0861708F020E0862F831B31E068174C
+:101B200008F030E0232B9A19921789F4882379F46E
+:101B3000772369F4AA2359F4552349F4442339F44B
+:101B4000F63028F4F53011F4ED3D08F4A8950E9424
+:101B50008904882309F490CF0E949704282E82E4F8
+:101B60000E94ED0434010EC10E948B08E22FEB1994
+:101B7000F1E02E1708F0F0E0A32FAC1921E03A179E
+:101B800008F020E03A2F3F1BF1E0A31708F0F0E047
+:101B90002F2BA42FAD19F1E04A1708F0F0E04A2FDF
+:101BA000421B21E0A41708F020E0F22BA52FA11B77
+:101BB00021E05A1708F020E05A2F5F1BF1E0A5172B
+:101BC00008F0F0E02F2BA62FA01BF1E06A1708F019
+:101BD000F0E06A2F621B21E0A61708F020E0F22B4C
+:101BE000272F2F19A1E0721708F0A0E0722F7F1B9A
+:101BF000F1E0271708F0F0E0AF2BF82FFE1921E0F5
+:101C00008F1708F020E08F2F8A1BA1E0F81708F04B
+:101C1000A0E02A2B9A19921789F4882379F4772364
+:101C200069F4662359F4552349F4442339F43630D2
+:101C300028F4353011F4ED3D08F4A8950E9489048C
+:101C4000882309F491CF0E949704EE81FF8180835D
+:101C500082E40E94ED0499818A81292F382FC901DD
+:101C6000805C9F4F9D838C83398728876BC00E943F
+:101C70008B08E22FEB19F1E02E1708F0F0E0232F8C
+:101C80002C19A1E0321708F0A0E0322F3F1BF32FF0
+:101C900031E02F1708F030E0A32B342F3D1921E05D
+:101CA000431708F020E0432F4A1BA1E0341708F047
+:101CB000A0E02A2BA52FA11B31E05A1708F030E035
+:101CC0005A2F521B21E0A51708F020E0322BB62F27
+:101CD000B01B21E06B1708F020E0AB2FA31B31E015
+:101CE000BA1708F030E0232B672F6F1931E0761711
+:101CF00008F030E0762F721B21E0671708F020E033
+:101D0000322B682F6E1921E0861708F020E0862F0D
+:101D1000831B31E0681708F030E0232B9A199217E3
+:101D200089F4882379F4772369F4AA2359F4552395
+:101D300049F4442339F4F63028F4F53011F4ED3D3C
+:101D400008F4A8950E948904882309F490CF0E9482
+:101D50009704E885F9858193F987E8872C813D818F
+:101D6000E217F30779F782E40E94ED0493012F5FF5
+:101D70003F4FC301B2012A873B870E94AC082A85E6
+:101D80003B853901862D8819821508F457CF820CBE
+:101D9000911C33943B81331608F4D9CEC2010E94C2
+:101DA0003B126CC00E948B08A22FAB19F1E02A17DE
+:101DB00008F0F0E0232F2C19E1E0321708F0E0E002
+:101DC000322F3F1BF32F31E02F1708F030E0E32BC9
+:101DD000342F3D1921E0431708F020E0432F4E1B1C
+:101DE000E42F41E03E1708F040E0242B452F411B33
+:101DF00031E0541708F030E0542F521B21E0451712
+:101E000008F020E0322B462F401B21E0641708F039
+:101E100020E0642F631B31E0461708F030E0232BED
+:101E2000472F4F1931E0741708F030E0742F721B00
+:101E300021E0471708F020E0322B482F4E1921E00F
+:101E4000841708F020E0842F831B31E0481708F046
+:101E500030E0232B9A19921789F4882379F4772399
+:101E600069F4662359F4552349F4EE2339F4F63026
+:101E700028F4F53011F4AD3D08F4A8950E948904CA
+:101E8000882309F48FCF0E9497046CC00E948B08AE
+:101E9000A22FAB19F1E02A1708F0F0E0232F2C193C
+:101EA000E1E0321708F0E0E0322F3F1BF32F31E082
+:101EB0002F1708F030E0E32B342F3D1921E04317B2
+:101EC00008F020E0432F4E1BE42F41E03E1708F0BE
+:101ED00040E0242B452F411B31E0541708F030E03F
+:101EE000542F521B21E0451708F020E0322B462FDB
+:101EF000401B21E0641708F020E0642F631B31E0F1
+:101F0000461708F030E0232B472F4F1931E07417A4
+:101F100008F030E0742F721B21E0471708F020E032
+:101F2000322B482F4E1921E0841708F020E0842F2F
+:101F3000831B31E0481708F030E0232B9A199217E1
+:101F400089F4882379F4772369F4662359F45523B7
+:101F500049F4EE2339F4F63028F4F53011F4AD3DB0
+:101F600008F4A8950E948904882309F48FCF0E9461
+:101F700097046CC00E948B08A22FAB19F1E02A17BE
+:101F800008F0F0E0232F2C19E1E0321708F0E0E030
+:101F9000322F3F1BF32F31E02F1708F030E0E32BF7
+:101FA000342F3D1921E0431708F020E0432F4E1B4A
+:101FB000E42F41E03E1708F040E0242B452F411B61
+:101FC00031E0541708F030E0542F521B21E0451740
+:101FD00008F020E0322B462F401B21E0641708F068
+:101FE00020E0642F631B31E0461708F030E0232B1C
+:101FF000472F4F1931E0741708F030E0742F721B2F
+:1020000021E0471708F020E0322B482F4E1921E03D
+:10201000841708F020E0842F831B31E0481708F074
+:1020200030E0232B9A19921789F4882379F47723C7
+:1020300069F4662359F4552349F4EE2339F4F63054
+:1020400028F4F53011F4AD3D08F4A8950E948904F8
+:10205000882309F48FCF0E9497046CC00E948B08DC
+:10206000A22FAB19F1E02A1708F0F0E0232F2C196A
+:10207000E1E0321708F0E0E0322F3F1BF32F31E0B0
+:102080002F1708F030E0E32B342F3D1921E04317E0
+:1020900008F020E0432F4E1BE42F41E03E1708F0EC
+:1020A00040E0242B452F411B31E0541708F030E06D
+:1020B000542F521B21E0451708F020E0322B462F09
+:1020C000401B21E0641708F020E0642F631B31E01F
+:1020D000461708F030E0232B472F4F1931E07417D3
+:1020E00008F030E0742F721B21E0471708F020E061
+:1020F000322B482F4E1921E0841708F020E0842F5E
+:10210000831B31E0481708F030E0232B9A1992170F
+:1021100089F4882379F4772369F4662359F45523E5
+:1021200049F4EE2339F4F63028F4F53011F4AD3DDE
+:1021300008F4A8950E948904882309F48FCF0E948F
+:10214000970482E40E94ED04C4010E94F80881E033
+:10215000809360002B960FB6F894DEBF0FBECDBF04
+:10216000CF91DF911F910F91FF90EF90DF90CF9073
+:10217000BF90AF909F908F907F906F905F904F90A7
+:102180003F902F9008956F927F928F929F92AF927F
+:10219000BF92CF92DF92EF92FF920F931F93CF9354
+:1021A000DF930E94DC086C016FEF70E00E948D11DC
+:1021B000009711F4862E02C0862E839482E40E943A
+:1021C000ED04882D0E94ED040E949704823409F0EA
+:1021D00058C000E010E041C08FEFC816D10409F0EC
+:1021E00010F49C2C02C099249A94892D0E94ED042D
+:1021F0000E949704823409F044C0780126C0C701C8
+:102200000E949C08EC01FC01E05CFF4F80810E9471
+:10221000ED040E949704823489F45E0180E4682E04
+:10222000F50181915F010E94ED046A94C9F70E9453
+:1022300097040894E11CF11C823421F0CE010E9425
+:102240003B121FC0CE010E943B128E2D87198915AB
+:10225000B0F2C918D10801501F4F702E802F819500
+:10226000881508F4B9CF82E40E94ED0482E40E944C
+:10227000ED0482E40E94ED0482E40E94ED040E94D9
+:102280009704DF91CF911F910F91FF90EF90DF9016
+:10229000CF90BF90AF909F908F907F906F90089558
+:1022A0001F93CF93DF930E94FF07EC01009731F457
+:1022B00085E10E9426090E942D051FC086E10E942B
+:1022C00026090E942D0510E3812F0E94ED048CE762
+:1022D00091E00E942D05899190E06AE272E04AE067
+:1022E00050E00E94DB128AE292E00E942D058AE013
+:1022F0000E94ED041F5F173339F7DF91CF911F91D3
+:102300000895991B79E004C0991F961708F0961B51
+:10231000881F7A95C9F780950895AA1BBB1B51E1C8
+:1023200007C0AA1FBB1FA617B70710F0A61BB70B45
+:10233000881F991F5A95A9F780959095BC01CD01EA
+:102340000895CF93DF938230910510F482E090E0FE
+:10235000E0916802F091690240E050E020E030E056
+:1023600026C06081718168177907E0F068177907E6
+:1023700081F4828193812115310531F0D9011396C1
+:102380009C938E9312972BC090936902809368025E
+:1023900026C04115510519F06417750718F4AB01F3
+:1023A000E901DF019F0172816381E72FF62F3097EA
+:1023B000C1F64115510501F1481B590B4430510537
+:1023C00080F412968D919C911397209719F09B831E
+:1023D0008A8304C09093690280936802FD0132965B
+:1023E00046C0FD01E40FF51F819391934250504088
+:1023F00011965C934E933BC0209166023091670228
+:102400002115310541F420918101309182013093F1
+:102410006702209366022091830130918401211587
+:10242000310541F42DB73EB740917F0150918001B5
+:10243000241B350BE0916602F0916702E217F30767
+:10244000A0F42E1B3F0B2817390778F0AC014E5F24
+:102450005F4F2417350748F04E0F5F1F50936702F8
+:10246000409366028193919302C0E0E0F0E0CF01D7
+:10247000DF91CF910895CF93DF93009709F491C036
+:10248000FC01329713821282609168027091690296
+:102490006115710581F420813181280F391F8091E8
+:1024A0006602909167028217930799F5F09367028D
+:1024B000E093660276C0DB0180E090E002C0CD01CF
+:1024C000D901AE17BF0748F412962D913C9113978E
+:1024D00021153105A1F7CD0121C0B383A283EF01FE
+:1024E000499159919E01240F351FA217B30779F422
+:1024F0002D913C911197240F351F2E5F3F4F318353
+:10250000208312962D913C91139733832283009759
+:1025100029F4F0936902E093680243C0DC0113964A
+:10252000FC93EE9312974D915D91A40FB51FEA179E
+:10253000FB0769F420813181240F351F2E5F3F4F47
+:10254000EC0139832883228133813B832A83E0E0B5
+:10255000F0E002C0FB01BC01DB0112968D919C9161
+:1025600013970097B9F79B012E5F3F4F8D919C9178
+:102570001197820F931F409166025091670248178E
+:10258000590779F4309729F4109269021092680281
+:1025900002C013821282225030403093670220938F
+:1025A0006602DF91CF910895FB01DC0105900D9249
+:1025B0000020E1F70895FB019F01E8944230C4F048
+:1025C0004532B4F44A3029F497FB1EF49095819576
+:1025D0009F4F642F77270E948D11805D8A330CF006
+:1025E000895D8193CB010097A1F716F45DE25193C9
+:1025F0001082C9010C94FC12DC01FC01672F71915F
+:102600007723E1F7329704C07C916D9370836291D8
+:0C261000AE17BF07C8F30895F894FFCF81
+:10261C0001FFFFFFFFFFFFFFFFFF818181818181B0
+:10262C00FFFF818181818181FFFF81818181818196
+:10263C00FFFF818181818181FFFF81818181818186
+:10264C00FFFF818181818181FFFFFFFFFFFFFFFF82
+:10265C00FFFF010101FF8080FFFF010101FF80806E
+:10266C00FFFF010101FF8080FFFF010101FF80805E
+:10267C00FFFF010101FF8080FFFF010101FF80804E
+:10268C00FFFF010101FF8080FFFF010101FF80803E
+:10269C00FF7E818181FF8181817E818181FF8181AA
+:1026AC00817E818181FF8181817E818181FF818118
+:1026BC00817E818181FF8181817E818181FF818108
+:1026CC00817E818181FF8181817E818181FF8181F8
+:1026DC00811E2222221E0202021E2222221E02021F
+:1026EC00021E2222221E0202021E2222221E02028E
+:1026FC00021E2222221E0202021E2222221E02027E
+:10270C00021E2222221E0202021E2222221E02026D
+:10271C0002A100E100210101440C0A0CD00B960B24
+:10272C005C0B220BF40A980A3C0AE0093A200020C0
+:06273C00006A020000002B
 :00000001FF

CubeFirmware/visualizer.c

@@ -33,10 +33,14 @@ void simpleVisualization(uint8_t *data) {
 
 	buff = buffNew();
 
+	buffClearAllPixels(buff);
+
 	for(i = 0; i < 7; i++) {
 		max = data[i] / 31;
 		
+		// d = 7;
 		for (d = 0; d < 8; d++) {
+			// h = max;
 			for (h = 0; h < max; h++) {
 				buffSetPixel(buff, i, h, d);
 			}

UploadTest/main.c

@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
+#include <time.h>
 
 #include "serial.h"
 
@@ -20,9 +21,13 @@ volatile int keepRunning = 1;
 int main(int argc, char *argv[]) {
 	char c;
 	int i, f;
-	
-	if (argc != 2) {
-		printf("Usage: %s /dev/port\n", argv[0]);
+	int animationCount = 1;
+	int frameCount = 2;
+	int duration = 3;
+	int data = -1;
+
+	if (argc < 2) {
+		printf("Usage:\n%s /dev/port [-d 0xff]\n", argv[0]);
 		return 0;
 	}
 
@@ -31,6 +36,11 @@ int main(int argc, char *argv[]) {
 		return 0;
 	}
 
+	if ((argc >= 4) && (strcmp(argv[2], "-d") == 0)) {
+		sscanf(argv[3], "%x", &data);
+		frameCount = 1;
+	}
+
 	signal(SIGINT, intHandler);
 	signal(SIGQUIT, intHandler);
 
@@ -47,7 +57,7 @@ int main(int argc, char *argv[]) {
 	readAck();
 
 	printf("\tSending anim count (1)...");
-	c = 1;
+	c = (char)animationCount;
 	if (serialWriteTry(&c, 1) != 0) {
 		printf(" Could not send it!\n");
 		suicide;
@@ -57,7 +67,7 @@ int main(int argc, char *argv[]) {
 	readAck();
 
 	printf("\tSending frame count (2)...");
-	c = 2;
+	c = (char)frameCount;
 	if (serialWriteTry(&c, 1) != 0) {
 		printf(" Could not send it!\n");
 		suicide;
@@ -66,9 +76,9 @@ int main(int argc, char *argv[]) {
 
 	readAck();
 
-	for (f = 0; f < 2; f++) {
+	for (f = 0; f < frameCount; f++) {
 		printf("\tSending duration (3)...");
-		c = 3;
+		c = (char)duration;
 		if (serialWriteTry(&c, 1) != 0) {
 			printf(" Could not send it!\n");
 			suicide;
@@ -79,29 +89,25 @@ int main(int argc, char *argv[]) {
 
 		printf("\tSending data");
 		
-		if (f == 0) {
-			for(i = 0; i < 64; i++) {
-				c = (char)i; // Some test data
-				if (serialWriteTry(&c, 1) != 0) {
-					printf(" Error while sending!\n");
-					suicide;
+		for(i = 0; i < 64; i++) {
+			if (data == -1) {
+				if (f == 0) {
+					c = (char)i; // Some test data
 				} else {
-					printf(".");
+					c = (char)(63 - i);
 				}
+			} else {
+				c = (char)data;
 			}
-			printf(" Success!\n");
-		} else {
-			for(i = 0; i < 64; i++) {
-				c = (char)63 - i; // Some test data
-				if (serialWriteTry(&c, 1) != 0) {
-					printf(" Error while sending!\n");
-					suicide;
-				} else {
-					printf(".");
-				}
+
+			if (serialWriteTry(&c, 1) != 0) {
+				printf(" Error while sending!\n");
+				suicide;
+			} else {
+				printf(".");
 			}
-			printf(" Success!\n");
 		}
+		printf(" Success!\n");
 
 		readAck();
 	}
@@ -150,6 +156,9 @@ int serialReadTry(char *data, size_t length) {
 	int i = 0;
 	int written = 0;
 	int ret;
+	time_t start, end;
+	start = time(NULL);
+
 	while (keepRunning) {
 		ret = serialRead((data + written), (length - written));
 		if (ret == -1) {
@@ -163,6 +172,11 @@ int serialReadTry(char *data, size_t length) {
 		if (written == length) {
 			break;
 		}
+		end = time(NULL);
+		if (difftime(start, end) > 2) {
+			printf("Timeout went by. Exit!");
+			suicide;
+		}
 	}
 	return 0;
 }