SW0103

2024-07-21 10:24:52 +08:00 · 2024-07-21 10:24:52 +08:00 · b2f042209a
commit b2f042209a
parent 85cd66de42
5 changed files with 331 additions and 3 deletions
--- a/OUTPUT/K53L_SW0103.mot
+++ b/OUTPUT/K53L_SW0103.mot
@ -0,0 +1,144 @@
+S00E00004B383020202020206D6F744E
+S1130000CE0000000000000000000000000000001E
+S1130010000000008701280100000000000000002B
+S1130020B601000000000000000000000000000015
+S113003000000000000000000000000000000000BC
+S113004000000000000000000000000000000000AC
+S1130050000000000000000000000000000000009C
+S1130060000000000000000000000000000000008C
+S1130070000000000000000000000000000000007C
+S10A00805AA5040000000072
+S11300880000000000000000000000000000000064
+S10F009800000000000000000000000058
+S10700C07A47E00493
+S10D00C4000000000000000000002E
+S11300CECBF820FE3046FCFCD00100FC4902003681
+S11300DE00FC3029FCEF04CC0000A747DFF93620E2
+S11300EEFE3020FEEF04CC0000A747DFF9410032BA
+S11300FE1C00EF08B311498800482AFCF643DFF4CC
+S113010E4100320000EF08B3114980004820FEF68A
+S113011E43DFF4FC140200F6EFFEC1C3C5C78EFD27
+S113012E708EFCC1C7AF0201605C07980088003175
+S113013E8EBF0A018800D1DD068800FC9903008D6C
+S113014E129801AF08FC4206FC880161D323EB042C
+S113015EFC99A204FCA206FCAF08FC4206FC61F862
+S113016EFC850300C0C09EFC609EFDC6C4C2C06177
+S113017EFC318EFC940300EFEBC1C3C5C78EFD703A
+S113018E8EFCC1AF02FCF743DF06FC950300EF0CB7
+S113019EEB00FC899D10A200FCB202FCC09EFC6028
+S11301AE9EFDC6C4C2C061FCC1C3C5C78EFD708EA0
+S11301BEFCC1FC690700C09EFC609EFDC6C4C2C0A3
+S10501CE61FCCE
+S11301D016C80300AEF82761D339315E12F643DD49
+S11301E027BBBC02BC04BC06BC08BC0ABC0CBC0ECD
+S11301F0BC10BC12BC14BC16BC18BC1ABC1CBC1E63
+S11302003704200037B3EFD6AEF847DD06F6BBA7B8
+S1130210A7EFF5D7717AFAFC170400FC310400FC4F
+S1130220780600EFFA717AFAD7CF770002FC5F0202
+S113023000FC4E0200FC620200FC800200FC9A03F7
+S113024000FC0C0400F57800D7717BFAEFDB36A1D3
+S1130250FFCEA00071F2714BA4F5F3007183D78E29
+S1130260A8D7346100CD011FF402CD0406CA00E012
+S1130270CA03F9CA1501CE21E0CE22F3CE24F9D760
+S113028036F00030440071A200000000BC36347027
+S113029000AAB4086C0308BAB4710AE5710BE171E1
+S11302A01AE5711BE1712AE5712BE1710AED710AFE
+S11302B0E9711AED711AE9302200BAA030A783BAA5
+S11302C0A8C910009A89718A99300700BA9A302215
+S11302D001BAA2309743BAAAC912009AAAB8086C04
+S11302E00108BAB8AAC4BAC4AABA086C0108BABA4E
+S11302F051026F26FF9E266A060151FE5F26FF9E6D
+S113030026D7342201AA06086C0108BA06AA0808EE
+S11303106C0108BA08A9086C0308B9710BE1711BD8
+S1130320E1710BE5711BE5D7342401710AE5711AFB
+S1130330E5A9086C0308B9AA06085CFE08BA0671A8
+S11303400BE1711BE1D714136168DF04308100D71E
+S1130350F6BF06FC13BF08FC15BF04FCF6D7141344
+S11303606168DF04308100D736E5FF15BF00FC1358
+S1130370BF02FC7182EB00FC899D10A200FCB2025A
+S1130380FC7183F6D78F0AFCFCC10400E7300AFC39
+S1130390EC460300D7E514FCD7D734F00036F00060
+S11303A0F67182BAC6300F0ABAC4716AE5716BE19C
+S11303B0717AE5717BE1713AE5713BE1710AE671AD
+S11303C00BE2711AE6711BE2714AE5714BE1716A45
+S11303D0ED716AE9F6BAA0C918BF5DAAC8085CFE47
+S11303E008BAC8AACA085CFE08BACAD734B20171EE
+S11303F06BE1716BE5A9086C0108B9D734B401A9A4
+S1130400086C0108B9716AE5716BE1D7710AE4718E
+S11304100BE0D7CEABACD7FCEC0300F1FC1008002A
+S1130420F1FC410800FC020300E7300AFCEC46033F
+S113043000E514FCD72008704100118F800098005B
+S1130440118F81009801118F82009802118F83000F
+S1130450759803118F8400739804118F8500729826
+S113046005118F86009806D0DD1390DD1990DF4EBC
+S11304708F2CFCD1DF1AC8040D530DEF1851030F54
+S11304802AFC3149EF0551030F2BFC759803EF0546
+S11304900C0973980465610A610B9806F3AEF816AB
+S11304A061C91830FC83634C07DFF24014FC01DFA0
+S11304B00DF514FC3207003030FCFC5E030010081C
+S11304C0D7C79800403AFC5ADF124CA5DF0EE53935
+S11304D0FCF537FCF53BFCE530FCEF328F39FC4C86
+S11304E001DF0F88009F3BFCCF39FC02CF30FC02B8
+S11304F0EF1C4C02DF18E937FC88001815FC8363F5
+S11305009F37FC708F3BFC614061C8FE0A00880085
+S11305109F3AFCF538FCC0D74C04F1737261D8D70C
+S1130520318E0415FC16630D7382624C03DFF16394
+S11305304F18FCDF738F15FC0C80DD290C7FDD2840
+S113054091DD2A0CFBDD2C91DD2F0CF8DD3391DDE0
+S11305502D0CF1DD0A4C50DF2BCF2DFC02EF09CF1F
+S11305602DFC03EF03E52DFCF52EFCEF17CF2EFC3D
+S113057003EF0ECF2EFC02EF08E52EFCEF03F52E61
+S1130580FCF52DFC8F16FC0CE6DD0E91DD1091DDE3
+S11305901391DF14F52FFCEF0FE52FFCEF0ACF2F9B
+S11305A0FC02EF04CF2FFC03F539FCF538FCF537DA
+S11305B0FCD773D3DD196391DD2991DF428F2FFCC2
+S11305C081729F2CFC4C04DC2EF52CFCF2EF2C8F5A
+S11305D02DFC814C0461C8F19F2AFC9F2DFCF52E53
+S11305E0FCEF1C8F2EFC814C0461C8F19F2BFC9FF7
+S11305F02EFCF52DFCEF08F6BF0EFC629F2FFC636A
+S1130600EE32FE2004F19800FC7308007291DF3290
+S11306108800318E14880073093CFCD1DF24150155
+S1130620B8020440FC14A9A1B9440700DC29193C10
+S1130630FC01A802123006007840FC8800FE72FF1C
+S1130640EF15D2DF128800738800193CFC00318E4C
+S113065012311CF67840FC88008198004C03DFA816
+S11306601004D78F2EFCFC1008008F2DFCFC4108D1
+S1130670008F2FFCECDE07004023FC01DF1EF52376
+S1130680FCFE7FFFD539FCDF05F538FCEF0E8F3813
+S1130690FC819F38FC4C0761C8F539FC4024FC01FF
+S11306A0DF06F524FCFEBBFF4027FC01DF07F5272E
+S11306B0FCFC1304004028FC01DF72F528FCD52F54
+S11306C0FCDF06F6BF0EFCEF1BE6020EFCBF0EFCC1
+S11306D0448403DC0FF6BF0EFCF52FFCF52CFC5113
+S11306E002FE51FDD52EFCDF06F6BF10FCEF1AE624
+S11306F00210FCBF10FC44DC05DC0EF6BF10FCF558
+S11307002EFCF52BFCE1FE2CFDD52DFCDF05F6BF00
+S113071012FCD7E60212FCBF12FC44DC05DC0EF628
+S1130720BF12FCF52DFCF52AFCF1EE08FDD72004E0
+S11307301436FFFF62318EA104FFFFB802DD265399
+S11307400889318E617F08617E08B800311E1688E1
+S113075000310508177CA0087C0108169317DFEA0E
+S1130760A5A802EFD3100417D7A220FCE522FCAF02
+S113077020FC320500FC920800F74361F8E523FCF5
+S1130780AF20FC520AFC920800F74361F8E524FC10
+S1130790AF20FC5214FC920800F74361F8E525FCF5
+S11307A0AF20FC5232FC920800F74361F8E526FCC6
+S11307B0AF20FC5264FC920800F74361F8E527FC83
+S11307C0AF20FC32E803FC920800F74361F8E52807
+S11307D0FCAF20FC4460EADC04F6BF20FCD7D1DD8A
+S11307E00A91DD2191DD1491DD0CD77112043602DA
+S11307F0FF71B371A3D7711304EFF33602FF7113C2
+S11308000471B2EFEE3602FF71130471B271A2D714
+S1130810D1DD0A91DD2191DD1591DD0BD73601FF84
+S113082071A271B271C2D73601FF71A3EFF4360120
+S1130830FF71A371B3EFED3601FF71A371B371C3FF
+S1130840D7D1DD0A91DD2191DD1491DD0CD7712220
+S1130850043601FF71827192D7712304EFF33601DC
+S1130860FF7123047183EFEE3601FF71230471835A
+S11308707193D7D1DD0D91DD1391DD02F1D7E15BE9
+S113088002EF068D02311A5C017C01D78D0C312AEE
+S1050890EFF57E
+S113089214F64315DD2261DD717BFACFE80080BED8
+S11308A2F013BEF6F6BEF2BEF4CFE800818FE80084
+S10C08B23103FAAFE00061CDD777
+S9030000FC
--- a/OUTPUT/K53R_SW0103.mot
+++ b/OUTPUT/K53R_SW0103.mot
@ -0,0 +1,144 @@
+S00E00004B383020202020206D6F744E
+S1130000CE0000000000000000000000000000001E
+S1130010000000008701280100000000000000002B
+S1130020B601000000000000000000000000000015
+S113003000000000000000000000000000000000BC
+S113004000000000000000000000000000000000AC
+S1130050000000000000000000000000000000009C
+S1130060000000000000000000000000000000008C
+S1130070000000000000000000000000000000007C
+S10A00805AA5040000000072
+S11300880000000000000000000000000000000064
+S10F009800000000000000000000000058
+S10700C07A47E00493
+S10D00C4000000000000000000002E
+S11300CECBF820FE3046FCFCD00100FC4902003681
+S11300DE00FC3029FCEF04CC0000A747DFF93620E2
+S11300EEFE3020FEEF04CC0000A747DFF9410032BA
+S11300FE1C00EF08B311498800482AFCF643DFF4CC
+S113010E4100320000EF08B3114980004820FEF68A
+S113011E43DFF4FC140200F6EFFEC1C3C5C78EFD27
+S113012E708EFCC1C7AF0201605C07980088003175
+S113013E8EBF0A018800D1DD068800FC9903008D6C
+S113014E129801AF08FC4206FC880161D323EB042C
+S113015EFC99A204FCA206FCAF08FC4206FC61F862
+S113016EFC850300C0C09EFC609EFDC6C4C2C06177
+S113017EFC318EFC940300EFEBC1C3C5C78EFD703A
+S113018E8EFCC1AF02FCF743DF06FC950300EF0CB7
+S113019EEB00FC899D10A200FCB202FCC09EFC6028
+S11301AE9EFDC6C4C2C061FCC1C3C5C78EFD708EA0
+S11301BEFCC1FC690700C09EFC609EFDC6C4C2C0A3
+S10501CE61FCCE
+S11301D016C80300AEF82761D339315E12F643DD49
+S11301E027BBBC02BC04BC06BC08BC0ABC0CBC0ECD
+S11301F0BC10BC12BC14BC16BC18BC1ABC1CBC1E63
+S11302003704200037B3EFD6AEF847DD06F6BBA7B8
+S1130210A7EFF5D7717AFAFC170400FC310400FC4F
+S1130220780600EFFA717AFAD7CF770002FC5F0202
+S113023000FC4E0200FC620200FC800200FC9A03F7
+S113024000FC0C0400F57800D7717BFAEFDB36A1D3
+S1130250FFCEA00071F2714BA4F5F3007183D78E29
+S1130260A8D7346100CD011FF402CD0406CA00E012
+S1130270CA03F9CA1501CE21E0CE22F3CE24F9D760
+S113028036F00030440071A200000000BC36347027
+S113029000AAB4086C0308BAB4710AE5710BE171E1
+S11302A01AE5711BE1712AE5712BE1710AED710AFE
+S11302B0E9711AED711AE9302200BAA030A783BAA5
+S11302C0A8C910009A89718A99300700BA9A302215
+S11302D001BAA2309743BAAAC912009AAAB8086C04
+S11302E00108BAB8AAC4BAC4AABA086C0108BABA4E
+S11302F051026F26FF9E266A060151FE5F26FF9E6D
+S113030026D7342201AA06086C0108BA06AA0808EE
+S11303106C0108BA08A9086C0308B9710BE1711BD8
+S1130320E1710BE5711BE5D7342401710AE5711AFB
+S1130330E5A9086C0308B9AA06085CFE08BA0671A8
+S11303400BE1711BE1D714136168DF04308100D71E
+S1130350F6BF06FC13BF08FC15BF04FCF6D7141344
+S11303606168DF04308100D736E5FF15BF00FC1358
+S1130370BF02FC7182EB00FC899D10A200FCB2025A
+S1130380FC7183F6D78F0AFCFCC10400E7300AFC39
+S1130390EC460300D7E514FCD7D734F00036F00060
+S11303A0F67182BAC6300F0ABAC4716AE5716BE19C
+S11303B0717AE5717BE1713AE5713BE1710AE671AD
+S11303C00BE2711AE6711BE2714AE5714BE1716A45
+S11303D0ED716AE9F6BAA0C918BF5DAAC8085CFE47
+S11303E008BAC8AACA085CFE08BACAD734B20171EE
+S11303F06BE1716BE5A9086C0108B9D734B401A9A4
+S1130400086C0108B9716AE5716BE1D7710AE4718E
+S11304100BE0D7CEABACD7FCEC0300F1FCDE07005D
+S1130420F1FC410800FC020300E7300AFCEC46033F
+S113043000E514FCD72008704100118F800098005B
+S1130440118F81009801118F82009802118F83000F
+S1130450759803118F8400739804118F8500729826
+S113046005118F86009806D0DD1390DD1990DF4EBC
+S11304708F2CFCD1DF1AC8040D530DEF1851030F54
+S11304802AFC3149EF0551030F2BFC759803EF0546
+S11304900C0973980465610A610B9806F3AEF816AB
+S11304A061C91830FC83634C07DFF24014FC01DFA0
+S11304B00DF514FC3207003030FCFC5E030010081C
+S11304C0D7C79800403AFC5ADF124CA5DF0EE53935
+S11304D0FCF537FCF53BFCE530FCEF328F39FC4C86
+S11304E001DF0F88009F3BFCCF39FC02CF30FC02B8
+S11304F0EF1C4C02DF18E937FC88001815FC8363F5
+S11305009F37FC708F3BFC614061C8FE0A00880085
+S11305109F3AFCF538FCC0D74C04F1737261D8D70C
+S1130520318E0415FC16630D7382624C03DFF16394
+S11305304F18FCDF738F15FC0C80DD290C7FDD2840
+S113054091DD2A0CFBDD2C91DD2F0CF8DD3391DDE0
+S11305502D0CF1DD0A4C50DF2BCF2DFC02EF09CF1F
+S11305602DFC03EF03E52DFCF52EFCEF17CF2EFC3D
+S113057003EF0ECF2EFC02EF08E52EFCEF03F52E61
+S1130580FCF52DFC8F16FC0CE6DD0E91DD1091DDE3
+S11305901391DF14F52FFCEF0FE52FFCEF0ACF2F9B
+S11305A0FC02EF04CF2FFC03F539FCF538FCF537DA
+S11305B0FCD773D3DD196391DD2991DF428F2FFCC2
+S11305C081729F2CFC4C04DC2EF52CFCF2EF2C8F5A
+S11305D02DFC814C0461C8F19F2AFC9F2DFCF52E53
+S11305E0FCEF1C8F2EFC814C0461C8F19F2BFC9FF7
+S11305F02EFCF52DFCEF08F6BF0EFC629F2FFC636A
+S1130600EE32FE2004F19800FC7308007291DF3290
+S11306108800318E14880073093CFCD1DF24150155
+S1130620B8020440FC14A9A1B9440700DC29193C10
+S1130630FC01A802123006007840FC8800FE72FF1C
+S1130640EF15D2DF128800738800193CFC00318E4C
+S113065012311CF67840FC88008198004C03DFA816
+S11306601004D78F2EFCFCDE07008F2DFCFC410804
+S1130670008F2FFCEC1008004023FC01DF1EF52343
+S1130680FCFE7FFFD539FCDF05F538FCEF0E8F3813
+S1130690FC819F38FC4C0761C8F539FC4024FC01FF
+S11306A0DF06F524FCFEBBFF4027FC01DF07F5272E
+S11306B0FCFC1304004028FC01DF72F528FCD52F54
+S11306C0FCDF06F6BF0EFCEF1BE6020EFCBF0EFCC1
+S11306D0448403DC0FF6BF0EFCF52FFCF52CFC5113
+S11306E002FE51FDD52EFCDF06F6BF10FCEF1AE624
+S11306F00210FCBF10FC44DC05DC0EF6BF10FCF558
+S11307002EFCF52BFCE1FE2CFDD52DFCDF05F6BF00
+S113071012FCD7E60212FCBF12FC44DC05DC0EF628
+S1130720BF12FCF52DFCF52AFCF1EE08FDD72004E0
+S11307301436FFFF62318EA104FFFFB802DD265399
+S11307400889318E617F08617E08B800311E1688E1
+S113075000310508177CA0087C0108169317DFEA0E
+S1130760A5A802EFD3100417D7A220FCE522FCAF02
+S113077020FC320500FC920800F74361F8E523FCF5
+S1130780AF20FC520AFC920800F74361F8E524FC10
+S1130790AF20FC5214FC920800F74361F8E525FCF5
+S11307A0AF20FC5232FC920800F74361F8E526FCC6
+S11307B0AF20FC5264FC920800F74361F8E527FC83
+S11307C0AF20FC32E803FC920800F74361F8E52807
+S11307D0FCAF20FC4460EADC04F6BF20FCD7D1DD8A
+S11307E00A91DD2191DD1491DD0CD77112043602DA
+S11307F0FF71B371A3D7711304EFF33602FF7113C2
+S11308000471B2EFEE3602FF71130471B271A2D714
+S1130810D1DD0A91DD2191DD1591DD0BD73601FF84
+S113082071A271B271C2D73601FF71A3EFF4360120
+S1130830FF71A371B3EFED3601FF71A371B371C3FF
+S1130840D7D1DD0A91DD2191DD1491DD0CD7712220
+S1130850043601FF71827192D7712304EFF33601DC
+S1130860FF7123047183EFEE3601FF71230471835A
+S11308707193D7D1DD0D91DD0591DD10F1D7E15BE9
+S113088002EF068D02311A5C017C01D78D0C312AEE
+S1050890EFF57E
+S113089214F64315DD2261DD717BFACFE80080BED8
+S11308A2F013BEF6F6BEF2BEF4CFE800818FE80084
+S10C08B23103FAAFE00061CDD777
+S9030000FC
--- a/OUTPUT/更改履历.txt
+++ b/OUTPUT/更改履历.txt
@ -1 +1,3 @@
-SW0101 初版
+SW0101 初版
+SW0102 增加15分钟关闭按摩
+SW0103 增加25分钟关闭通风加热
--- a/appTask.c
+++ b/appTask.c
@ -11,7 +11,7 @@
 uint8_t g_rx_buf[3];

 extern uint16_t g_AdVal[3];
-uint16_t am_counter;
+uint16_t am_counter,fan_counter,heat_counter;

 void HardWare_Init(void)
 {
@ -338,6 +338,44 @@ void AppTask(void)
            }
            
        }
+        else
+        {
+            am_counter = 0;
+        }
+
+        if (fan_state != 0)
+        {
+            fan_counter++;
+            if (fan_counter >= 1500)//25min
+            {
+                fan_counter = 0;
+                fan_state = 0;
+                fan_txstate = 0;
+                UART_Tx_Pro(KEY_FAN);
+            }
+            
+        }
+        else
+        {
+            fan_counter = 0;
+        }
+
+        if (heat_state != 0)
+        {
+            heat_counter++;
+            if (heat_counter >= 1500)//25min
+            {
+                heat_counter = 0;
+                heat_state = 0;
+                heat_txstate = 0;
+                UART_Tx_Pro(KEY_JR);
+            }
+        }
+        else
+        {
+            heat_counter = 0;
+        }
+        
        
    }
    
--- a/hwCtrl.c
+++ b/hwCtrl.c
@ -6,7 +6,7 @@

 #define K74L    1
 #define K74R    2
-#define BOARD   K74R    
+#define BOARD   K74L