diff --git a/.gitignore b/.gitignore index 3fc71ad..6df57a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ +.vscode firmware.pro +*.pdsprj +*.workspace diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..1bb74c2 --- /dev/null +++ b/Makefile @@ -0,0 +1,13 @@ +MCU = t24 +SRCFILE = firmware +TARGET = usbasp +DEVICE = usb + +build: $(SRCFILE).asm + avrasm2 -fI -W+ie $(SRCFILE).asm -l $(SRCFILE).lss + +flash: + avrdude -p $(MCU) -c $(TARGET) -P $(DEVICE) -U flash:w:$(SRCFILE).hex:a + +clean: + rm -f $(SRCFILE).asm~ $(SRCFILE).hex $(SRCFILE).obj $(SRCFILE).lss $(SRCFILE).cof \ No newline at end of file diff --git a/firmware.asm b/firmware.asm index 7526887..7c304f7 100644 --- a/firmware.asm +++ b/firmware.asm @@ -62,7 +62,7 @@ .equ SW_FLAG_3 = 0xb0 .equ SW_FLAG_4 = 0x70 -.equ SEQ_LENGTH = 4 +.equ SEQ_LENGTH = 2 ; Value that stored in OCR0A for each tone ; 880Hz = 71 diff --git a/firmware.hex b/firmware.hex index 808d49c..4079da0 100644 --- a/firmware.hex +++ b/firmware.hex @@ -5,7 +5,7 @@ :1000300019B3107F60D1109362002FBF2F911F91D1 :1000400018957F937FB702C008EA52B7052702953B :10005000500F7FBF7F91189539D128D12DD13FEF17 -:1000600041E0A4E0AA2EFF27E0E802D078940895AA +:1000600041E0A2E0AA2EFF27E0E802D078940895AC :1000700073E0F3D07A95E9F74AD1772708950FED29 :100080000DBF0027109361000F9301E00093600003 :100090000F9110916000113041F4DEDF1093610088 @@ -21,7 +21,7 @@ :10013000F2CF88D0AECF2F93DED0DDD0DCD0A9B304 :100140009A2FA07F9F70AA27A09362008191981791 :1001500029F42A2D241739F0439516C07ED03FEF9D -:10016000A4E0AA95AA2E2F91FF27E0E8BA9800EF05 +:10016000A2E0AA95AA2E2F91FF27E0E8BA9800EF07 :100170000BBBCDD0109361000F9302E000936000A1 :100180000F9141E0A39408952F91089508957A2D39 :10019000DD27C0E8B0D0652F663430F06C3830F021 diff --git a/firmware.lss b/firmware.lss index 22e0ea3..7503312 100644 --- a/firmware.lss +++ b/firmware.lss @@ -1,5 +1,5 @@ -AVRASM ver. 2.2.7 firmware.asm Wed May 04 20:21:53 2022 +AVRASM ver. 2.2.7 firmware.asm Wed May 18 00:14:04 2022 firmware.asm(13): Including file 'def.inc' firmware.asm(21): warning: Register r26 already defined by the .DEF directive @@ -746,7 +746,7 @@ firmware.asm(73): Including file 'macros.asm' .equ SW_FLAG_3 = 0xb0 .equ SW_FLAG_4 = 0x70 - .equ SEQ_LENGTH = 4 + .equ SEQ_LENGTH = 2 ; Value that stored in OCR0A for each tone ; 880Hz = 71 @@ -927,7 +927,7 @@ firmware.asm(73): Including file 'macros.asm' ; Init important registers for game 00002f ef3f ldi delay_counter_r, 0xff 000030 e041 ldi poll_step_r, 1 -000031 e0a4 ldi temp_r_c, SEQ_LENGTH +000031 e0a2 ldi temp_r_c, SEQ_LENGTH 000032 2eaa mov seq_length_r, temp_r_c 000033 27ff clr ZH 000034 e8e0 ldi ZL, $80 @@ -1074,7 +1074,7 @@ firmware.asm(73): Including file 'macros.asm' _game_over: 0000ae d07e rcall effect_1 0000af ef3f ldi delay_counter_r, 0xff -0000b0 e0a4 ldi temp_r_c, SEQ_LENGTH +0000b0 e0a2 ldi temp_r_c, SEQ_LENGTH 0000b1 95aa dec temp_r_c 0000b2 2eaa mov seq_length_r, temp_r_c diff --git a/schematic/attiny24a_memory-led-game.pdf b/schematic/attiny24a_memory-led-game.pdf new file mode 100644 index 0000000..b6994db Binary files /dev/null and b/schematic/attiny24a_memory-led-game.pdf differ diff --git a/schematic/main.pdf b/schematic/main.pdf deleted file mode 100644 index f8aa97b..0000000 Binary files a/schematic/main.pdf and /dev/null differ