From ab5a9cedf6c59897cd1d18c7f7830900b47b9da7 Mon Sep 17 00:00:00 2001 From: sergeyyarkov Date: Thu, 22 Jun 2023 19:51:58 +0300 Subject: [PATCH] relay pin --- NOTES.md | 12 + definitions.asm | 3 +- .../attiny2313a_thermostat.X.production.hex | 122 +-- .../attiny2313a_thermostat.X.production.lss | 933 +++++++++--------- .../attiny2313a_thermostat.X.production.map | 113 +-- .../attiny2313a_thermostat.X.production.obj | Bin 4453 -> 4462 bytes .../attiny2313a_thermostat.X.production.tmp | 104 +- macros.asm | 20 + main.asm | 28 +- 9 files changed, 698 insertions(+), 637 deletions(-) create mode 100644 NOTES.md diff --git a/NOTES.md b/NOTES.md new file mode 100644 index 0000000..6a46825 --- /dev/null +++ b/NOTES.md @@ -0,0 +1,12 @@ + +ОСНОВНОЕ: + +- сделать подпрограмму, которая будет проверять флаг включен сейчас индикатор или выключен и вызывать ее в гл.цикле +- сделать подпрограмму, которая будет проверять текущую температуру с уставкой учитывая гистерезис +- сделать подпрограмму, которя будет опрашивать кнопки и в зависимости от нажатия переключють состояние программы +- сделать программу, которая будет сохранять уставку температуры и гистерезис в EEPROM (перед инициализации МК + необходимо чтобы данные брались из EEPROM и записывались в соответствующие ячейки) + +ДОПОЛНИТЕЛЬНО (если хватит памяти): + +- отправлять данные температуры в UART ("целая-часть:дробная-часть\n") \ No newline at end of file diff --git a/definitions.asm b/definitions.asm index c92080b..70aac6c 100644 --- a/definitions.asm +++ b/definitions.asm @@ -13,7 +13,8 @@ .EQU DIGIT_4_PIN = PD5 ; Пин разряда индикатора 4 .EQU LED_ERR_PIN = PD6 ; Светодиод который говорит о том, что МК в состоянии ошибки - +.EQU LED_ERR_PORT = PORTD + .EQU OW_LINE = PB1 ; Пин шины 1-Wire .EQU OW_DDR = DDRB .EQU OW_PIN = PINB diff --git a/dist/default/production/attiny2313a_thermostat.X.production.hex b/dist/default/production/attiny2313a_thermostat.X.production.hex index 7016ccb..946dcce 100644 --- a/dist/default/production/attiny2313a_thermostat.X.production.hex +++ b/dist/default/production/attiny2313a_thermostat.X.production.hex @@ -1,64 +1,64 @@ :020000020000FC -:0200000073C0CB +:0200000074C0CA :0200160018953B -:10001A0015C00F931F932F933F930FB7B49908C03E -:10002A0020916000203009F003C011E010936000B5 -:10003A000FBF3F912F911F910F9118954F935F9387 -:10004A000F931F935FB74091670045300CF403C0CC -:10005A00442740936700403081F493989498959888 -:10006A000EF002C00BE002C000916500002311F0FF -:10007A00929A01C0929867D1E2D0413081F4929865 -:10008A00949895980091640030916500032B11F0C3 -:10009A00939A01C093980091640055D1D0D0423010 -:1000AA0059F4929893989598949A009163004BD139 -:1000BA00002D0F77002EC3D0433041F492989398C5 -:1000CA009498959A00916C003ED1B9D0439540938B -:1000DA0067005FBF1F910F915F914F9118950FEDC8 -:1000EA000DBF0EE701BB01EE07BB0CE108BB02E046 -:1000FA0000BF05E003BF09E106BF01E009BF00E256 -:10010A000BBF0CE100BD11241092670000E00093C0 -:10011A006000002700936A0000936B0000EF0093D1 -:10012A006C001CD180E090E000916000003079F40E -:10013A00F0D070FD969A70FF969877D01AD119D19F -:10014A002AD010916A00812F10916B00912F0130F3 -:10015A0011F4DFD080D0023039F71BE0109363002E -:10016A001093640010936500109366000000DCCFC2 -:10017A00EE24FF1841E1001F111F4A9509F4089562 -:10018A00EE1CFF1CE21AF30A20F4E20EF31E889416 -:10019A00F2CF0894F0CF0F931F932F933F934F936F -:1001AA0068D00CEC802E7AD00EEB802E77D0AAE69F -:1001BA00B0E095D0ABE6B0E092D010916A00209101 -:1001CA006B002F93287F283F11F0E89409C02F91E4 -:1001DA0068941095209531E0130F30E0231F01C079 -:1001EA002F91269517952695179526951795269555 -:1001FA00179530916A000EF43195432F3F70432FC3 -:10020A00330F330F330F440F340F36953695369527 -:10021A00369510936A0020936B0030936C004F91CF -:10022A003F912F911F910F9108950F9322D00CECBB -:10023A00802E34D004E4802E31D00F9108950F938C -:10024A000FB800E40EB90BE10DB9769BFDCFC09A49 -:10025A00C0980F9108950F938CD0B29B0196B39BCF -:10026A000197B49B01C003C000E0009360000F91A6 -:10027A000895F894B99A33E04EEB8BD0B99830E0F0 -:10028A004AE887D005D033E042E383D078940895D2 -:10029A00B19B716002C0B1997E7F08950F931F933D -:1002AA00082D18E0069508F458F0F894B99A30E049 -:1002BA0046E76FD0B99830E042E16BD078940AC033 -:1002CA00F894B99A30E04AE064D0B99830E04EE741 -:1002DA0060D078941A9531F71F910F9108950F9372 -:1002EA001F93002718E0F8940695B99A30E04AE07F -:1002FA0050D0B99830E040E14CD0B199006830E074 -:10030A004CE647D01A9581F70C9378941F910F9178 -:10031A000895F8945F9354E0A3E6B0E080936100F7 -:10032A009093620000916100109162002AE030E02F -:10033A001FDFED9200936100109362005A9591F7C6 -:10034A005F91789408950F931F93E4ECF3E01127DB -:10035A00E00FF11F04901F910F910895C59A1DD0C7 -:10036A00C5980895C59A19D018D017D016D0C5982F -:10037A0008950F931F932F932AE01FEF0FEF0A950B -:10038A00F1F71A95D9F72A95C1F72F911F910F9175 -:10039A00089541503040E8F708950F931F932F9323 -:1003AA0026E00FEF1FEF1A95F1F70A95D9F72A956C -:1003BA00C1F72F911F910F910895C0F9A4B0999296 -:0603CA0082F880909CBF48 +:10001A0016C018950F931F932F933F930FB7B49958 +:10002A0008C020916000203009F003C011E010934D +:10003A0060000FBF3F912F911F910F9118954F9319 +:10004A005F930F931F935FB74091670045300CF49D +:10005A0003C0442740936700403081F493989498F2 +:10006A0095980EF002C00BE002C0009165000023D3 +:10007A0011F0929A01C0929867D1E2D0413081F48E +:10008A009298949895980091640030916500032B9A +:10009A0011F0939A01C093980091640055D1D0D081 +:1000AA00423059F4929893989598949A00916300E3 +:1000BA004BD1002D0F77002EC3D0433041F49298D4 +:1000CA0093989498959A00916C003ED1B9D0439533 +:1000DA00409367005FBF1F910F915F914F911895F1 +:1000EA000FED0DBF0FE701BB01EE07BB0CE108BB2B +:1000FA0002E000BF05E003BF09E106BF00E20BBF53 +:10010A000CE100BD11241092670000E0009360002A +:10011A00002700936A0000936B0000EF00936C00C5 +:10012A001ED180E090E000916000003081F4969842 +:10013A00F1D07CD01FD11ED12FD010916A00812F0F +:10014A0010916B00912F0F9301E009BF0F910130BD +:10015A0019F49698DFD080D0023029F7969A1BE0DE +:10016A001093630010936400109365001093660067 +:10017A00DACFEE24FF1841E1001F111F4A9509F456 +:10018A000895EE1CFF1CE21AF30A20F4E20EF31E95 +:10019A008894F2CF0894F0CF0F931F932F933F9335 +:1001AA004F9368D00CEC802E7AD00EEB802E77D04D +:1001BA00AAE6B0E095D0ABE6B0E092D010916A0022 +:1001CA0020916B002F93287F283F11F0E89409C0F3 +:1001DA002F9168941095209531E0130F30E0231F7A +:1001EA0001C02F912695179526951795269517954F +:1001FA002695179530916A000EF43195432F3F707A +:10020A00432F330F330F330F440F340F3695369580 +:10021A003695369510936A0020936B0030936C00E4 +:10022A004F913F912F911F910F9108950F9322D0D3 +:10023A000CEC802E34D004E4802E31D00F91089536 +:10024A000F930FB800E40EB90BE10DB9769BFDCF01 +:10025A00C09AC0980F9108950F938CD0B29B0196C3 +:10026A00B39B0197B49B01C003C000E000936000F8 +:10027A000F910895F894B99A33E04EEB8BD0B99860 +:10028A0030E04AE887D005D033E042E383D078945F +:10029A000895B19B716002C0B1997E7F08950F9352 +:1002AA001F93082D18E0069508F458F0F894B99AA7 +:1002BA0030E046E76FD0B99830E042E16BD07894ED +:1002CA000AC0F894B99A30E04AE064D0B99830E0AC +:1002DA004EE760D078941A9531F71F910F910895DF +:1002EA000F931F93002718E0F8940695B99A30E007 +:1002FA004AE050D0B99830E040E14CD0B19900685A +:10030A0030E04CE647D01A9581F70C9378941F9108 +:10031A000F910895F8945F9354E0A3E6B0E08093B8 +:10032A0061009093620000916100109162002AE0DE +:10033A0030E01FDFED9200936100109362005A953E +:10034A0091F75F91789408950F931F93E6ECF3E089 +:10035A001127E00FF11F04901F910F910895C59A7C +:10036A001DD0C5980895C59A19D018D017D016D09F +:10037A00C59808950F931F932F932AE01FEF0FEF4D +:10038A000A95F1F71A95D9F72A95C1F72F911F9176 +:10039A000F91089541503040E8F708950F931F9345 +:1003AA002F9326E00FEF1FEF1A95F1F70A95D9F769 +:1003BA002A95C1F72F911F910F910895C0F9A4B002 +:0803CA00999282F880909CBF1B :00000001FF diff --git a/dist/default/production/attiny2313a_thermostat.X.production.lss b/dist/default/production/attiny2313a_thermostat.X.production.lss index 06e1810..01ee9b7 100644 --- a/dist/default/production/attiny2313a_thermostat.X.production.lss +++ b/dist/default/production/attiny2313a_thermostat.X.production.lss @@ -1,26 +1,26 @@ -AVRASM ver. 2.2.7 main.asm Thu Jun 22 12:07:49 2023 +AVRASM ver. 2.2.7 main.asm Thu Jun 22 18:27:57 2023 [builtin](2): Including file '/home/sergeyyarkov/.mchp_packs/Microchip/ATtiny_DFP/3.0.151/avrasm/inc\tn2313Adef.inc' main.asm(15): Including file 'definitions.asm' main.asm(16): Including file 'macros.asm' -main.asm(275): Including file 'div16u.asm' +main.asm(277): Including file 'div16u.asm' div16u.asm(22): warning: Register r16 already defined by the .DEF directive -main.asm(275): 'div16u.asm' included form here +main.asm(277): 'div16u.asm' included form here div16u.asm(23): warning: Register r17 already defined by the .DEF directive -main.asm(275): 'div16u.asm' included form here +main.asm(277): 'div16u.asm' included form here div16u.asm(24): warning: Register r16 already defined by the .DEF directive -main.asm(275): 'div16u.asm' included form here +main.asm(277): 'div16u.asm' included form here div16u.asm(25): warning: Register r17 already defined by the .DEF directive -main.asm(275): 'div16u.asm' included form here +main.asm(277): 'div16u.asm' included form here div16u.asm(27): warning: Register r19 already defined by the .DEF directive -main.asm(275): 'div16u.asm' included form here +main.asm(277): 'div16u.asm' included form here div16u.asm(28): warning: Register r20 already defined by the .DEF directive -main.asm(275): 'div16u.asm' included form here +main.asm(277): 'div16u.asm' included form here [builtin](2): Including file '/home/sergeyyarkov/.mchp_packs/Microchip/ATtiny_DFP/3.0.151/avrasm/inc\tn2313Adef.inc' main.asm(15): Including file 'definitions.asm' main.asm(16): Including file 'macros.asm' -main.asm(275): Including file 'div16u.asm' +main.asm(277): Including file 'div16u.asm' ; @@ -751,7 +751,8 @@ main.asm(275): Including file 'div16u.asm' .EQU DIGIT_4_PIN = PD5 ; Пин разряда индикатора 4 .EQU LED_ERR_PIN = PD6 ; Светодиод который говорит о том, что МК в состоянии ошибки - + .EQU LED_ERR_PORT = PORTD + .EQU OW_LINE = PB1 ; Пин шины 1-Wire .EQU OW_DDR = DDRB .EQU OW_PIN = PINB @@ -814,6 +815,26 @@ main.asm(275): Including file 'div16u.asm' cbi OW_DDR, OW_LINE .ENDMACRO + .MACRO relay_on + sbi RELAY_PORT, RELAY_PIN + .ENDMACRO + + .MACRO relay_off + cbi RELAY_PORT, RELAY_PIN + .ENDMACRO + + .MACRO display_on + push r16 + outi r16, TIMSK, (1< .ORG 0x00 -000000 c073 rjmp RESET_vect +000000 c074 rjmp RESET_vect .ORG 0x000B ; rjmp PCINT0_vect 00000b 9518 reti .ORG 0x000D -00000d c015 rjmp TIMER0_COMPA_vect +00000d c016 rjmp TIMER0_COMPA_vect // // PCINT0_vect: -00000e 930f push r16 -00000f 931f push r17 -000010 932f push r18 -000011 933f push r19 -000012 b70f in r16, SREG +00000e 9518 reti +00000f 930f push r16 +000010 931f push r17 +000011 932f push r18 +000012 933f push r19 +000013 b70f in r16, SREG + + ; display_off ; in r17, SW_PIN ; clr r18 @@ -867,153 +891,151 @@ main.asm(275): Including file 'div16u.asm' ; and r17, r18 ; cp r17, r18 ; breq _PCINT0_vect_end -000013 99b4 sbic SW_PIN, SW_SET_PIN -000014 c008 rjmp _PCINT0_vect_end +000014 99b4 sbic SW_PIN, SW_SET_PIN +000015 c008 rjmp _PCINT0_vect_end -000015 9120 0060 lds r18, MCU_STATE -000017 3020 cpi r18, MCU_STATE_DEFAULT -000018 f009 breq _INTO_PROGRAM_STATE -000019 c003 rjmp _PCINT0_vect_end +000016 9120 0060 lds r18, MCU_STATE +000018 3020 cpi r18, MCU_STATE_DEFAULT +000019 f009 breq _INTO_PROGRAM_STATE +00001a c003 rjmp _PCINT0_vect_end _INTO_PROGRAM_STATE: -00001a e011 ldi r17, MCU_STATE_PROGRAM -00001b 9310 0060 sts MCU_STATE, r17 +00001b e011 ldi r17, MCU_STATE_PROGRAM +00001c 9310 0060 sts MCU_STATE, r17 _PCINT0_vect_end: -00001d bf0f out SREG, r16 -00001e 913f pop r19 -00001f 912f pop r18 -000020 911f pop r17 -000021 910f pop r16 -000022 9518 reti// +00001e bf0f out SREG, r16 +00001f 913f pop r19 +000020 912f pop r18 +000021 911f pop r17 +000022 910f pop r16 +000023 9518 reti// // ; **** ДИНАМИЧЕСКАЯ ИНДИКАЦИЯ ************************************ TIMER0_COMPA_vect: -000023 934f push r20 -000024 935f push r21 -000025 930f push r16 -000026 931f push r17 -000027 b75f in r21, SREG +000024 934f push r20 +000025 935f push r21 +000026 930f push r16 +000027 931f push r17 +000028 b75f in r21, SREG -000028 9140 0067 lds r20, CURRENT_DIGIT -00002a 3045 cpi r20, 5 -00002b f40c brge _CLR_CURRENT_DIGIT ; сброс активного разряда если >= 5 -00002c c003 rjmp _indicate_1 +000029 9140 0067 lds r20, CURRENT_DIGIT +00002b 3045 cpi r20, 5 +00002c f40c brge _CLR_CURRENT_DIGIT ; сброс активного разряда если >= 5 +00002d c003 rjmp _indicate_1 _CLR_CURRENT_DIGIT: ; сброс текущего активного разряда в ноль -00002d 2744 clr r20 -00002e 9340 0067 sts CURRENT_DIGIT, r20 +00002e 2744 clr r20 +00002f 9340 0067 sts CURRENT_DIGIT, r20 _indicate_1: -000030 3040 cpi r20, 0 -000031 f481 brne _indicate_2 +000031 3040 cpi r20, 0 +000032 f481 brne _indicate_2 -000032 9893 cbi PORTD, DIGIT_2_PIN -000033 9894 cbi PORTD, DIGIT_3_PIN -000034 9895 cbi PORTD, DIGIT_4_PIN -000035 f00e brts PC+2 -000036 c002 rjmp PC+3 -000037 e00b ldi TEMP_REG_A, 11 ; // - -000038 c002 rjmp PC+3 -000039 9100 0065 lds TEMP_REG_A, DIGITS+2 -00003b 2300 tst TEMP_REG_A -00003c f011 breq PC+3 -00003d 9a92 sbi PORTD, DIGIT_1_PIN -00003e c001 rjmp PC+2 -00003f 9892 cbi PORTD, DIGIT_1_PIN -000040 d167 rcall DISPLAY_DECODER -000041 d0e2 rcall USI_TRANSMIT +000033 9893 cbi PORTD, DIGIT_2_PIN +000034 9894 cbi PORTD, DIGIT_3_PIN +000035 9895 cbi PORTD, DIGIT_4_PIN +000036 f00e brts PC+2 +000037 c002 rjmp PC+3 +000038 e00b ldi TEMP_REG_A, 11 ; // - +000039 c002 rjmp PC+3 +00003a 9100 0065 lds TEMP_REG_A, DIGITS+2 +00003c 2300 tst TEMP_REG_A +00003d f011 breq PC+3 +00003e 9a92 sbi PORTD, DIGIT_1_PIN +00003f c001 rjmp PC+2 +000040 9892 cbi PORTD, DIGIT_1_PIN +000041 d167 rcall DISPLAY_DECODER +000042 d0e2 rcall USI_TRANSMIT _indicate_2: -000042 3041 cpi r20, 1 -000043 f481 brne _indicate_3 +000043 3041 cpi r20, 1 +000044 f481 brne _indicate_3 -000044 9892 cbi PORTD, DIGIT_1_PIN -000045 9894 cbi PORTD, DIGIT_3_PIN -000046 9895 cbi PORTD, DIGIT_4_PIN -000047 9100 0064 lds TEMP_REG_A, DIGITS+1 -000049 9130 0065 lds r19, DIGITS+2 -00004b 2b03 or TEMP_REG_A, r19 -00004c f011 breq PC+3 -00004d 9a93 sbi PORTD, DIGIT_2_PIN -00004e c001 rjmp PC+2 -00004f 9893 cbi PORTD, DIGIT_2_PIN -000050 9100 0064 lds TEMP_REG_A, DIGITS+1 -000052 d155 rcall DISPLAY_DECODER -000053 d0d0 rcall USI_TRANSMIT +000045 9892 cbi PORTD, DIGIT_1_PIN +000046 9894 cbi PORTD, DIGIT_3_PIN +000047 9895 cbi PORTD, DIGIT_4_PIN +000048 9100 0064 lds TEMP_REG_A, DIGITS+1 +00004a 9130 0065 lds r19, DIGITS+2 +00004c 2b03 or TEMP_REG_A, r19 +00004d f011 breq PC+3 +00004e 9a93 sbi PORTD, DIGIT_2_PIN +00004f c001 rjmp PC+2 +000050 9893 cbi PORTD, DIGIT_2_PIN +000051 9100 0064 lds TEMP_REG_A, DIGITS+1 +000053 d155 rcall DISPLAY_DECODER +000054 d0d0 rcall USI_TRANSMIT _indicate_3: -000054 3042 cpi r20, 2 -000055 f459 brne _indicate_4 +000055 3042 cpi r20, 2 +000056 f459 brne _indicate_4 -000056 9892 cbi PORTD, DIGIT_1_PIN -000057 9893 cbi PORTD, DIGIT_2_PIN -000058 9895 cbi PORTD, DIGIT_4_PIN -000059 9a94 sbi PORTD, DIGIT_3_PIN -00005a 9100 0063 lds TEMP_REG_A, DIGITS -00005c d14b rcall DISPLAY_DECODER +000057 9892 cbi PORTD, DIGIT_1_PIN +000058 9893 cbi PORTD, DIGIT_2_PIN +000059 9895 cbi PORTD, DIGIT_4_PIN +00005a 9a94 sbi PORTD, DIGIT_3_PIN +00005b 9100 0063 lds TEMP_REG_A, DIGITS +00005d d14b rcall DISPLAY_DECODER ; зажигаем точку -00005d 2d00 mov r16, r0 -00005e 770f cbr r16, (1<<7) -00005f 2e00 mov r0, r16 -000060 d0c3 rcall USI_TRANSMIT +00005e 2d00 mov r16, r0 +00005f 770f cbr r16, (1<<7) +000060 2e00 mov r0, r16 +000061 d0c3 rcall USI_TRANSMIT _indicate_4: -000061 3043 cpi r20, 3 -000062 f441 brne _indicate_exit +000062 3043 cpi r20, 3 +000063 f441 brne _indicate_exit -000063 9892 cbi PORTD, DIGIT_1_PIN -000064 9893 cbi PORTD, DIGIT_2_PIN -000065 9894 cbi PORTD, DIGIT_3_PIN -000066 9a95 sbi PORTD, DIGIT_4_PIN -000067 9100 006c lds TEMP_REG_A, TEMP_F -000069 d13e rcall DISPLAY_DECODER -00006a d0b9 rcall USI_TRANSMIT +000064 9892 cbi PORTD, DIGIT_1_PIN +000065 9893 cbi PORTD, DIGIT_2_PIN +000066 9894 cbi PORTD, DIGIT_3_PIN +000067 9a95 sbi PORTD, DIGIT_4_PIN +000068 9100 006c lds TEMP_REG_A, TEMP_F +00006a d13e rcall DISPLAY_DECODER +00006b d0b9 rcall USI_TRANSMIT _indicate_exit: -00006b 9543 inc r20 -00006c 9340 0067 sts CURRENT_DIGIT, r20 -00006e bf5f out SREG, r21 +00006c 9543 inc r20 +00006d 9340 0067 sts CURRENT_DIGIT, r20 +00006f bf5f out SREG, r21 -00006f 911f pop r17 -000070 910f pop r16 -000071 915f pop r21 -000072 914f pop r20 -000073 9518 reti +000070 911f pop r17 +000071 910f pop r16 +000072 915f pop r21 +000073 914f pop r20 +000074 9518 reti ;// ; **** СТАРТ ПРОГРАММЫ ******************************************* RESET_vect: -000074 ed0f ldi TEMP_REG_A, LOW(RAMEND) -000075 bf0d out SPL, TEMP_REG_A +000075 ed0f ldi TEMP_REG_A, LOW(RAMEND) +000076 bf0d out SPL, TEMP_REG_A // ; **** ПРОЦЕСС ИНИЦИАЛИЗАЦИИ МК ********************************** MCU_INIT: ; **** ИНИЦИАЛИЗАЦИЯ ПИНОВ ************************************* -000076 e70e -000077 bb01 outi r16, DDRD, (1< @@ -1045,43 +1067,46 @@ main.asm(275): Including file 'div16u.asm' ; **** ГЛАВНЫЙ ЦИКЛ ********************************************** LOOP: ; rcall DISPLAY_UPD_DIGITS -000099 9100 0060 lds r16, MCU_STATE ; получаем текущее состояние МК +000098 9100 0060 lds r16, MCU_STATE ; получаем текущее состояние МК _STATE_DEFAULT: -00009b 3000 cpi r16, MCU_STATE_DEFAULT -00009c f479 brne _STATE_PROGRAM -00009d d0f0 rcall DISPLAY_UPD_DIGITS -00009e fd70 sbrc OWFR, OWPRF -00009f 9a96 sbi PORTD, PD6 -0000a0 ff70 sbrs OWFR, OWPRF -0000a1 9896 cbi PORTD, PD6 +00009a 3000 cpi r16, MCU_STATE_DEFAULT +00009b f481 brne _STATE_PROGRAM +00009c 9896 cbi LED_ERR_PORT, LED_ERR_PIN +00009d d0f1 rcall DISPLAY_UPD_DIGITS -0000a2 d077 rcall TEMP_CONV -0000a3 d11a rcall DEBOUNCE_SW -0000a4 d119 rcall DEBOUNCE_SW -0000a5 d02a rcall TEMP_RD +00009e d07c rcall TEMP_CONV +00009f d11f rcall DEBOUNCE_SW +0000a0 d11e rcall DEBOUNCE_SW +0000a1 d02f rcall TEMP_RD -0000a6 9110 006a lds r17, TEMP_L -0000a8 2f81 mov DISP_NUM_L, r17 -0000a9 9110 006b lds r17, TEMP_H -0000ab 2f91 mov DISP_NUM_H, r17 +0000a2 9110 006a lds r17, TEMP_L +0000a4 2f81 mov DISP_NUM_L, r17 +0000a5 9110 006b lds r17, TEMP_H +0000a7 2f91 mov DISP_NUM_H, r17 + +0000a8 930f +0000a9 e001 +0000aa bf09 +0000ab 910f display_on _STATE_PROGRAM: -0000ac 3001 cpi r16, MCU_STATE_PROGRAM -0000ad f411 brne _STATE_ERROR -0000ae d0df rcall DISPLAY_UPD_DIGITS -0000af d080 rcall SW_CHECK_PROCESS +0000ac 3001 cpi r16, MCU_STATE_PROGRAM +0000ad f419 brne _STATE_ERROR +0000ae 9896 cbi LED_ERR_PORT, LED_ERR_PIN +0000af d0df rcall DISPLAY_UPD_DIGITS +0000b0 d080 rcall SW_CHECK_PROCESS _STATE_ERROR: -0000b0 3002 cpi r16, MCU_STATE_ERROR -0000b1 f739 brne LOOP -0000b2 e01b ldi r17, 11 -0000b3 9310 0063 sts DIGITS, r17 -0000b5 9310 0064 sts DIGITS+1, r17 -0000b7 9310 0065 sts DIGITS+2, r17 -0000b9 9310 0066 sts DIGITS+3, r17 -0000bb 0000 nop +0000b1 3002 cpi r16, MCU_STATE_ERROR +0000b2 f729 brne LOOP +0000b3 9a96 sbi LED_ERR_PORT, LED_ERR_PIN +0000b4 e01b ldi r17, 11 +0000b5 9310 0063 sts DIGITS, r17 +0000b7 9310 0064 sts DIGITS+1, r17 +0000b9 9310 0065 sts DIGITS+2, r17 +0000bb 9310 0066 sts DIGITS+3, r17 -0000bc cfdc rjmp LOOP +0000bd cfda rjmp LOOP // @@ -1119,148 +1144,148 @@ main.asm(275): Including file 'div16u.asm' ;***** Code div16u: -0000bd 24ee clr drem16uL ; clear remainder Low byte -0000be 18ff sub drem16uH,drem16uH ; clear remainder High byte and carry -0000bf e141 ldi dcnt16u,17 ; init loop counter +0000be 24ee clr drem16uL ; clear remainder Low byte +0000bf 18ff sub drem16uH,drem16uH ; clear remainder High byte and carry +0000c0 e141 ldi dcnt16u,17 ; init loop counter d16u_1: -0000c0 1f00 rol dd16uL ; shift left dividend -0000c1 1f11 rol dd16uH -0000c2 954a dec dcnt16u ; decrement counter -0000c3 f409 brne d16u_2 ; if done -0000c4 9508 ret ; return +0000c1 1f00 rol dd16uL ; shift left dividend +0000c2 1f11 rol dd16uH +0000c3 954a dec dcnt16u ; decrement counter +0000c4 f409 brne d16u_2 ; if done +0000c5 9508 ret ; return d16u_2: -0000c5 1cee rol drem16uL ; shift dividend into remainder -0000c6 1cff rol drem16uH -0000c7 1ae2 sub drem16uL,dv16uL ; remainder = remainder - divisor -0000c8 0af3 sbc drem16uH,dv16uH -0000c9 f420 brcc d16u_3 ; if result negative -0000ca 0ee2 add drem16uL,dv16uL ; restore remainder -0000cb 1ef3 adc drem16uH,dv16uH -0000cc 9488 clc ; clear carry to be shifted into result -0000cd cff2 rjmp d16u_1 ; else +0000c6 1cee rol drem16uL ; shift dividend into remainder +0000c7 1cff rol drem16uH +0000c8 1ae2 sub drem16uL,dv16uL ; remainder = remainder - divisor +0000c9 0af3 sbc drem16uH,dv16uH +0000ca f420 brcc d16u_3 ; if result negative +0000cb 0ee2 add drem16uL,dv16uL ; restore remainder +0000cc 1ef3 adc drem16uH,dv16uH +0000cd 9488 clc ; clear carry to be shifted into result +0000ce cff2 rjmp d16u_1 ; else d16u_3: -0000ce 9408 sec ; set carry to be shifted into result -0000cf cff0 +0000cf 9408 sec ; set carry to be shifted into result +0000d0 cff0 // TEMP_RD: -0000d0 930f push r16 -0000d1 931f push r17 -0000d2 932f push r18 -0000d3 933f push r19 -0000d4 934f push r20 +0000d1 930f push r16 +0000d2 931f push r17 +0000d3 932f push r18 +0000d4 933f push r19 +0000d5 934f push r20 ; cli -0000d5 d068 rcall OW_PRESENCE -0000d6 ec0c ldi r16, DS18B20_CMD_SKIPROM -0000d7 2e80 mov OW_CMD_r, r16 -0000d8 d07a rcall OW_SEND_BYTE +0000d6 d068 rcall OW_PRESENCE +0000d7 ec0c ldi r16, DS18B20_CMD_SKIPROM +0000d8 2e80 mov OW_CMD_r, r16 +0000d9 d07a rcall OW_SEND_BYTE -0000d9 eb0e ldi r16, DS18B20_CMD_RSCRATCHPAD -0000da 2e80 mov OW_CMD_r, r16 -0000db d077 rcall OW_SEND_BYTE +0000da eb0e ldi r16, DS18B20_CMD_RSCRATCHPAD +0000db 2e80 mov OW_CMD_r, r16 +0000dc d077 rcall OW_SEND_BYTE -0000dc e6aa ldi XL, LOW(TEMP_L) -0000dd e0b0 ldi XH, HIGH(TEMP_L) -0000de d095 rcall OW_RD_BYTE +0000dd e6aa ldi XL, LOW(TEMP_L) +0000de e0b0 ldi XH, HIGH(TEMP_L) +0000df d095 rcall OW_RD_BYTE -0000df e6ab ldi XL, LOW(TEMP_H) -0000e0 e0b0 ldi XH, HIGH(TEMP_H) -0000e1 d092 rcall OW_RD_BYTE +0000e0 e6ab ldi XL, LOW(TEMP_H) +0000e1 e0b0 ldi XH, HIGH(TEMP_H) +0000e2 d092 rcall OW_RD_BYTE -0000e2 9110 006a lds r17, TEMP_L -0000e4 9120 006b lds r18, TEMP_H +0000e3 9110 006a lds r17, TEMP_L +0000e5 9120 006b lds r18, TEMP_H -0000e6 932f push r18 -0000e7 7f28 cbr r18, (1<<0) | (1<<1) | (1<<2) ; убираем ненужные биты на время (интересуют последних битов в TEMP_H) -0000e8 3f28 cpi r18, 0xf8 ; проверяется является ли число минусовой -0000e9 f011 breq _TEMP_RD_TO_UNSIGNED ; если да то конвертируем в беззнаковое число -0000ea 94e8 clt -0000eb c009 rjmp _TEMP_RD_CONTINUE ; если нет то преобразуем значение АЦП в температуру (делим на 16) +0000e7 932f push r18 +0000e8 7f28 cbr r18, (1<<0) | (1<<1) | (1<<2) ; убираем ненужные биты на время (интересуют последних битов в TEMP_H) +0000e9 3f28 cpi r18, 0xf8 ; проверяется является ли число минусовой +0000ea f011 breq _TEMP_RD_TO_UNSIGNED ; если да то конвертируем в беззнаковое число +0000eb 94e8 clt +0000ec c009 rjmp _TEMP_RD_CONTINUE ; если нет то преобразуем значение АЦП в температуру (делим на 16) _TEMP_RD_TO_UNSIGNED: -0000ec 912f pop r18 -0000ed 9468 set -0000ee 9510 com r17 -0000ef 9520 com r18 -0000f0 e031 ldi r19, 1 -0000f1 0f13 add r17, r19 -0000f2 e030 ldi r19, 0 -0000f3 1f23 adc r18, r19 -0000f4 c001 rjmp PC+2 +0000ed 912f pop r18 +0000ee 9468 set +0000ef 9510 com r17 +0000f0 9520 com r18 +0000f1 e031 ldi r19, 1 +0000f2 0f13 add r17, r19 +0000f3 e030 ldi r19, 0 +0000f4 1f23 adc r18, r19 +0000f5 c001 rjmp PC+2 _TEMP_RD_CONTINUE: ; Температура = Число с АЦП / 16 (сдвиг вправо 4) -0000f5 912f pop r18 -0000f6 9526 lsr r18 -0000f7 9517 ror r17 -0000f8 9526 lsr r18 -0000f9 9517 ror r17 -0000fa 9526 lsr r18 -0000fb 9517 ror r17 -0000fc 9526 lsr r18 -0000fd 9517 ror r17 +0000f6 912f pop r18 +0000f7 9526 lsr r18 +0000f8 9517 ror r17 +0000f9 9526 lsr r18 +0000fa 9517 ror r17 +0000fb 9526 lsr r18 +0000fc 9517 ror r17 +0000fd 9526 lsr r18 +0000fe 9517 ror r17 _TEMP_RD_END: -0000fe 9130 006a lds r19, TEMP_L -000100 f40e brtc PC+2 -000101 9531 neg r19 ; переводим в беззнаковое число если минус +0000ff 9130 006a lds r19, TEMP_L +000101 f40e brtc PC+2 +000102 9531 neg r19 ; переводим в беззнаковое число если минус ; далее происходит такое для получения дробной части: ; ((n<<3) + (n<<1))>>4 или (n*10)/16 -000102 2f43 mov r20, r19 -000103 703f andi r19, 0x0f -000104 2f43 mov r20, r19 -000105 0f33 lsl r19 +000103 2f43 mov r20, r19 +000104 703f andi r19, 0x0f +000105 2f43 mov r20, r19 000106 0f33 lsl r19 000107 0f33 lsl r19 +000108 0f33 lsl r19 -000108 0f44 lsl r20 +000109 0f44 lsl r20 -000109 0f34 add r19, r20 +00010a 0f34 add r19, r20 -00010a 9536 lsr r19 00010b 9536 lsr r19 00010c 9536 lsr r19 00010d 9536 lsr r19 +00010e 9536 lsr r19 ; записываем данные -00010e 9310 006a sts TEMP_L, r17 -000110 9320 006b sts TEMP_H, r18 -000112 9330 006c sts TEMP_F, r19 +00010f 9310 006a sts TEMP_L, r17 +000111 9320 006b sts TEMP_H, r18 +000113 9330 006c sts TEMP_F, r19 ; sei -000114 914f pop r20 -000115 913f pop r19 -000116 912f pop r18 -000117 911f pop r17 -000118 910f pop r16 -000119 9508 ret +000115 914f pop r20 +000116 913f pop r19 +000117 912f pop r18 +000118 911f pop r17 +000119 910f pop r16 +00011a 9508 ret ; TEMP_CONV: -00011a 930f push r16 +00011b 930f push r16 ; cli -00011b d022 rcall OW_PRESENCE -00011c ec0c ldi r16, DS18B20_CMD_SKIPROM -00011d 2e80 mov OW_CMD_r, r16 -00011e d034 rcall OW_SEND_BYTE +00011c d022 rcall OW_PRESENCE +00011d ec0c ldi r16, DS18B20_CMD_SKIPROM +00011e 2e80 mov OW_CMD_r, r16 +00011f d034 rcall OW_SEND_BYTE -00011f e404 ldi r16, DS18B20_CMD_CONVERTTEMP -000120 2e80 mov OW_CMD_r, r16 -000121 d031 rcall OW_SEND_BYTE +000120 e404 ldi r16, DS18B20_CMD_CONVERTTEMP +000121 2e80 mov OW_CMD_r, r16 +000122 d031 rcall OW_SEND_BYTE ; sei -000122 910f pop r16 -000123 9508 ret +000123 910f pop r16 +000124 9508 ret // // ; **** ОТПРАВКА БАЙТА В СДВИГОВЫЙ РЕГИСТР ************************* USI_TRANSMIT: -000124 930f push r16 -000125 b80f out USIDR, r0 ; Байт для отправки всегда находится в регистре r0. Помещаем данные в регистр USIDR. +000125 930f push r16 +000126 b80f out USIDR, r0 ; Байт для отправки всегда находится в регистре r0. Помещаем данные в регистр USIDR. ; Enable USI Overflow Interrupt Flag (will be 0 if transfer is not compeleted) -000126 e400 ldi TEMP_REG_A, (1< USI Clock Source Select ; USICLK <--------------> USI Clock Strobe ; USITC <--------------> USI Toggle Clock (Enable clock generation) -000128 e10b ldi TEMP_REG_A, (1< +00012d 9ac0 sbi PORTB, USI_LATCH_PIN +00012e 98c0 cbi PORTB, USI_LATCH_PIN +00012f 910f pop r16 +000130 9508 ret// // SW_CHECK_PROCESS: -000130 930f push r16 -000131 d08c rcall DEBOUNCE_SW -000132 9bb2 sbis SW_PIN, SW_PLUS_PIN -000133 9601 adiw DISP_NUM_L, 1 +000131 930f push r16 +000132 d08c rcall DEBOUNCE_SW +000133 9bb2 sbis SW_PIN, SW_PLUS_PIN +000134 9601 adiw DISP_NUM_L, 1 -000134 9bb3 sbis SW_PIN, SW_MINUS_PIN -000135 9701 sbiw DISP_NUM_L, 1 +000135 9bb3 sbis SW_PIN, SW_MINUS_PIN +000136 9701 sbiw DISP_NUM_L, 1 -000136 9bb4 sbis SW_PIN, SW_SET_PIN -000137 c001 rjmp _INTO_DEFAULT_STATE -000138 c003 rjmp _SW_CHECK_PROCESS_END +000137 9bb4 sbis SW_PIN, SW_SET_PIN +000138 c001 rjmp _INTO_DEFAULT_STATE +000139 c003 rjmp _SW_CHECK_PROCESS_END _INTO_DEFAULT_STATE: -000139 e000 ldi r16, MCU_STATE_DEFAULT -00013a 9300 0060 sts MCU_STATE, r16 +00013a e000 ldi r16, MCU_STATE_DEFAULT +00013b 9300 0060 sts MCU_STATE, r16 _SW_CHECK_PROCESS_END: -00013c 910f pop r16 -00013d 9508 ret +00013d 910f pop r16 +00013e 9508 ret // // // ; **** ОПРОС ПРИСУТСТВИЯ УСТРОЙСТВА ****************************** OW_PRESENCE: -00013e 94f8 cli -00013f 9ab9 ow_pull -000140 e033 -000141 eb4e -000142 d08b DELAY16 480 -000143 98b9 ow_release -000144 e030 -000145 e84a -000146 d087 DELAY16 70 -000147 d005 rcall OW_CHECK_PRESENCE -000148 e033 -000149 e342 -00014a d083 DELAY16 410 -00014b 9478 sei -00014c 9508 ret +00013f 94f8 cli +000140 9ab9 ow_pull +000141 e033 +000142 eb4e +000143 d08b DELAY16 480 +000144 98b9 ow_release +000145 e030 +000146 e84a +000147 d087 DELAY16 70 +000148 d005 rcall OW_CHECK_PRESENCE +000149 e033 +00014a e342 +00014b d083 DELAY16 410 +00014c 9478 sei +00014d 9508 ret // // @@ -1332,85 +1357,85 @@ main.asm(275): Including file 'div16u.asm' ; Если подчиненное устройство притянет шину, то устанавливаем флаг OWPRF в единицу в регистре флагов ; OW_CHECK_PRESENCE: -00014d 9bb1 sbis OW_PIN, OW_LINE -00014e 6071 sbr OWFR, (1< // OW_SEND_BYTE: -000153 930f push r16 -000154 931f push r17 -000155 2d08 mov r16, OW_CMD_r -000156 e018 ldi r17, 8 +000154 930f push r16 +000155 931f push r17 +000156 2d08 mov r16, OW_CMD_r +000157 e018 ldi r17, 8 _OW_SEND_BYTE_LOOP: -000157 9506 lsr r16 -000158 f408 brcc _OW_SEND_0 -000159 f058 brcs _OW_SEND_1 +000158 9506 lsr r16 +000159 f408 brcc _OW_SEND_0 +00015a f058 brcs _OW_SEND_1 _OW_SEND_0: -00015a 94f8 cli -00015b 9ab9 ow_pull -00015c e030 -00015d e746 -00015e d06f DELAY16 60 -00015f 98b9 ow_release -000160 e030 -000161 e142 -000162 d06b DELAY16 10 -000163 9478 sei -000164 c00a rjmp _OW_SEND_BYTE_END +00015b 94f8 cli +00015c 9ab9 ow_pull +00015d e030 +00015e e746 +00015f d06f DELAY16 60 +000160 98b9 ow_release +000161 e030 +000162 e142 +000163 d06b DELAY16 10 +000164 9478 sei +000165 c00a rjmp _OW_SEND_BYTE_END _OW_SEND_1: -000165 94f8 cli -000166 9ab9 ow_pull -000167 e030 -000168 e04a -000169 d064 DELAY16 6 -00016a 98b9 ow_release -00016b e030 -00016c e74e -00016d d060 DELAY16 64 -00016e 9478 sei +000166 94f8 cli +000167 9ab9 ow_pull +000168 e030 +000169 e04a +00016a d064 DELAY16 6 +00016b 98b9 ow_release +00016c e030 +00016d e74e +00016e d060 DELAY16 64 +00016f 9478 sei _OW_SEND_BYTE_END: -00016f 951a dec r17 -000170 f731 brne _OW_SEND_BYTE_LOOP -000171 911f pop r17 -000172 910f pop r16 -000173 9508 ret +000170 951a dec r17 +000171 f731 brne _OW_SEND_BYTE_LOOP +000172 911f pop r17 +000173 910f pop r16 +000174 9508 ret // // OW_RD_BYTE: -000174 930f push r16 -000175 931f push r17 -000176 2700 clr r16 -000177 e018 ldi r17, 8 -000178 94f8 cli +000175 930f push r16 +000176 931f push r17 +000177 2700 clr r16 +000178 e018 ldi r17, 8 +000179 94f8 cli _OW_RD_BYTE_LP: -000179 9506 lsr r16 -00017a 9ab9 ow_pull -00017b e030 -00017c e04a -00017d d050 DELAY16 6 -00017e 98b9 ow_release -00017f e030 -000180 e140 -000181 d04c DELAY16 9 -000182 99b1 sbic OW_PIN, OW_LINE -000183 6800 sbr r16, (1<<7) -000184 e030 -000185 e64c -000186 d047 DELAY16 55 -000187 951a dec r17 -000188 f781 brne _OW_RD_BYTE_LP -000189 930c st X, r16 -00018a 9478 sei -00018b 911f pop r17 -00018c 910f pop r16 -00018d 9508 ret +00017a 9506 lsr r16 +00017b 9ab9 ow_pull +00017c e030 +00017d e04a +00017e d050 DELAY16 6 +00017f 98b9 ow_release +000180 e030 +000181 e140 +000182 d04c DELAY16 9 +000183 99b1 sbic OW_PIN, OW_LINE +000184 6800 sbr r16, (1<<7) +000185 e030 +000186 e64c +000187 d047 DELAY16 55 +000188 951a dec r17 +000189 f781 brne _OW_RD_BYTE_LP +00018a 930c st X, r16 +00018b 9478 sei +00018c 911f pop r17 +00018d 910f pop r16 +00018e 9508 ret // @@ -1421,146 +1446,146 @@ main.asm(275): Including file 'div16u.asm' ; Описание: Перемещает цифры числа в соответствующие ячейки памяти в SRAM ; путем деления этого числа несколько раз DISPLAY_UPD_DIGITS: -00018e 94f8 cli -00018f 935f push r21 -000190 e054 ldi r21, 4 ; (4 раза делим) т.к индикатор четырех разрядный +00018f 94f8 cli +000190 935f push r21 +000191 e054 ldi r21, 4 ; (4 раза делим) т.к индикатор четырех разрядный ; инициализация указателя (за каждый проход цикла будет инкрементироваться) -000191 e6a3 ldi XL, LOW(DIGITS) -000192 e0b0 ldi XH, HIGH(DIGITS) +000192 e6a3 ldi XL, LOW(DIGITS) +000193 e0b0 ldi XH, HIGH(DIGITS) .equ dividend = SRAM_TEMP_1 ; число которе будем делить .equ divisor = 10 ; на что делим ; загружаем число которое хотим поделить в адрес SRAM делимого -000193 9380 0061 sts dividend, DISP_NUM_L -000195 9390 0062 sts dividend+1, DISP_NUM_H +000194 9380 0061 sts dividend, DISP_NUM_L +000196 9390 0062 sts dividend+1, DISP_NUM_H ; четыре раза производим деление для получения остатков DIV_LOOP: ; заполняем нужные регистры -000197 9100 0061 lds dd16uL, dividend -000199 9110 0062 lds dd16uH, dividend+1 -00019b e02a ldi dv16uL, LOW(divisor) -00019c e030 ldi dv16uH, HIGH(divisor) +000198 9100 0061 lds dd16uL, dividend +00019a 9110 0062 lds dd16uH, dividend+1 +00019c e02a ldi dv16uL, LOW(divisor) +00019d e030 ldi dv16uH, HIGH(divisor) -00019d df1f rcall div16u ; делим +00019e df1f rcall div16u ; делим -00019e 92ed st X+, drem16uL ; сохраняем остаток в ячейку по указателю и увеличиваем его +00019f 92ed st X+, drem16uL ; сохраняем остаток в ячейку по указателю и увеличиваем его ; обновляем делимое -00019f 9300 0061 sts dividend, dres16uL -0001a1 9310 0062 sts dividend+1, dres16uH +0001a0 9300 0061 sts dividend, dres16uL +0001a2 9310 0062 sts dividend+1, dres16uH -0001a3 955a dec r21 ; декрементируем счетчик цикла -0001a4 f791 brne DIV_LOOP ; делим еще раз если не 0 -0001a5 915f pop r21 -0001a6 9478 sei -0001a7 9508 ret +0001a4 955a dec r21 ; декрементируем счетчик цикла +0001a5 f791 brne DIV_LOOP ; делим еще раз если не 0 +0001a6 915f pop r21 +0001a7 9478 sei +0001a8 9508 ret // // ; **** ЗАГРУЖАЕТ НУЖНЫЙ АДРЕС СИМВОЛА В R0 *********************** DISPLAY_DECODER: -0001a8 930f push r16 -0001a9 931f push r17 -0001aa ece4 ldi ZL, LOW(2*DISPLAY_SYMBOLS) -0001ab e0f3 ldi ZH, HIGH(2*DISPLAY_SYMBOLS) +0001a9 930f push r16 +0001aa 931f push r17 +0001ab ece6 ldi ZL, LOW(2*DISPLAY_SYMBOLS) +0001ac e0f3 ldi ZH, HIGH(2*DISPLAY_SYMBOLS) -0001ac 2711 clr TEMP_REG_B -0001ad 0fe0 add ZL, TEMP_REG_A -0001ae 1ff1 adc ZH, TEMP_REG_B +0001ad 2711 clr TEMP_REG_B +0001ae 0fe0 add ZL, TEMP_REG_A +0001af 1ff1 adc ZH, TEMP_REG_B -0001af 9004 lpm r0, Z -0001b0 911f pop r17 -0001b1 910f pop r16 -0001b2 9508 ret// +0001b0 9004 lpm r0, Z +0001b1 911f pop r17 +0001b2 910f pop r16 +0001b3 9508 ret// // BEEP_SHORT: -0001b3 9ac5 sbi BUZZER_PORT, BUZZER_PIN -0001b4 d01d rcall DELAY -0001b5 98c5 cbi BUZZER_PORT, BUZZER_PIN -0001b6 9508 ret +0001b4 9ac5 sbi BUZZER_PORT, BUZZER_PIN +0001b5 d01d rcall DELAY +0001b6 98c5 cbi BUZZER_PORT, BUZZER_PIN +0001b7 9508 ret // // BEEP_LONG: -0001b7 9ac5 sbi BUZZER_PORT, BUZZER_PIN -0001b8 d019 rcall DELAY -0001b9 d018 rcall DELAY -0001ba d017 rcall DELAY -0001bb d016 rcall DELAY -0001bc 98c5 cbi BUZZER_PORT, BUZZER_PIN -0001bd 9508 ret// +0001b8 9ac5 sbi BUZZER_PORT, BUZZER_PIN +0001b9 d019 rcall DELAY +0001ba d018 rcall DELAY +0001bb d017 rcall DELAY +0001bc d016 rcall DELAY +0001bd 98c5 cbi BUZZER_PORT, BUZZER_PIN +0001be 9508 ret// // DEBOUNCE_SW: -0001be 930f push r16 -0001bf 931f push r17 -0001c0 932f push r18 +0001bf 930f push r16 +0001c0 931f push r17 +0001c1 932f push r18 -0001c1 e02a ldi r18, 10 +0001c2 e02a ldi r18, 10 _loop_2: -0001c2 ef1f ldi r17, 255 +0001c3 ef1f ldi r17, 255 _loop_0: -0001c3 ef0f ldi r16, 255 +0001c4 ef0f ldi r16, 255 _dec_0: -0001c4 950a dec r16 -0001c5 f7f1 brne _dec_0 +0001c5 950a dec r16 +0001c6 f7f1 brne _dec_0 _loop_1: -0001c6 951a dec r17 -0001c7 f7d9 brne _loop_0 +0001c7 951a dec r17 +0001c8 f7d9 brne _loop_0 _loop_3: -0001c8 952a dec r18 -0001c9 f7c1 brne _loop_2 +0001c9 952a dec r18 +0001ca f7c1 brne _loop_2 -0001ca 912f pop r18 -0001cb 911f pop r17 -0001cc 910f pop r16 -0001cd 9508 ret// +0001cb 912f pop r18 +0001cc 911f pop r17 +0001cd 910f pop r16 +0001ce 9508 ret// // DELAY_LOOP_16: -0001ce 5041 subi DELAY_8_r, 1 -0001cf 4030 sbci DELAY_16_r, 0 -0001d0 f7e8 brcc DELAY_LOOP_16 -0001d1 9508 ret// +0001cf 5041 subi DELAY_8_r, 1 +0001d0 4030 sbci DELAY_16_r, 0 +0001d1 f7e8 brcc DELAY_LOOP_16 +0001d2 9508 ret// // DELAY: -0001d2 930f push r16 -0001d3 931f push r17 -0001d4 932f push r18 +0001d3 930f push r16 +0001d4 931f push r17 +0001d5 932f push r18 -0001d5 e026 ldi r18, 6 +0001d6 e026 ldi r18, 6 _DELAY_0: -0001d6 ef0f ldi r16, 255 +0001d7 ef0f ldi r16, 255 _DELAY_1: -0001d7 ef1f ldi r17, 255 +0001d8 ef1f ldi r17, 255 _DELAY_2: -0001d8 951a dec r17 -0001d9 f7f1 brne _DELAY_2 +0001d9 951a dec r17 +0001da f7f1 brne _DELAY_2 -0001da 950a dec r16 -0001db f7d9 brne _DELAY_1 -0001dc 952a dec r18 -0001dd f7c1 brne _DELAY_0 +0001db 950a dec r16 +0001dc f7d9 brne _DELAY_1 +0001dd 952a dec r18 +0001de f7c1 brne _DELAY_0 -0001de 912f pop r18 -0001df 911f pop r17 -0001e0 910f pop r16 -0001e1 9508 ret // +0001df 912f pop r18 +0001e0 911f pop r17 +0001e1 910f pop r16 +0001e2 9508 ret // // DISPLAY_SYMBOLS: ; HGFEDCBA HGFEDCBA -0001e2 f9c0 .DB 0b11000000, 0b11111001 ; 0, 1 -0001e3 b0a4 .DB 0b10100100, 0b10110000 ; 2, 3 -0001e4 9299 .DB 0b10011001, 0b10010010 ; 4, 5 -0001e5 f882 .DB 0b10000010, 0b11111000 ; 6, 7 -0001e6 9080 .DB 0b10000000, 0b10010000 ; 8, 9 -0001e7 bf9c .DB 0b10011100, 0b10111111 ; °, -// +0001e3 f9c0 .DB 0b11000000, 0b11111001 ; 0, 1 +0001e4 b0a4 .DB 0b10100100, 0b10110000 ; 2, 3 +0001e5 9299 .DB 0b10011001, 0b10010010 ; 4, 5 +0001e6 f882 .DB 0b10000010, 0b11111000 ; 6, 7 +0001e7 9080 .DB 0b10000000, 0b10010000 ; 8, 9 +0001e8 bf9c .DB 0b10011100, 0b10111111 ; °, -// // @@ -1588,8 +1613,8 @@ counted separately from r26..r31 here. "ATtiny2313A" register use summary: x : 2 y : 0 z : 1 r0 : 4 r1 : 2 r2 : 0 r3 : 0 r4 : 0 r5 : 0 r6 : 0 r7 : 0 r8 : 5 r9 : 0 r10: 0 r11: 0 r12: 0 -r13: 0 r14: 5 r15: 5 r16: 94 r17: 48 r18: 30 r19: 38 r20: 31 -r21: 8 r22: 0 r23: 4 r24: 5 r25: 3 r26: 3 r27: 3 r28: 0 +r13: 0 r14: 5 r15: 5 r16: 96 r17: 48 r18: 30 r19: 38 r20: 31 +r21: 8 r22: 0 r23: 2 r24: 5 r25: 3 r26: 3 r27: 3 r28: 0 r29: 0 r30: 2 r31: 2 Registers used: 20 out of 35 (57.1%) @@ -1599,25 +1624,25 @@ andi : 1 asr : 0 bclr : 0 bld : 0 brbc : 0 brbs : 0 brcc : 3 brcs : 1 break : 0 breq : 4 brge : 1 brhc : 0 brhs : 0 brid : 0 brie : 0 brlo : 0 brlt : 0 brmi : 0 brne : 17 brpl : 0 brsh : 0 brtc : 1 brts : 1 brvc : 0 -brvs : 0 bset : 0 bst : 0 cbi : 22 cbr : 3 clc : 1 +brvs : 0 bset : 0 bst : 0 cbi : 23 cbr : 3 clc : 1 clh : 0 cli : 5 cln : 0 clr : 6 cls : 0 clt : 1 clv : 0 clz : 0 com : 2 cp : 0 cpc : 0 cpi : 10 cpse : 0 dec : 10 eor : 0 icall : 0 ijmp : 0 in : 2 inc : 1 ld : 0 ldd : 0 ldi : 66 lds : 16 lpm : 2 -lsl : 4 lsr : 10 mov : 11 movw : 0 neg : 1 nop : 1 -or : 1 ori : 0 out : 15 pop : 31 push : 30 rcall : 42 -ret : 16 reti : 3 rjmp : 19 rol : 4 ror : 4 sbc : 1 +lsl : 4 lsr : 10 mov : 11 movw : 0 neg : 1 nop : 0 +or : 1 ori : 0 out : 15 pop : 32 push : 31 rcall : 42 +ret : 16 reti : 4 rjmp : 19 rol : 4 ror : 4 sbc : 1 sbci : 1 sbi : 12 sbic : 3 sbis : 5 sbiw : 1 sbr : 2 -sbrc : 1 sbrs : 1 sec : 1 seh : 0 sei : 5 sen : 0 +sbrc : 0 sbrs : 0 sec : 1 seh : 0 sei : 5 sen : 0 ser : 0 ses : 0 set : 1 sev : 0 sez : 0 sleep : 0 spm : 0 st : 2 std : 0 sts : 20 sub : 2 subi : 1 swap : 0 tst : 1 wdr : 0 -Instructions used: 57 out of 105 (54.3%) +Instructions used: 54 out of 105 (51.4%) "ATtiny2313A" memory use summary [bytes]: Segment Begin End Code Data Used Size Use% --------------------------------------------------------------- -[.cseg] 0x000000 0x0003d0 942 12 954 2048 46.6% +[.cseg] 0x000000 0x0003d2 944 12 956 2048 46.7% [.dseg] 0x000060 0x00006d 0 13 13 128 10.2% [.eseg] 0x000000 0x000000 0 0 0 128 0.0% diff --git a/dist/default/production/attiny2313a_thermostat.X.production.map b/dist/default/production/attiny2313a_thermostat.X.production.map index 5be080a..6af3a49 100644 --- a/dist/default/production/attiny2313a_thermostat.X.production.map +++ b/dist/default/production/attiny2313a_thermostat.X.production.map @@ -1,5 +1,5 @@ -AVRASM ver. 2.2.7 main.asm Thu Jun 22 12:07:49 2023 +AVRASM ver. 2.2.7 main.asm Thu Jun 22 18:27:57 2023 EQU SIGNATURE_000 0000001e @@ -490,6 +490,7 @@ EQU DIGIT_2_PIN 00000003 EQU DIGIT_3_PIN 00000004 EQU DIGIT_4_PIN 00000005 EQU LED_ERR_PIN 00000006 +EQU LED_ERR_PORT 00000012 EQU OW_LINE 00000001 EQU OW_DDR 00000017 EQU OW_PIN 00000016 @@ -533,30 +534,30 @@ DSEG HYSTERESIS 00000069 DSEG TEMP_L 0000006a DSEG TEMP_H 0000006b DSEG TEMP_F 0000006c -CSEG RESET_vect 00000074 -CSEG TIMER0_COMPA_vect 00000023 +CSEG RESET_vect 00000075 +CSEG TIMER0_COMPA_vect 00000024 CSEG PCINT0_vect 0000000e -CSEG _PCINT0_vect_end 0000001d -CSEG _INTO_PROGRAM_STATE 0000001a -CSEG _CLR_CURRENT_DIGIT 0000002d -CSEG _indicate_1 00000030 -CSEG _indicate_2 00000042 -CSEG DISPLAY_DECODER 000001a8 -CSEG USI_TRANSMIT 00000124 -CSEG _indicate_3 00000054 -CSEG _indicate_4 00000061 -CSEG _indicate_exit 0000006b -CSEG MCU_INIT 00000076 -CSEG BEEP_SHORT 000001b3 -CSEG LOOP 00000099 -CSEG _STATE_DEFAULT 0000009b +CSEG _PCINT0_vect_end 0000001e +CSEG _INTO_PROGRAM_STATE 0000001b +CSEG _CLR_CURRENT_DIGIT 0000002e +CSEG _indicate_1 00000031 +CSEG _indicate_2 00000043 +CSEG DISPLAY_DECODER 000001a9 +CSEG USI_TRANSMIT 00000125 +CSEG _indicate_3 00000055 +CSEG _indicate_4 00000062 +CSEG _indicate_exit 0000006c +CSEG MCU_INIT 00000077 +CSEG BEEP_SHORT 000001b4 +CSEG LOOP 00000098 +CSEG _STATE_DEFAULT 0000009a CSEG _STATE_PROGRAM 000000ac -CSEG DISPLAY_UPD_DIGITS 0000018e -CSEG TEMP_CONV 0000011a -CSEG DEBOUNCE_SW 000001be -CSEG TEMP_RD 000000d0 -CSEG _STATE_ERROR 000000b0 -CSEG SW_CHECK_PROCESS 00000130 +CSEG DISPLAY_UPD_DIGITS 0000018f +CSEG TEMP_CONV 0000011b +CSEG DEBOUNCE_SW 000001bf +CSEG TEMP_RD 000000d1 +CSEG _STATE_ERROR 000000b1 +CSEG SW_CHECK_PROCESS 00000131 DEF drem16uL r14 DEF drem16uH r15 DEF dres16uL r16 @@ -566,38 +567,38 @@ DEF dd16uH r17 DEF dv16uL r18 DEF dv16uH r19 DEF dcnt16u r20 -CSEG div16u 000000bd -CSEG d16u_1 000000c0 -CSEG d16u_2 000000c5 -CSEG d16u_3 000000ce -CSEG OW_PRESENCE 0000013e -CSEG OW_SEND_BYTE 00000153 -CSEG OW_RD_BYTE 00000174 -CSEG _TEMP_RD_TO_UNSIGNED 000000ec -CSEG _TEMP_RD_CONTINUE 000000f5 -CSEG _TEMP_RD_END 000000fe -CSEG _USI_TRANSMIT_LOOP 00000129 -CSEG _INTO_DEFAULT_STATE 00000139 -CSEG _SW_CHECK_PROCESS_END 0000013c -CSEG DELAY_LOOP_16 000001ce -CSEG OW_CHECK_PRESENCE 0000014d -CSEG _EXIT 00000152 -CSEG _OW_SEND_BYTE_LOOP 00000157 -CSEG _OW_SEND_0 0000015a -CSEG _OW_SEND_1 00000165 -CSEG _OW_SEND_BYTE_END 0000016f -CSEG _OW_RD_BYTE_LP 00000179 +CSEG div16u 000000be +CSEG d16u_1 000000c1 +CSEG d16u_2 000000c6 +CSEG d16u_3 000000cf +CSEG OW_PRESENCE 0000013f +CSEG OW_SEND_BYTE 00000154 +CSEG OW_RD_BYTE 00000175 +CSEG _TEMP_RD_TO_UNSIGNED 000000ed +CSEG _TEMP_RD_CONTINUE 000000f6 +CSEG _TEMP_RD_END 000000ff +CSEG _USI_TRANSMIT_LOOP 0000012a +CSEG _INTO_DEFAULT_STATE 0000013a +CSEG _SW_CHECK_PROCESS_END 0000013d +CSEG DELAY_LOOP_16 000001cf +CSEG OW_CHECK_PRESENCE 0000014e +CSEG _EXIT 00000153 +CSEG _OW_SEND_BYTE_LOOP 00000158 +CSEG _OW_SEND_0 0000015b +CSEG _OW_SEND_1 00000166 +CSEG _OW_SEND_BYTE_END 00000170 +CSEG _OW_RD_BYTE_LP 0000017a EQU dividend 00000061 EQU divisor 0000000a -CSEG DIV_LOOP 00000197 -CSEG DISPLAY_SYMBOLS 000001e2 -CSEG DELAY 000001d2 -CSEG BEEP_LONG 000001b7 -CSEG _loop_2 000001c2 -CSEG _loop_0 000001c3 -CSEG _dec_0 000001c4 -CSEG _loop_1 000001c6 -CSEG _loop_3 000001c8 -CSEG _DELAY_0 000001d6 -CSEG _DELAY_1 000001d7 -CSEG _DELAY_2 000001d8 +CSEG DIV_LOOP 00000198 +CSEG DISPLAY_SYMBOLS 000001e3 +CSEG DELAY 000001d3 +CSEG BEEP_LONG 000001b8 +CSEG _loop_2 000001c3 +CSEG _loop_0 000001c4 +CSEG _dec_0 000001c5 +CSEG _loop_1 000001c7 +CSEG _loop_3 000001c9 +CSEG _DELAY_0 000001d7 +CSEG _DELAY_1 000001d8 +CSEG _DELAY_2 000001d9 diff --git a/dist/default/production/attiny2313a_thermostat.X.production.obj b/dist/default/production/attiny2313a_thermostat.X.production.obj index d45c382f2b28b726a547235d250408bbae07e56f..e12b9c2bd37862b9bda05e12ff73e9d5ada332f9 100644 GIT binary patch literal 4462 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 T#6{ALpVMMfLpsbYt(E@)4l=1W literal 4453 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 diff --git a/dist/default/production/attiny2313a_thermostat.X.production.tmp b/dist/default/production/attiny2313a_thermostat.X.production.tmp index 175e2ef..9079a64 100644 --- a/dist/default/production/attiny2313a_thermostat.X.production.tmp +++ b/dist/default/production/attiny2313a_thermostat.X.production.tmp @@ -33,62 +33,62 @@ main.asm30 main.asm31 main.asm32 - main.asm183 - main.asm88 + main.asm186 + main.asm91 main.asm53 - <_PCINT0_vect_end>main.asm78 - <_INTO_PROGRAM_STATE>main.asm74 - <_CLR_CURRENT_DIGIT>main.asm100 - <_indicate_1>main.asm104 - <_indicate_2>main.asm124 - main.asm577 - main.asm390 - <_indicate_3>main.asm142 - <_indicate_4>main.asm158 - <_indicate_exit>main.asm170 - main.asm189 - main.asm593 - main.asm232 - <_STATE_DEFAULT>main.asm236 - <_STATE_PROGRAM>main.asm255 - main.asm536 - main.asm370 - main.asm611 - main.asm278 - <_STATE_ERROR>main.asm260 - main.asm421 + <_PCINT0_vect_end>main.asm81 + <_INTO_PROGRAM_STATE>main.asm77 + <_CLR_CURRENT_DIGIT>main.asm103 + <_indicate_1>main.asm107 + <_indicate_2>main.asm127 + main.asm579 + main.asm392 + <_indicate_3>main.asm145 + <_indicate_4>main.asm161 + <_indicate_exit>main.asm173 + main.asm192 + main.asm595 + main.asm234 + <_STATE_DEFAULT>main.asm238 + <_STATE_PROGRAM>main.asm256 + main.asm538 + main.asm372 + main.asm613 + main.asm280 + <_STATE_ERROR>main.asm262 + main.asm423 div16u.asm32 div16u.asm36 div16u.asm42 div16u.asm52 - main.asm445 - main.asm472 - main.asm505 - <_TEMP_RD_TO_UNSIGNED>main.asm313 - <_TEMP_RD_CONTINUE>main.asm324 - <_TEMP_RD_END>main.asm334 - <_USI_TRANSMIT_LOOP>main.asm408 - <_INTO_DEFAULT_STATE>main.asm434 - <_SW_CHECK_PROCESS_END>main.asm437 - main.asm637 - main.asm461 - <_EXIT>main.asm467 - <_OW_SEND_BYTE_LOOP>main.asm477 - <_OW_SEND_0>main.asm481 - <_OW_SEND_1>main.asm489 - <_OW_SEND_BYTE_END>main.asm496 - <_OW_RD_BYTE_LP>main.asm511 - main.asm553 - main.asm669 - main.asm644 - main.asm601 - <_loop_2>main.asm617 - <_loop_0>main.asm619 - <_dec_0>main.asm621 - <_loop_1>main.asm624 - <_loop_3>main.asm627 - <_DELAY_0>main.asm650 - <_DELAY_1>main.asm652 - <_DELAY_2>main.asm654 + main.asm447 + main.asm474 + main.asm507 + <_TEMP_RD_TO_UNSIGNED>main.asm315 + <_TEMP_RD_CONTINUE>main.asm326 + <_TEMP_RD_END>main.asm336 + <_USI_TRANSMIT_LOOP>main.asm410 + <_INTO_DEFAULT_STATE>main.asm436 + <_SW_CHECK_PROCESS_END>main.asm439 + main.asm639 + main.asm463 + <_EXIT>main.asm469 + <_OW_SEND_BYTE_LOOP>main.asm479 + <_OW_SEND_0>main.asm483 + <_OW_SEND_1>main.asm491 + <_OW_SEND_BYTE_END>main.asm498 + <_OW_RD_BYTE_LP>main.asm513 + main.asm555 + main.asm671 + main.asm646 + main.asm603 + <_loop_2>main.asm619 + <_loop_0>main.asm621 + <_dec_0>main.asm623 + <_loop_1>main.asm626 + <_loop_3>main.asm629 + <_DELAY_0>main.asm652 + <_DELAY_1>main.asm654 + <_DELAY_2>main.asm656 diff --git a/macros.asm b/macros.asm index b2af9f6..01a1bad 100644 --- a/macros.asm +++ b/macros.asm @@ -17,6 +17,26 @@ cbi OW_DDR, OW_LINE .ENDMACRO +.MACRO relay_on + sbi RELAY_PORT, RELAY_PIN +.ENDMACRO + +.MACRO relay_off + cbi RELAY_PORT, RELAY_PIN +.ENDMACRO + +.MACRO display_on + push r16 + outi r16, TIMSK, (1< PCINT0_vect: + reti push r16 push r17 push r18 push r19 in r16, SREG +; display_off + ; in r17, SW_PIN ; clr r18 ; ldi r18, (1<