diff --git a/pcb/AES_PixMod_PCB_0v1/~AES_PixMod_PCB_0v1.kicad_pcb.lck b/pcb/AES_PixMod_PCB_0v1/~AES_PixMod_PCB_0v1.kicad_pcb.lck new file mode 100644 index 0000000..d8e3052 --- /dev/null +++ b/pcb/AES_PixMod_PCB_0v1/~AES_PixMod_PCB_0v1.kicad_pcb.lck @@ -0,0 +1 @@ +{"hostname":"MJBL5LegionArch","username":"mbowszys"} \ No newline at end of file diff --git a/recv/pixmod_recv_1v1_commProtocol/build/ATtiny45NeoPixel.elf b/recv/pixmod_recv_1v1_commProtocol/build/ATtiny45NeoPixel.elf index 4889a6f..a52d2bf 100755 Binary files a/recv/pixmod_recv_1v1_commProtocol/build/ATtiny45NeoPixel.elf and b/recv/pixmod_recv_1v1_commProtocol/build/ATtiny45NeoPixel.elf differ diff --git a/recv/pixmod_recv_1v1_commProtocol/build/ATtiny45NeoPixel.hex b/recv/pixmod_recv_1v1_commProtocol/build/ATtiny45NeoPixel.hex index 513b93f..82630ee 100644 --- a/recv/pixmod_recv_1v1_commProtocol/build/ATtiny45NeoPixel.hex +++ b/recv/pixmod_recv_1v1_commProtocol/build/ATtiny45NeoPixel.hex @@ -1,9 +1,9 @@ :100000000EC028C0CCC126C0C0C124C023C022C09D :1000100021C020C01FC01EC0F1C11CC01BC01124C4 :100020001FBECFE5D1E0DEBFCDBF11E0A0E6B0E05E -:10003000E4E8F7E002C005900D92A230B107D9F7CD +:10003000E8E6F7E002C005900D92A230B107D9F7CB :1000400021E0A2E0B1E001C01D92A632B207E1F7C3 -:10005000EED296C3D5CFBB9A3FB7F894C3980000B1 +:10005000EED288C3D5CFBB9A3FB7F894C3980000BF :100060000000000000000000000000000000000090 :1000700000000000000080E291E0FC012081019678 :1000800020FF18C0C39A0000000000000000C398C1 @@ -12,10 +12,10 @@ :1000B0007894089528E0C39AC398EBCF8F929F92CB :1000C000AF92BF92CF92DF92EF92FF920F931F9366 :1000D0004A015B01823070F5A82FB0E0CD0163E0EA -:1000E00070E0FFD2FC01E05EFE4F882D91E0991692 +:1000E00070E0F1D2FC01E05EFE4F882D91E09916A0 :1000F000A104B10454F18FEF8183CD0163E070E07E -:10010000F0D2FC01E05EFE4F802F11302105310559 -:1001100004F18FEF8083CD0163E070E0E2D2FC0157 +:10010000E2D2FC01E05EFE4F802F11302105310567 +:1001100004F18FEF8083CD0163E070E0D4D2FC0165 :10012000E05EFE4F8C2D91E0D916E104F104ACF0B5 :100130008FEF82831F910F91FF90EF90DF90CF9010 :10014000BF90AF909F908F900895B7FED5CF80E07D @@ -37,7 +37,7 @@ :10024000DF93EC010EE010E08C2F817060E070E035 :10025000805DCBDFD695C79501501040A9F7DF919F :10026000CF911F910F910895DC01FB0120E030E058 -:1002700081E090E02E173F070CF00895BD0131D2C8 +:1002700081E090E02E173F070CF00895BD0123D2D6 :100280002F5F3F4FF7CFCF92DF92EF92FF92CF9346 :10029000DF9300D000D0CDB7DEB76B017C01C11475 :1002A000D104E104F104E4F460E070E08DE29DDF4C @@ -45,7 +45,7 @@ :1002C000C114D104E104F10489F40F900F900F9050 :1002D0000F90DF91CF91FF90EF90DF90CF90089536 :1002E00079F760E070E080E380DFEACFB601C70114 -:1002F0002AE030E040E050E005D229833A834B8386 +:1002F0002AE030E040E050E0F7D129833A834B8395 :100300005C83862F60E070E0805D6FDFC980DA80FB :10031000EB80FC80D5CF1F93CF93DF93CDB7DEB7B3 :1003200061970FB6F894DEBF0FBECDBF182F81E1E5 @@ -89,45 +89,43 @@ :10058000700540F680910F01811171CF40911401E7 :10059000509115016091160181E0E3DD5CDD81E0A1 :1005A00080930F0164CF9C01832F859585958F7073 -:1005B00090E066E070E095D0FC01E057FF4F86E0E8 +:1005B00090E066E070E087D0FC01E057FF4F86E0F6 :1005C000AAE1B1E001900D928A95E1F7C90156E0E8 :1005D000959587955A95E1F78F7090E063E070E00C -:1005E00080D0FC01E858FF4F80819181A2818093E7 +:1005E00072D0FC01E858FF4F80819181A2818093F5 :1005F000170190931801A09319013595279535950A -:100600002795822F8F7090E063E070E06AD0FC0144 +:100600002795822F8F7090E063E070E05CD0FC0152 :10061000E05AFF4F80819181A281809314019093D1 :100620001501A09316010DDF80E090E00895BC98BD :10063000AC9A8BB780628BBF1FBC80B7807F80BFB6 :1006400080B7846080BF89B7846089BF13BE12BE43 :1006500081B5886181BD80E481BD78949ADD2FEFFA :1006600084E39CE0215080409040E1F700C000000E -:10067000BB9A85EF90E0D3DDEEDCC0E0D0E0809166 -:1006800002018115B9F080910301909104018C322F -:1006900021E0920768F0893B2BE09207E8F0CE0159 -:1006A00096958795892B61F4C0E0D0E0CC0FDD1FD3 -:1006B00010920201C6DE8AE18A95F1F700C0DFCF11 -:1006C000D695C795D695C795CE01B7DD8FEF90E04B -:1006D000A6DDCE0168DFE8CF893E934038F321964E -:1006E000E5CF0024552704C0080E591F880F991F15 -:1006F000009729F076956795B8F37105B9F7802DC5 -:10070000952F0895052E97FB16F400940FD057FDF2 -:1007100005D014D007FC02D046F408C0509540958F -:10072000309521953F4F4F4F5F4F0895909580959D -:10073000709561957F4F8F4F9F4F0895A1E21A2EBC -:10074000AA1BBB1BFD010DC0AA1FBB1FEE1FFF1F75 -:10075000A217B307E407F50720F0A21BB30BE40BC5 -:10076000F50B661F771F881F991F1A9469F760950C -:100770007095809590959B01AC01BD01CF010895C6 -:04078000F894FFCF1B -:10078400FF000000FF000000FF80800000808080E8 -:100794000080555555000000FF000000FF000000D8 -:1007A400FF80800000808080008055555500000047 -:1007B4000000000000000100DC0500000100F4015D -:1007C40000000100FA0000000100640000000200C3 -:1007D400DC0500000200F40100000200FA00000041 -:1007E4000200640000000200DC0502000200F401C3 -:1007F40002000200FA00020002006400020003008A -:100804000000020030313233343536373839414252 -:1008140043444546007374617274696E672E2E0AF0 -:020824000000D2 +:10067000BB9A85EF90E0D3DDEEDCBB9A8FB7F894A0 +:10068000C398C39A0000000000000000C398000057 +:100690000000000000000000000000000000C39AFD +:1006A0002FEF80E792E0215080409040E1F700C0BA +:1006B0000000C398000000000000000000000000DF +:1006C00000000000DECF0024552704C0080E591F8B +:1006D000880F991F009729F076956795B8F37105F3 +:1006E000B9F7802D952F0895052E97FB16F40094E9 +:1006F0000FD057FD05D014D007FC02D046F408C037 +:1007000050954095309521953F4F4F4F5F4F08953D +:1007100090958095709561957F4F8F4F9F4F08956D +:10072000A1E21A2EAA1BBB1BFD010DC0AA1FBB1FF5 +:10073000EE1FFF1FA217B307E407F50720F0A21B67 +:10074000B30BE40BF50B661F771F881F991F1A94D4 +:1007500069F760957095809590959B01AC01BD01FE +:08076000CF010895F894FFCFCA +:10076800FF000000FF000000FF8080000080808004 +:100778000080555555000000FF000000FF000000F4 +:10078800FF80800000808080008055555500000063 +:100798000000000000000100DC0500000100F40179 +:1007A80000000100FA0000000100640000000200DF +:1007B800DC0500000200F40100000200FA0000005D +:1007C8000200640000000200DC0502000200F401DF +:1007D80002000200FA0002000200640002000300A6 +:1007E800000002003031323334353637383941426F +:1007F80043444546007374617274696E672E2E0A0D +:020808000000EE :00000001FF diff --git a/recv/pixmod_recv_1v1_commProtocol/build/CMakeFiles/ATtiny45NeoPixel.elf.dir/main.c.o b/recv/pixmod_recv_1v1_commProtocol/build/CMakeFiles/ATtiny45NeoPixel.elf.dir/main.c.o index fb9a457..7620415 100644 Binary files a/recv/pixmod_recv_1v1_commProtocol/build/CMakeFiles/ATtiny45NeoPixel.elf.dir/main.c.o and b/recv/pixmod_recv_1v1_commProtocol/build/CMakeFiles/ATtiny45NeoPixel.elf.dir/main.c.o differ diff --git a/recv/pixmod_recv_1v1_commProtocol/main.c b/recv/pixmod_recv_1v1_commProtocol/main.c index c7cb5f3..2101d4f 100644 --- a/recv/pixmod_recv_1v1_commProtocol/main.c +++ b/recv/pixmod_recv_1v1_commProtocol/main.c @@ -501,6 +501,7 @@ int main() { "nop\n\t" "nop\n\t" "nop\n\t" "nop\n\t" ); NEOPIXEL_PORT |= mask; + _delay_ms(100); NEOPIXEL_PORT &= cli_mask; __asm__ __volatile__ ( "nop\n\t" "nop\n\t" "nop\n\t" "nop\n\t" @@ -508,6 +509,18 @@ int main() { ); }*/ + /*while(1){ + setPixel_RGB(1, 255, 0, 0); + ws2812_send(); + _delay_ms(1000); + setPixel_RGB(1, 0, 255, 0); + ws2812_send(); + _delay_ms(1000); + setPixel_RGB(1, 0, 0, 255); + ws2812_send(); + _delay_ms(1000); + }*/ + while(1){ if(tim1_ic_flag){ //if(SERIAL_OUT){ diff --git a/xmit/pixmod_xmit_1v2_ethernet/main.py b/xmit/pixmod_xmit_1v2_ethernet/main.py index 7e39c3b..a72f331 100644 --- a/xmit/pixmod_xmit_1v2_ethernet/main.py +++ b/xmit/pixmod_xmit_1v2_ethernet/main.py @@ -1,17 +1,19 @@ from lib_pixmod import PixMod from lib_artnet import ArtNet +import time -def clbk_packet(artnet): - print("Uni: {} | Ch1: {} Ch2: {} Ch3: {}".format(artnet.id_universe, artnet.channels[0], artnet.channels[1], artnet.channels[2])) - pixmod.xmit_fx(0, 6, 0, repeat=1) - time.sleep_ms(1000) try: pixmod = PixMod() - artnet = ArtNet(0, 0, 9) + + def clbk_packet(artnet): + print("Uni: {} | Ch1: {} Ch2: {} Ch3: {}".format(artnet.id_universe, artnet.channels[0]//16, artnet.channels[1]//16, artnet.channels[2]//16)) + + pixmod.xmit_fx(artnet.channels[0]//16, artnet.channels[1]//16, artnet.channels[2]//16, repeat=1) + #time.sleep_ms(1000) artnet.clbk = clbk_packet while(True):