Browse Source

feature: 添加新任务task_bedalarm

weight-flt
Zhangwen 10 months ago
parent
commit
9e4251d7d1
  1. 7
      .vscode/settings.json
  2. 790
      keilp/stcTTSS2_W5.uvguix.Administrator
  3. 40
      keilp/stcTTSS2_W5.uvoptx
  4. 54
      keilp/stcTTSS2_W5.uvprojx
  5. 33
      source/app/app_config.c
  6. 64
      source/app/app_config.h
  7. 25
      source/app/main.c
  8. 80
      source/app/task_bedalarm.c
  9. 33
      source/app/task_bedalarm.h
  10. 281
      source/app/task_screen.c
  11. 35
      source/app/task_screen.h
  12. 63
      source/app/task_screen_save.c
  13. 30
      source/app/task_screen_save.h
  14. 4
      source/ctask/TTSS_tick.h
  15. 15
      source/debug/debug_drv.c
  16. 2
      source/msp/uart/msp_uartN.c

7
.vscode/settings.json

@ -8,6 +8,11 @@
"bsp_config.h": "c", "bsp_config.h": "c",
"ttss_task.h": "c", "ttss_task.h": "c",
"ttss_tick.h": "c", "ttss_tick.h": "c",
"main.h": "c" "main.h": "c",
"task_lowpower.h": "c",
"task_bedalarm.h": "c",
"asp_lowpower.h": "c",
"debug_drv.h": "c",
"task_screen_save.h": "c"
} }
} }

790
keilp/stcTTSS2_W5.uvguix.Administrator

File diff suppressed because one or more lines are too long

40
keilp/stcTTSS2_W5.uvoptx

@ -8,7 +8,7 @@
<Extensions> <Extensions>
<cExt>*.c</cExt> <cExt>*.c</cExt>
<aExt>*.s*; *.src; *.a*</aExt> <aExt>*.s*; *.src; *.a*</aExt>
<oExt>*.obj</oExt> <oExt>*.obj; *.o</oExt>
<lExt>*.lib</lExt> <lExt>*.lib</lExt>
<tExt>*.txt; *.h; *.inc</tExt> <tExt>*.txt; *.h; *.inc</tExt>
<pExt>*.plm</pExt> <pExt>*.plm</pExt>
@ -100,9 +100,6 @@
<tRSysVw>1</tRSysVw> <tRSysVw>1</tRSysVw>
<sRunDeb>0</sRunDeb> <sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime> <sLrtime>0</sLrtime>
<bEvRecOn>1</bEvRecOn>
<bSchkAxf>0</bSchkAxf>
<bTchkAxf>0</bTchkAxf>
<nTsel>-1</nTsel> <nTsel>-1</nTsel>
<sDll></sDll> <sDll></sDll>
<sDllPa></sDllPa> <sDllPa></sDllPa>
@ -149,16 +146,6 @@
<LintExecutable></LintExecutable> <LintExecutable></LintExecutable>
<LintConfigFile></LintConfigFile> <LintConfigFile></LintConfigFile>
<bLintAuto>0</bLintAuto> <bLintAuto>0</bLintAuto>
<bAutoGenD>0</bAutoGenD>
<LntExFlags>0</LntExFlags>
<pMisraName></pMisraName>
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
<pMisraNamep></pMisraNamep>
<pszMrulep></pszMrulep>
<pSingCmdsp></pSingCmdsp>
<pMultCmdsp></pMultCmdsp>
</TargetOption> </TargetOption>
</Target> </Target>
@ -173,6 +160,7 @@
<FileNumber>1</FileNumber> <FileNumber>1</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\app\app_weight.c</PathWithFileName> <PathWithFileName>..\source\app\app_weight.c</PathWithFileName>
@ -185,6 +173,7 @@
<FileNumber>2</FileNumber> <FileNumber>2</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\app\main.c</PathWithFileName> <PathWithFileName>..\source\app\main.c</PathWithFileName>
@ -197,6 +186,7 @@
<FileNumber>3</FileNumber> <FileNumber>3</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\app\app_config.c</PathWithFileName> <PathWithFileName>..\source\app\app_config.c</PathWithFileName>
@ -209,6 +199,7 @@
<FileNumber>4</FileNumber> <FileNumber>4</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\app\task_screen.c</PathWithFileName> <PathWithFileName>..\source\app\task_screen.c</PathWithFileName>
@ -229,6 +220,7 @@
<FileNumber>5</FileNumber> <FileNumber>5</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\asp\asp_schain.c</PathWithFileName> <PathWithFileName>..\source\asp\asp_schain.c</PathWithFileName>
@ -241,6 +233,7 @@
<FileNumber>6</FileNumber> <FileNumber>6</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\asp\asp_lowpower.c</PathWithFileName> <PathWithFileName>..\source\asp\asp_lowpower.c</PathWithFileName>
@ -261,6 +254,7 @@
<FileNumber>7</FileNumber> <FileNumber>7</FileNumber>
<FileType>2</FileType> <FileType>2</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\cpu\STARTUP.A51</PathWithFileName> <PathWithFileName>..\source\cpu\STARTUP.A51</PathWithFileName>
@ -273,6 +267,7 @@
<FileNumber>8</FileNumber> <FileNumber>8</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\cpu\stc_8_delay.c</PathWithFileName> <PathWithFileName>..\source\cpu\stc_8_delay.c</PathWithFileName>
@ -293,6 +288,7 @@
<FileNumber>9</FileNumber> <FileNumber>9</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\msp\uart\msp_uartN.c</PathWithFileName> <PathWithFileName>..\source\msp\uart\msp_uartN.c</PathWithFileName>
@ -305,6 +301,7 @@
<FileNumber>10</FileNumber> <FileNumber>10</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\msp\msp_time2.c</PathWithFileName> <PathWithFileName>..\source\msp\msp_time2.c</PathWithFileName>
@ -317,6 +314,7 @@
<FileNumber>11</FileNumber> <FileNumber>11</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\msp\uart\msp_uart1.c</PathWithFileName> <PathWithFileName>..\source\msp\uart\msp_uart1.c</PathWithFileName>
@ -329,6 +327,7 @@
<FileNumber>12</FileNumber> <FileNumber>12</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\msp\msp_iicMx.c</PathWithFileName> <PathWithFileName>..\source\msp\msp_iicMx.c</PathWithFileName>
@ -341,6 +340,7 @@
<FileNumber>13</FileNumber> <FileNumber>13</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\msp\msp_eeprom.c</PathWithFileName> <PathWithFileName>..\source\msp\msp_eeprom.c</PathWithFileName>
@ -353,6 +353,7 @@
<FileNumber>14</FileNumber> <FileNumber>14</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\msp\msp_adc.c</PathWithFileName> <PathWithFileName>..\source\msp\msp_adc.c</PathWithFileName>
@ -373,6 +374,7 @@
<FileNumber>15</FileNumber> <FileNumber>15</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\bsp\TTSSbsp\bsp_config.c</PathWithFileName> <PathWithFileName>..\source\bsp\TTSSbsp\bsp_config.c</PathWithFileName>
@ -385,6 +387,7 @@
<FileNumber>16</FileNumber> <FileNumber>16</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\bsp\bsp_led.c</PathWithFileName> <PathWithFileName>..\source\bsp\bsp_led.c</PathWithFileName>
@ -397,6 +400,7 @@
<FileNumber>17</FileNumber> <FileNumber>17</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\bsp\bsp_cs1232.c</PathWithFileName> <PathWithFileName>..\source\bsp\bsp_cs1232.c</PathWithFileName>
@ -417,6 +421,7 @@
<FileNumber>18</FileNumber> <FileNumber>18</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\ctask\TTSS_task.c</PathWithFileName> <PathWithFileName>..\source\ctask\TTSS_task.c</PathWithFileName>
@ -429,6 +434,7 @@
<FileNumber>19</FileNumber> <FileNumber>19</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\ctask\TTSS_tick.c</PathWithFileName> <PathWithFileName>..\source\ctask\TTSS_tick.c</PathWithFileName>
@ -441,6 +447,7 @@
<FileNumber>20</FileNumber> <FileNumber>20</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\ctask\TTSS_time_stc.c</PathWithFileName> <PathWithFileName>..\source\ctask\TTSS_time_stc.c</PathWithFileName>
@ -461,6 +468,7 @@
<FileNumber>21</FileNumber> <FileNumber>21</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\tpc\tpc_road.c</PathWithFileName> <PathWithFileName>..\source\tpc\tpc_road.c</PathWithFileName>
@ -481,6 +489,7 @@
<FileNumber>22</FileNumber> <FileNumber>22</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\clib\c_lib.c</PathWithFileName> <PathWithFileName>..\source\clib\c_lib.c</PathWithFileName>
@ -493,6 +502,7 @@
<FileNumber>23</FileNumber> <FileNumber>23</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\clib\c_delay.c</PathWithFileName> <PathWithFileName>..\source\clib\c_delay.c</PathWithFileName>
@ -513,6 +523,7 @@
<FileNumber>24</FileNumber> <FileNumber>24</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\debug\cc_as_stc01_main.ini</PathWithFileName> <PathWithFileName>..\source\debug\cc_as_stc01_main.ini</PathWithFileName>
@ -525,6 +536,7 @@
<FileNumber>25</FileNumber> <FileNumber>25</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>1</Focus>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\source\debug\debug_drv.c</PathWithFileName> <PathWithFileName>..\source\debug\debug_drv.c</PathWithFileName>

54
keilp/stcTTSS2_W5.uvprojx

@ -10,7 +10,6 @@
<TargetName>STC8H3K64S2</TargetName> <TargetName>STC8H3K64S2</TargetName>
<ToolsetNumber>0x0</ToolsetNumber> <ToolsetNumber>0x0</ToolsetNumber>
<ToolsetName>MCS-51</ToolsetName> <ToolsetName>MCS-51</ToolsetName>
<uAC6>0</uAC6>
<TargetOption> <TargetOption>
<TargetCommonOption> <TargetCommonOption>
<Device>STC8H3K64S4 Series</Device> <Device>STC8H3K64S4 Series</Device>
@ -124,6 +123,47 @@
<HexOffset>0</HexOffset> <HexOffset>0</HexOffset>
<Oh166RecLen>16</Oh166RecLen> <Oh166RecLen>16</Oh166RecLen>
</OPTHX> </OPTHX>
<Simulator>
<UseSimulator>1</UseSimulator>
<LoadApplicationAtStartup>1</LoadApplicationAtStartup>
<RunToMain>1</RunToMain>
<RestoreBreakpoints>1</RestoreBreakpoints>
<RestoreWatchpoints>1</RestoreWatchpoints>
<RestoreMemoryDisplay>1</RestoreMemoryDisplay>
<RestoreFunctions>1</RestoreFunctions>
<RestoreToolbox>1</RestoreToolbox>
<LimitSpeedToRealTime>0</LimitSpeedToRealTime>
<RestoreSysVw>1</RestoreSysVw>
</Simulator>
<Target>
<UseTarget>0</UseTarget>
<LoadApplicationAtStartup>1</LoadApplicationAtStartup>
<RunToMain>0</RunToMain>
<RestoreBreakpoints>1</RestoreBreakpoints>
<RestoreWatchpoints>1</RestoreWatchpoints>
<RestoreMemoryDisplay>1</RestoreMemoryDisplay>
<RestoreFunctions>0</RestoreFunctions>
<RestoreToolbox>1</RestoreToolbox>
<RestoreTracepoints>1</RestoreTracepoints>
<RestoreSysVw>1</RestoreSysVw>
</Target>
<RunDebugAfterBuild>0</RunDebugAfterBuild>
<TargetSelection>-1</TargetSelection>
<SimDlls>
<CpuDll></CpuDll>
<CpuDllArguments></CpuDllArguments>
<PeripheralDll></PeripheralDll>
<PeripheralDllArguments></PeripheralDllArguments>
<InitializationFile></InitializationFile>
</SimDlls>
<TargetDlls>
<CpuDll></CpuDll>
<CpuDllArguments></CpuDllArguments>
<PeripheralDll></PeripheralDll>
<PeripheralDllArguments></PeripheralDllArguments>
<InitializationFile></InitializationFile>
<Driver></Driver>
</TargetDlls>
</DebugOption> </DebugOption>
<Utilities> <Utilities>
<Flash1> <Flash1>
@ -177,14 +217,12 @@
<Mx51P>0</Mx51P> <Mx51P>0</Mx51P>
<hadXRAM2>0</hadXRAM2> <hadXRAM2>0</hadXRAM2>
<uocXram2>0</uocXram2> <uocXram2>0</uocXram2>
<hadXRAM3>0</hadXRAM3>
<ModC2>0</ModC2> <ModC2>0</ModC2>
<ModH2>0</ModH2> <ModH2>0</ModH2>
<Mdu_R515>0</Mdu_R515> <Mdu_R515>0</Mdu_R515>
<Mdu_F120>0</Mdu_F120> <Mdu_F120>0</Mdu_F120>
<Psoc>0</Psoc> <Psoc>0</Psoc>
<hadIROM2>0</hadIROM2> <hadIROM2>0</hadIROM2>
<hadIROM3>0</hadIROM3>
<ModSmx2>0</ModSmx2> <ModSmx2>0</ModSmx2>
<cBanks>0</cBanks> <cBanks>0</cBanks>
<xBanks>0</xBanks> <xBanks>0</xBanks>
@ -254,16 +292,6 @@
<StartAddress>0x0</StartAddress> <StartAddress>0x0</StartAddress>
<Size>0x0</Size> <Size>0x0</Size>
</IROM512> </IROM512>
<XRA513>
<Type>0</Type>
<StartAddress>0x0</StartAddress>
<Size>0x0</Size>
</XRA513>
<IROM513>
<Type>0</Type>
<StartAddress>0x0</StartAddress>
<Size>0x0</Size>
</IROM513>
</OnChipMemories> </OnChipMemories>
</Target51Misc> </Target51Misc>
<C51> <C51>

33
source/app/app_config.c

@ -24,9 +24,6 @@ void L3_reg_reset(void)
//网络状态 00 联网 01 断网 //网络状态 00 联网 01 断网
R.net_status = NET_STATUS_NOTCONNECT; R.net_status = NET_STATUS_NOTCONNECT;
//充电状态
R.charge_status = KLJ_CHARGE_STATUS_NORMAL;
//电量百分比 //电量百分比
R.dl = 0; R.dl = 0;
@ -37,19 +34,23 @@ void L3_reg_reset(void)
R.danwei = KG; R.danwei = KG;
//蜂鸣器 //蜂鸣器
R.beep = 0; R.beep = beep_off;
//校时标志位 //蜂鸣器开启时间
R.setime_flag = 0; R.beep_startime = 0;
//实时时钟数据初始化 //离床报警开启标志
R.ds1302.second = 0; R.LeaveForbid_flag = 0;
R.ds1302.miunte = 0;
R.ds1302.hour = 0; // 手动解除报警标志
R.ds1302.day = 0; R.ForbidDelate_flag = 0;
R.ds1302.month = 0;
R.ds1302.week = 0; // 屏幕按键按下标志
R.ds1302.year = 0; R.ScrTouch_flag = 0;
// 记录每次屏幕按下时间
R.ScrTouch_time = 0;
} }
void L3_reg_init(void) void L3_reg_init(void)

64
source/app/app_config.h

@ -15,17 +15,20 @@
#define POWER_NORMAL 0 #define POWER_NORMAL 0
#define POWER_LOW 1 #define POWER_LOW 1
#define KLJ_CHARGE_STATUS_NORMAL 0 #define LeaveForbid_OPEN 1 //1 打开报警,0 不打开
#define KLJ_CHARGE_STATUS_CHARGING 1 #define LeaveForbid_OFF 0
// #define RFID_FREE_NO 0x00FA // #define RFID_FREE_NO 0x00FA
#define NET_STATUS_NOTCONNECT 1 #define NET_STATUS_NOTCONNECT 1
#define NET_STATUS_CONNECTED 0 #define NET_STATUS_CONNECTED 0
#define KG 0 #define KG 0 //0 KG; 1 磅
#define lb 1 #define lb 1
#define beep_on 1 //1 开启,0 关闭
#define beep_off 0
enum tp_handle enum tp_handle
{ {
TP_HANDLED, TP_HANDLED,
@ -196,57 +199,40 @@ typedef struct global_register
U16 sensor_adc[4]; U16 sensor_adc[4];
U16 kgx10_out; U16 kgx10_out;
U16 adc16; U16 adc16;
} weight; U16 last;
U16 differ;
//网络状态
U8 net_status;
} weight;
//电量 //电量
U8 dl; U8 dl;
//充电状态 //网络状态
U8 charge_status; U8 net_status;
//功耗模式
U8 power_mode;
//单位 //单位
U8 danwei; U8 danwei;
//蜂鸣器 //蜂鸣器
U8 beep; U8 beep;
//蜂鸣器开启时间
U32 beep_startime;
//离床报警开启标志 //离床报警开启标志
U8 LeaveForbid_flag; U8 LeaveForbid_flag;
//重量补偿开启标志 //离床报警手动解除标志
U8 WeightKeep_flag; U8 ForbidDelate_flag;
// //180s无操作 //功耗模式
// U8 power_mode; U8 power_mode;
// //最后收到服务器数据时间
// U32 net_last_recv_time;
// //称重保持
// U8 weight_keep_flag;
// U16 weight_keep_kgx10;
//校时标志 //屏幕按键按下标志
U8 setime_flag; U8 ScrTouch_flag;
// RTC DS1302 //屏幕按键按下时间
struct U32 ScrTouch_time;
{
U8 second;
U8 miunte;
U8 hour;
U8 day;
U8 month;
U8 week;
U8 year;
} ds1302;
} GlobalRegister; } GlobalRegister;
@ -296,6 +282,8 @@ extern void L3_S_2_R(void);
extern void L3_R_2_S(void); extern void L3_R_2_S(void);
extern void L3_reg_init(void);

25
source/app/main.c

@ -57,13 +57,14 @@ void L0_RTC_init(void)
void L0_main_initled(void) void L0_main_initled(void)
{ {
D_LED1_OFF(); D_LED1_OFF();
//D_LED2_ON();
// D_LED2_ON(); L3_reg_init();
TTSS_run_times(6) TTSS_run_times(6)
{ {
D_LED1_REV(); D_LED1_REV();
// D_LED2_REV(); //D_LED2_REV();
Lc_delay_ms(300); Lc_delay_ms(300);
} }
} }
@ -93,6 +94,7 @@ void L0_main_init(void)
//=============================================== //===============================================
void main(void) void main(void)
{ {
int tpc_flag = 0;
u16 a= 0; u16 a= 0;
char d[9]={0xab}; char d[9]={0xab};
@ -112,16 +114,17 @@ void main(void)
// L1_uartD_uc('.'); // L1_uartD_uc('.');
// D_LED2_REV(); // D_LED2_REV();
} }
// TTSS_run_every(s_nos_tick.stamp,40) if((tpc_flag = L2_debug_ONcomand()))
// D_LED1_REV();
// L4_weight_out();
// ///55 0D 0C 90 F5 77 FF 52 80 00 00 00 33
// TTSS_run_every_end
if(L2_debug_ONcomand())
{ {
L3_weight_ONdebug(D_cmd_filter_weight);///fe xx xx/// if(tpc_flag == 1)
{
L3_weight_ONdebug(D_cmd_filter_weight);///fe xx xx///
}
else if(tpc_flag == 2)
{
parse_screen_pkg();///fe xx xx///
}
} }
L3_task_weight_handler(&tst_weight); L3_task_weight_handler(&tst_weight);

80
source/app/task_bedalarm.c

@ -0,0 +1,80 @@
////////////////////////////////////////////////////////////////////////////
///@copyright Copyright (c) 2018, 传控科技 All rights reserved.
///-------------------------------------------------------------------------
/// @file bsp_drv.c
/// @brief bsp @ driver config
///-------------------------------------------------------------------------
/// @version 1.0
/// @author CC
/// @date 20180331
/// @note cc_AS_stc02
//////////////////////////////////////////////////////////////////////////////
#include "task_bedalarm.h"
#include "app_config.h"
#include "../msp/uart/msp_uart1.h"
S_TASK_Bed_ALARM _s_task_bed_alarm;
//=============================================
void L3_task_bed_alarm_init(void)
{
L1_task_init(&_s_task_bed_alarm.task);
L3_task_s_go(_s_task_bed_alarm,D_task_init);
}
#define D_task_STATUS_READ 0x50
#define D_task_WEIGHT_READ_AGAIN 0x51
#define D_task_ALARM_DELETE 0x52
void L3_task_bed_alarm_handler(S_TASK_Bed_ALARM *s)
{
TTSS_Task_init():
L2_task_go(D_task_STATUS_READ);
//判定是否开启离床报警
TTSS_Task_step(D_task_STATUS_READ):
// if(R.LeaveForbid_flag == LeaveForbid_OPEN)
// {
// R.weight.last = R.weight.kgx10_out * 10; 应该在 按键按下时,就置标志位R.LeaveForbid_flag == LeaveForbid_OPEN和获取参考点位的重量。
// L2_task_go_Tdelay(D_task_WEIGHT_READ_AGAIN, D_Tdelay_100ms);
// }
//判定是否触发报警
TTSS_Task_step(D_task_WEIGHT_READ_AGAIN):
R.weight.differ = R.weight.last - R.weight.kgx10_out * 10;
//触发报警 //放在该task的第二步
if(R.weight.differ >= 100)
{
R.beep = beep_on;
R.beep_startime = D_sys_now;
L2_task_go_Tdelay(D_task_ALARM_DELETE, 0);
}
//未触发报警
else
{
R.weight.last = R.weight.kgx10_out * 10;
L2_task_go_Tdelay(D_task_WEIGHT_READ_AGAIN, 0);
}
//判定是否解除报警
TTSS_Task_step(D_task_ALARM_DELETE):
//手动解除
// if(R.ForbidDelate_flag == 1)
// {
// R.beep = beep_on;
// R.beep_startime = 0;
// R.LeaveForbid_flag = LeaveForbid_OFF; 应在按键按下时,操作beep还和置位R.LeaveForbid_flag = LeaveForbid_OFF
// }
//超时解除 //放在该task的第一步
else if(D_sys_now - R.beep_startime > D_COUNT_JIFFIES(30000))
{
R.beep = beep_on;
R.beep_startime = 0;
R.LeaveForbid_flag = LeaveForbid_OFF;
}
L2_task_go_Tdelay(D_task_STATUS_READ, 0);
TTSS_Task_end();
}

33
source/app/task_bedalarm.h

@ -0,0 +1,33 @@
////////////////////////////////////////////////////////////////////////////
///@copyright Copyright (c) 2018, 传控科技 All rights reserved.
///-------------------------------------------------------------------------
/// @file bsp_drv.h
/// @brief bsp @ driver config
///-------------------------------------------------------------------------
/// @version 1.0
/// @author CC
/// @date 20180331
/// @note cc_AS_stc02
//////////////////////////////////////////////////////////////////////////////
#ifndef _APP_TASK_Bed_Alarm_H
#define _APP_TASK_Bed_Alarm_H
#include "../ctask/TTSS_task.h"
#include "../clib/c_lib.h"
typedef struct _s_task_low_power
{
TS_task task;
}S_TASK_Bed_ALARM;
extern S_TASK_Bed_ALARM _s_task_bed_alarm;
extern void L3_task_bed_alarm_init(void);
extern void L3_task_bed_alarm_handler(S_TASK_Bed_ALARM *s);
#endif // #ifndef _APP_TASK_Bed_Alarm_H

281
source/app/task_screen.c

@ -1,28 +1,28 @@
#include "../app/task_screen.h" #include "../app/task_screen.h"
#include "../app/app_config.h" #include "../app/app_config.h"
// #include "../bsp/bsp_config.h"
// #include "../bsp/bsp_ds1302.h"
#include "../msp/uart/msp_uart1.h" #include "../msp/uart/msp_uart1.h"
#include "msp_uart1.h" #include "msp_uart1.h"
#include "debug_drv.h" #include "debug_drv.h"
#include "../msp/msp_eeprom.h"
S_TASK_SCREEN _s_task_screen; S_TASK_SCREEN _s_task_screen;
SCRSetValPkg scrSetValPkg = { SCRSetValPkg scrSetValPkg =
0xA5, 0x5A, {
0x1C, //长度 0xA5, 0x5A, //帧头
0x82, //指令 0x1C, //长度
0x01, 0x1E, //起始地址 0x82, //指令
0x00, 0x00, //体重 0x01, 0x1E, //起始地址
0x00, 0x00, //电量 0x00, 0x00, //体重
0x00, 0x00, //网络状态 0x00, 0x00, //电量
0x00, 0x00, //单位 0x00, 0x00, //网络状态
0x00, 0x00, //语言 0x00, 0x00, //单位标志
// 0x00, 0x00, //充电状态 0x00, 0x00, //语言标志
0x00, 0x00, //蜂鸣器状态 0x00, 0x00, //蜂鸣器状态
0x00, 0x00, //界面 0x00, 0x00, //
0x1C, 0x78, // CRC 0x00, 0x00, //离床报警标志
0x00, 0x00, //
0x1C, 0x78, //CRC
}; };
//息屏指令 //息屏指令
@ -55,7 +55,7 @@ void L3_task_screen_init(void)
// #define D_TASK_SCREEN_SEND_CONTROL 0x50 // #define D_TASK_SCREEN_SEND_CONTROL 0x50
// #define D_TASK_SCREEN_SEND_VAL 0x51 // #define D_TASK_SCREEN_SEND_VAL 0x51
//#define D_task_RFID_SET 0x52 // #define D_task_RFID_SET 0x52
#define D_task_RS485_SEND_BEFORE 0x50 #define D_task_RS485_SEND_BEFORE 0x50
#define D_task_RS485_SEND 0x51 #define D_task_RS485_SEND 0x51
@ -68,165 +68,157 @@ void L3_task_screen_handler(S_TASK_SCREEN *s)
// L0_uart1_uchex(_s_task_screen.task.sh); // L0_uart1_uchex(_s_task_screen.task.sh);
// L0_uart1_0d0a(); // L0_uart1_0d0a();
TTSS_Task_init(): TTSS_Task_init():
L2_task_go(D_task_RS485_SEND); L2_task_go(D_task_RS485_SEND_BEFORE);
//发送前 //发送前
TTSS_Task_step(D_task_RS485_SEND_BEFORE): TTSS_Task_step(D_task_RS485_SEND_BEFORE):
// L1_uartD_uc('A'); //检测功耗模式
// L1_uartD_0d0a(); ScreenPingOff_judge();
// L1_uartD_uc('A'); if(R.ScrTouch_flag == 0)// if (s->power_mode == POWER_LOW)
// L1_uartD_0d0a();
// 检测功耗模式是否转变
if(s->power_mode != R.power_mode)
{ {
s->power_mode = R.power_mode; //发送熄屏指令
if (s->power_mode == POWER_LOW) L1_uart1_Array((U8 *)&scrPingOffPkg, sizeof(scrPingOffPkg));
{
//发送息屏指令
L1_uart1_Array((U8 *)&scrPingOffPkg, sizeof(scrPingOffPkg));
}
else
{
//发送亮屏指令
L1_uart1_Array((U8 *)&scrPingOnPkg, sizeof(scrPingOnPkg));
}
L2_task_go_Tdelay(D_task_RS485_SEND, D_Tdelay_400ms);
} }
else else if(R.ScrTouch_flag == 1)
{ {
L2_task_go_Tdelay(D_task_RS485_SEND, 0); //发送亮屏指令
L1_uart1_Array((U8 *)&scrPingOnPkg, sizeof(scrPingOnPkg));
} }
L2_task_go_Tdelay(D_task_RS485_SEND, D_Tdelay_400ms);
//发送 //发送
TTSS_Task_step(D_task_RS485_SEND): TTSS_Task_step(D_task_RS485_SEND):
if (1)//if (R.power_mode == POWER_NORMAL) if (R.power_mode == POWER_NORMAL)
{ {
// L1_uartD_uc('P'); //构造pkg
// L1_uartD_0d0a(); constructor_scr_pkg();
// L1_uartD_uc('P'); //发送pkg
// L1_uartD_0d0a(); L1_uart1_Array((U8 *)&scrSetValPkg, sizeof(SCRSetValPkg));
//构造pkg }
constructor_scr_pkg(); L2_task_go_Tdelay(D_task_RS485_SEND_BEFORE, D_Tdelay_400ms);
//发送pkg
L1_uart1_Array((U8 *)&scrSetValPkg, sizeof(SCRSetValPkg));
// L0_uart0_sendArray((U8 *)&scrSetValPkg, sizeof(SCRSetValPkg));
//延时send next
}
L2_task_go_Tdelay(D_task_RS485_SEND_AFTER, D_Tdelay_400ms);
//发送后 //发送后
TTSS_Task_step(D_task_RS485_SEND_AFTER): TTSS_Task_step(D_task_RS485_SEND_AFTER):
// rs485_pkg_send_after(index);
L2_task_go_Tdelay(D_task_RS485_RECV, 0);
//接收
TTSS_Task_step(D_task_RS485_RECV):
// if(ts_uart[0].r.ok == 1)
// {
// ts_uart[0].r.ok = 0;
// parse_screen_pkg();
// }
L2_task_go_Tdelay(D_task_RS485_SEND, D_Tdelay_100ms); L2_task_go_Tdelay(D_task_RS485_SEND, D_Tdelay_100ms);
TTSS_Task_end(); TTSS_Task_end();
} }
//构造屏幕协议包
void constructor_scr_pkg() void constructor_scr_pkg()
{ {
U16 CRC = 0; U16 CRC = 0;
// L0_uart1_str("R.weight.kgx10_out: ");
scrSetValPkg.buf.weight_kgx100[0] = (R.weight.kgx10_out * 10) >> 8 & 0xFF; // L0_uart1_us(R.weight.kgx10_out);
scrSetValPkg.buf.weight_kgx100[1] = (R.weight.kgx10_out * 10) >> 0 & 0xFF; // L0_uart1_0d0a();
if(R.danwei == KG)
{
scrSetValPkg.buf.weight_kgx100[0] = (R.weight.kgx10_out * 10) >> 8 & 0xFF;
scrSetValPkg.buf.weight_kgx100[1] = (R.weight.kgx10_out * 10) >> 0 & 0xFF;
}
else if(R.danwei == lb) //1kg = 2.20462262磅
{
scrSetValPkg.buf.weight_kgx100[0] = (R.weight.kgx10_out * 22) >> 8 & 0xFF;
scrSetValPkg.buf.weight_kgx100[1] = (R.weight.kgx10_out * 22) >> 0 & 0xFF;
}
// L0_uart1_str("scrSetValPkg.buf.dl: ");
// L0_uart1_us(R.dl);
// L0_uart1_0d0a();
scrSetValPkg.buf.dl[0] = R.dl >> 8 & 0xFF; scrSetValPkg.buf.dl[0] = R.dl >> 8 & 0xFF;
scrSetValPkg.buf.dl[1] = R.dl >> 0 & 0xFF; scrSetValPkg.buf.dl[1] = R.dl >> 0 & 0xFF;
scrSetValPkg.buf.net_status[0] = R.net_status >> 8 & 0xFF; scrSetValPkg.buf.net_status[0] = R.net_status >> 8 & 0xFF;
scrSetValPkg.buf.net_status[1] = R.net_status >> 0 & 0xFF; scrSetValPkg.buf.net_status[1] = R.net_status >> 0 & 0xFF;
scrSetValPkg.buf.danwei[0] = R.danwei >> 8 & 0xFF; scrSetValPkg.buf.danwei[0] = R.danwei >> 8 & 0xFF;
scrSetValPkg.buf.danwei[1] = R.danwei >> 0 & 0xFF; scrSetValPkg.buf.danwei[1] = R.danwei >> 0 & 0xFF;
scrSetValPkg.buf.beep[0] = R.beep >> 8 & 0xFF; scrSetValPkg.buf.beep[0] = R.beep >> 8 & 0xFF;
scrSetValPkg.buf.beep[1] = R.beep >> 0 & 0xFF; scrSetValPkg.buf.beep[1] = R.beep >> 0 & 0xFF;
// L0_uart0_sendstr("scrSetValPkg.buf.medicine[0]: ");
// L0_uart0_uchex(scrSetValPkg.buf.medicine[0]);
// L0_uart0_0d0a();
// L0_uart0_sendstr("scrSetValPkg.buf.medicine[1]: ");
// L0_uart0_uchex(scrSetValPkg.buf.medicine[1]);
// L0_uart0_0d0a();
scrSetValPkg.buf.LeaveForbid_flag[0] = R.LeaveForbid_flag >> 8 & 0xFF; scrSetValPkg.buf.LeaveForbid_flag[0] = R.LeaveForbid_flag >> 8 & 0xFF;
scrSetValPkg.buf.LeaveForbid_flag[1] = R.LeaveForbid_flag >> 0 & 0xFF; scrSetValPkg.buf.LeaveForbid_flag[1] = R.LeaveForbid_flag >> 0 & 0xFF;
scrSetValPkg.buf.WeightKeep_flag[0] = R.WeightKeep_flag >> 8 & 0xFF; scrSetValPkg.buf.WeightKeep_flag[0] = R.WeightKeep_flag >> 8 & 0xFF;
scrSetValPkg.buf.WeightKeep_flag[1] = R.WeightKeep_flag >> 0 & 0xFF; scrSetValPkg.buf.WeightKeep_flag[1] = R.WeightKeep_flag >> 0 & 0xFF;
CRC = CRC_16(((U8 *)&scrSetValPkg) + 3, 26); CRC = CRC_16(((U8 *)&scrSetValPkg) + 3, 21);
scrSetValPkg.crc[1] = CRC; scrSetValPkg.crc[1] = CRC;
scrSetValPkg.crc[0] = CRC >> 8; scrSetValPkg.crc[0] = CRC >> 8;
} }
//void parse_screen_pkg() // 屏幕回传协议解析
//{ void parse_screen_pkg()
// TPC_SCREEN *p = (TPC_SCREEN *) ts_uart[0].r.buf; {
// p->ocr = p->buf[p->num[0] << 8 | p->num[1]]; SCReturnPkg *p = (SCReturnPkg *) ts_Urec[D_UART1].reg;
// if(p->head[0] == 0xAA && 1 /*count_ocr() */) // p->ocr = p->buf[p->num[0] << 8 | p->num[1]];
// { if(p->head[0] == 0xA5 && p->head[1] == 0x5A/*count_ocr() */)
// if(p->slaveId == R.slave_id && p->cmd == 0x10) {
// { if(p->cmd == 0x83)
// //1.buf[0]高4位是否需要授权标志 {
// R.auth_flag &= 0x0F; R.ScrTouch_flag = 1;
// R.auth_flag |= p->buf[0] & 0xF0; R.ScrTouch_time = D_sys_now; //2024.9.13 15:04:59
// 按钮
// //2.buf[0]低四位是否进入低功耗模式 if(p->start_addr[0] == 0x06)
// // R.low_power_mode = p->buf[0] & 0x0F; {
// L3_set_power_mode(p->buf[0] & 0x0F); switch (p->start_addr[1])
// {
// //3.buf[1-2], rfid映射 case 0xD0://菜单
// //TODO 上位机发过来的rfid编号如何处理 break;
// setLedStatus = (U16)p->buf[1] << 8 | p->buf[2]; case 0xD1://Home
// if(setLedStatus != 0x00) break;
// { case 0xD2://清零
// //0位是功能按键,常亮,不提供设置功能 tst_weight.kgx10_zero = tst_weight.kgx10;
// for(i=1;i<LED_BTN_NUM;i++) break;
// { case 0xD3://离床报警
// //不处理0,只处理1的情况(代表其他端产生了sop中的节点,比如平板上触发谈话等) R.LeaveForbid_flag = LeaveForbid_OPEN;
// if((setLedStatus >> i) & 0x0001) // 并获取到参考重量 weight_ref = 当前重量
// {
// R.led_status[i] = 1; break;
// } case 0xD4://保存
// } // register1 = tst_weight.kgx10;
// } break;
// //构造响应包,并且返回 case 0xD5://校准菜单按钮
// acklen = constructor_rs485_ack(); scrSetValPkg.buf.ui[1] = p->Data[1];
// //写出 break;
// L0_uart2_sendArray((U8*)&tpc_rs485_ack, acklen); case 0xD6://语言切换
// //日志 scrSetValPkg.buf.language[1] = p->Data[1];
// print_rs485_pkg(p); break;
// } case 0xD7://重量单位切换
// } R.danwei = p->Data[1];
//} break;
case 0xD8://查看历史数据
//void print_rs485_pkg(TPC_RS485 *p) break;
//{ case 0xD9://校准确认
// L0_uart0_sendstr("\r\n--------- Recv RS485 --------\r\n"); ts_weight_SPara.ts_WPoint[pd485->buf[0]].kg = D_2uc_u16(pd485->buf[1],pd485->buf[2]);
// L0_uart0_sendstr("slaveId : "); ts_weight_SPara.ts_WPoint[pd485->buf[0]].adc = tst_weight.adc32;////使用当前采样值
// L0_uart0_uchex(p->slaveId); L4_WPoint_out();
// L0_uart0_0d0a(); //写入IAP
// L0_uart0_sendstr("cmd: "); L3_R_2_S();
// L0_uart0_uchex(p->cmd); L0_Iap_Program_array(D_EEP_BASE,D_struct2U8(S),D_S_LEN);
// L0_uart0_0d0a(); break;
// L0_uart0_sendstr("num: "); default:
// L0_uart0_uchex(p->num[0]); break;
// L0_uart0_uchex(p->num[1]); }
// L0_uart0_0d0a(); }
// L0_uart0_sendstr("dat : "); // 数据录入(确认键)
// L0_uart0_sendArrayHex(p->buf, p->num[0] << 8 | p->num[1]); if(p->start_addr[0] == 0x07)
// L0_uart0_0d0a(); {
// L0_uart0_sendstr("ocr: "); switch (p->start_addr[1])
// L0_uart0_uchex(p->ocr); {
// L0_uart0_0d0a(); case 0xA1://校准点
//} // register2 = p->data[1];
break;
//查表法 case 0xA2://校准体重
// register3 = p->data[1];
break;
default:
break;
}
}
}
}
}
//CRC校验 查表法
U16 CRC_16(U8 *pMsg, U16 Len) U16 CRC_16(U8 *pMsg, U16 Len)
{ {
U8 i; U8 i;
@ -241,4 +233,15 @@ U16 CRC_16(U8 *pMsg, U16 Len)
} }
j = (U16)uchCRCHi << 8 | uchCRCLo; j = (U16)uchCRCHi << 8 | uchCRCLo;
return j; return j;
}
// 180s无操作 判定函数
void ScreenPingOff_judge(void)
{
U32 Ntime = D_sys_now;
if( Ntime - R.ScrTouch_time > D_COUNT_JIFFIES(180000))
{
R.ScrTouch_flag = 0;
R.power_mode = POWER_LOW;
}
} }

35
source/app/task_screen.h

@ -30,10 +30,10 @@ typedef struct
{ {
//重量 //重量
U8 weight_kgx100[2]; U8 weight_kgx100[2];
//电量
U8 dl[2];
//网络状态 //网络状态
U8 net_status[2]; U8 net_status[2];
//网络状态
U8 dl[2];
//单位 //单位
U8 danwei[2]; U8 danwei[2];
//语言 //语言
@ -50,6 +50,18 @@ typedef struct
U8 crc[2]; U8 crc[2];
} SCRSetValPkg; } SCRSetValPkg;
// A5 5A 08 83 00 00 01 02 22 00 00
typedef struct
{
U8 head[2]; //A5 5A:帧头
U8 num; //08:指令字节长度,83 00 00 01 02 22 00 00共 8字节(不含帧头)
U8 cmd; //83:读变量存储器指令
U8 start_addr[2];//00 00:变量存储器地址
U8 num_word; //01:数据字长度,02 22 共 1 字长
U8 Data[2]; // 02 22:数据内容,设置的键值
U8 crc[2]; //CRC
} SCReturnPkg;
typedef struct typedef struct
{ {
U8 head[2]; U8 head[2];
@ -59,15 +71,15 @@ typedef struct
U8 crc[2]; U8 crc[2];
} SCRControlPkg; } SCRControlPkg;
typedef struct _tpc_screen_ // typedef struct _tpc_screen_
{ // {
U8 head[2]; // U8 head[2];
U8 num; // U8 num;
U8 cmd; // U8 cmd;
U8 start_addr[2]; // U8 start_addr[2];
U8 buf[5]; // U8 buf[5];
U8 ocr[2]; // U8 ocr[2];
}TPC_SCREEN; // }TPC_SCREEN;
extern S_TASK_SCREEN _s_task_screen; extern S_TASK_SCREEN _s_task_screen;
@ -75,6 +87,7 @@ extern void L3_task_screen_init(void);
extern void L3_task_screen_handler(S_TASK_SCREEN *s); extern void L3_task_screen_handler(S_TASK_SCREEN *s);
extern void constructor_scr_pkg(); extern void constructor_scr_pkg();
extern void parse_screen_pkg(); extern void parse_screen_pkg();
extern void ScreenPingOff_judge();
static U8 auchCRCHi[] = { static U8 auchCRCHi[] = {
0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41, 0x01, 0xC0, 0x80, 0x41, 0x00, 0xC1, 0x81, 0x40, 0x01, 0xC0, 0x80, 0x41,

63
source/app/task_screen_save.c

@ -0,0 +1,63 @@
#include "task_screen_save.h"
#define SCREEN_SAVE_LEN 10
#define EEPROM_WEIGHT_ADDR 0x100
#define HEAD0 0xa3
#define HEAD1 0xa4
#define TAIL0 0xa5
#define TAIL1 0xa6
SCREEN_SAVE screen_save_arr[SCREEN_SAVE_LEN];
void screen_save_init()
{
for(i = 0;i < SCREEN_SAVE_LEN; i++)
{
screen_save_arr[i].head[0] = HEAD0;
screen_save_arr[i].head[1] = HEAD1;
screen_save_arr[i].kgx10_out = 0;
screen_save_arr[i].available = 0;
screen_save_arr[i].tail[0] = TAIL0;
screen_save_arr[i].tail[1] = TAIL1;
}
}
void screen_save_push(U16 weight)
{
int i = 0;
int free = 0;
// 从eeprom中取出数组
L0_Iap_Read_array(EEPROM_WEIGHT_ADDR, screen_save_arr,sizeof(screen_save_arr));
if(screen_save_arr[0].head[0] != HEAD0 || screen_save_arr[0].head[1] != HEAD1
|| screen_save_arr[0].tail[0] != TAIL0 || screen_save_arr[0].tail[1] != TAIL1)
{
screen_save_init();
}
// 遍历寻找空位
for(i = 0;i < SCREEN_SAVE_LEN; i++)
{
if(screen_save_arr[i].available =! 1)
{
free = i;
break;
}
}
// 当都有数据时
if(i == SCREEN_SAVE_LEN)
{
for(i = 0; i < SCREEN_SAVE_LEN-1; i++ )
{
screen_save_arr[i] = screen_save_arr[i+1];
}
free = SCREEN_SAVE_LEN-1;
}
// 放到free位置
screen_save_arr[free].available = 1;
screen_save_arr[free].kgx10_out = weight;
// 把数组放回eeprom中
L0_Iap_Program_array(EEPROM_WEIGHT_ADDR, screen_save_arr,sizeof(screen_save_arr));
}

30
source/app/task_screen_save.h

@ -0,0 +1,30 @@
#ifndef _APP_TASK_SCREEN_SAVE_H
#define _APP_TASK_SCREEN_SAVE_H
#include "../bsp/TTSSbsp/bsp_config.h"
typedef struct
{
U8 head[2];
U8 available;
U16 kgx10_out;
U8 tail[2];
}SCREEN_SAVE;
typedef struct _s_task_screen_save
{
TS_task task;
}S_TASK_SCREEN_SAVE;
extern S_TASK_SCREEN_SAVE _s_task_screen_save;
extern void L3_task_screen_save_init(void);
extern void L3_task_screen_save_handler(S_TASK_Bed_ALARM *s);
void screen_save_push(U16 weight);
#endif

4
source/ctask/TTSS_tick.h

@ -89,10 +89,14 @@ extern TS_nos_tick_ s_nos_tick;
#define D_Tdelay_30s (30L * HZ) #define D_Tdelay_30s (30L * HZ)
#define D_Tdelay_1min (1 * 60 * HZ) #define D_Tdelay_1min (1 * 60 * HZ)
#define D_Tdelay_3min (3 * 60 * HZ)
#define D_Tdelay_10min (10 * 60 * HZ) #define D_Tdelay_10min (10 * 60 * HZ)
#define D_Tdelay_1h (60 * 60 * HZ) #define D_Tdelay_1h (60 * 60 * HZ)
#define D_Tdelay_1day (24 * 60 * 60 * HZ) #define D_Tdelay_1day (24 * 60 * 60 * HZ)
#define D_COUNT_JIFFIES(N) ((N - 1) / JIFFIES + 1)
#if (D_CPUfamily_32bits == D_CPUfamily_type) #if (D_CPUfamily_32bits == D_CPUfamily_type)

15
source/debug/debug_drv.c

@ -102,7 +102,7 @@ u8 L3_tpc_hex(void)
#else #else
u8 L3_tpc_hex(void) u8 L3_tpc_hex(void)
{ {
u8 filter = 0, slaveId = 0, cmd = 0; u8 filter = 0, slaveId = 0, cmd = 0;
filter = ts_Urec[D_UART1].sp[0]; filter = ts_Urec[D_UART1].sp[0];
slaveId = ts_Urec[D_UART1].sp[1]; slaveId = ts_Urec[D_UART1].sp[1];
cmd = ts_Urec[D_UART1].sp[2]; cmd = ts_Urec[D_UART1].sp[2];
@ -112,6 +112,7 @@ u8 L3_tpc_hex(void)
///AA 02 10 00 02 A3 B4 6C ///AA 02 10 00 02 A3 B4 6C
if(0xAA == filter) if(0xAA == filter)
{ {
pd485 = (TS_P_rs485 *)ts_Urecbuf.r1;
//L0_uartN_Arrayhex_withoutbuf(D_UART1,&ts_Urec[D_UART1].sp[0], ts_Urec[D_UART1].num); //L0_uartN_Arrayhex_withoutbuf(D_UART1,&ts_Urec[D_UART1].sp[0], ts_Urec[D_UART1].num);
if(0x02 == slaveId) if(0x02 == slaveId)
{ {
@ -119,6 +120,14 @@ u8 L3_tpc_hex(void)
return 1; return 1;
} }
} }
else if(0xA5 == filter)
{
if(0x5A == slaveId)
{
// if(ocr)
return 2;
}
}
// printfs("\r\n cmd error!!"); // printfs("\r\n cmd error!!");
return 0; return 0;
} }
@ -134,7 +143,7 @@ vtype L2_debug_ONcomand(void)
/// printf("\r\nw ts_Urec[D_UART1].max = %d num = %d",(int)ts_Urec[D_UART1].rmax,(int)ts_Urec[D_UART1].num); /// printf("\r\nw ts_Urec[D_UART1].max = %d num = %d",(int)ts_Urec[D_UART1].rmax,(int)ts_Urec[D_UART1].num);
// printf1("\r\ndebugok %2x",(int)ts_Urec[D_UART1].debugok); // printf1("\r\ndebugok %2x",(int)ts_Urec[D_UART1].debugok);
} }
if(1 == ts_Urec[D_UART1].ok) if(1 == ts_Urec[D_UART1].ok)
{ {
ts_Urec[D_UART1].ok = 0;////解析协议 ts_Urec[D_UART1].ok = 0;////解析协议
@ -142,7 +151,7 @@ vtype L2_debug_ONcomand(void)
//// printf1("\r\nD_UART1 ok %d ",(int) ts_Urec[D_UART1].num); //// printf1("\r\nD_UART1 ok %d ",(int) ts_Urec[D_UART1].num);
// D_LED1_REV(); // D_LED1_REV();
pd485 = (TS_P_rs485 *)ts_Urecbuf.r1;
/// L0_uartN_Arrayhex_withoutbuf(D_UART1,ts_Urecbuf.r1, ts_Urec[D_UART1].num); /// L0_uartN_Arrayhex_withoutbuf(D_UART1,ts_Urecbuf.r1, ts_Urec[D_UART1].num);
/// 串口1的协议分两类 1类是 Fx开头的针对外设x的标准debug协议;例如FD开头是系统debug Fc是iic调试设备 /// 串口1的协议分两类 1类是 Fx开头的针对外设x的标准debug协议;例如FD开头是系统debug Fc是iic调试设备

2
source/msp/uart/msp_uartN.c

@ -71,6 +71,8 @@ TS_send_buf_ ts_Usendbuf;
TS_rec_road_ ts_Urec[SERIAL_MAX_NUM]= {0}; TS_rec_road_ ts_Urec[SERIAL_MAX_NUM]= {0};
TS_rec_buf_ ts_Urecbuf; TS_rec_buf_ ts_Urecbuf;
code vU16 S_send_max[4]= code vU16 S_send_max[4]=
{ {
D_send1_max, D_send1_max,

Loading…
Cancel
Save