From 6e3f1f560d618b37ee1a47fa2b0f682b70c3ef1c Mon Sep 17 00:00:00 2001
From: jinlicong <493886250@qq.com>
Date: Wed, 19 Jun 2024 17:25:45 +0800
Subject: [PATCH] 增加OTA协议
---
KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx | 191 +++++++++++++++++++++--------------------------
1 files changed, 84 insertions(+), 107 deletions(-)
diff --git a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx
index f4d9ea2..799b068 100644
--- a/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx
+++ b/KEIL_MDKARM/SZV103_FM33A0_MainSystem.uvoptx
@@ -163,112 +163,77 @@
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>save_realtime_data_g.record_time_BCD</ItemText>
+ <ItemText>sys_clockBCD_g</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>pList_head</ItemText>
+ <ItemText>system_status_word_g.status_word</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>* pList_head</ItemText>
+ <ItemText>wrc_ctrl_para_g</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>count_i</ItemText>
+ <ItemText>sys_delay_sec_para_g,0x0A</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>pwr_vol_g</ItemText>
+ <ItemText>save_valve_para_g</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>ALARM_ID_ALKA_BAT_DOWN</ItemText>
+ <ItemText>valve_ctrl_para_g</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>system_status_word_g.status_word</ItemText>
+ <ItemText>log_sizhu_history_ctrl_g</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>sys_clockBCD_g</ItemText>
+ <ItemText>sizhu_history_interval_l</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>data_ins</ItemText>
+ <ItemText>test_start_flag</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>rtc_reg</ItemText>
+ <ItemText>history_interval_l</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>sys_run_period</ItemText>
+ <ItemText>buf_test</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>lcd_wake_up_flag_g</ItemText>
+ <ItemText>uc_recv_para_g</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
- <ItemText>P_Key1Cnt</ItemText>
+ <ItemText>local_random_code_g</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
- <ItemText>R_Key2Cnt</ItemText>
+ <ItemText>wrc_data_num_ctrl_para_sizhu_g</ItemText>
</Ww>
<Ww>
<count>16</count>
<WinNumber>1</WinNumber>
- <ItemText>L_Key3Cnt</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>1</WinNumber>
- <ItemText>sys_delay_sec_para_g,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>1</WinNumber>
- <ItemText>uc_recv_para_g</ItemText>
- </Ww>
- <Ww>
- <count>19</count>
- <WinNumber>1</WinNumber>
- <ItemText>uc_recv_para_g.uc_protocol_head_s.random_number</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>1</WinNumber>
- <ItemText>system_status_word_g.status_word</ItemText>
- </Ww>
- <Ww>
- <count>21</count>
- <WinNumber>1</WinNumber>
- <ItemText>pwr_vol_g</ItemText>
- </Ww>
- <Ww>
- <count>22</count>
- <WinNumber>1</WinNumber>
- <ItemText>valve_ctrl_para_g</ItemText>
- </Ww>
- <Ww>
- <count>23</count>
- <WinNumber>1</WinNumber>
- <ItemText>sys_fun_run_ctrl_g</ItemText>
+ <ItemText>report_ctrl_para_g</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
@@ -286,9 +251,9 @@
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
- <SubType>1</SubType>
- <ItemText>uc_recv_para_g.uc_protocol_head_s.random_number</ItemText>
- <AccSizeX>0</AccSizeX>
+ <SubType>0</SubType>
+ <ItemText>wrc_uart_para_g.recv_buf</ItemText>
+ <AccSizeX>1</AccSizeX>
</Mm>
</MemoryWindow1>
<Tracepoint>
@@ -861,6 +826,18 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>5</GroupNumber>
+ <FileNumber>41</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Function\UPPER_COMPUTER\upper_com_iap_pro.c</PathWithFileName>
+ <FilenameWithoutPath>upper_com_iap_pro.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
</Group>
<Group>
@@ -871,7 +848,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -883,7 +860,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -903,7 +880,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>43</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -915,7 +892,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>44</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -927,7 +904,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>45</FileNumber>
+ <FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -955,7 +932,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>46</FileNumber>
+ <FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -967,7 +944,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>47</FileNumber>
+ <FileNumber>48</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -979,7 +956,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>48</FileNumber>
+ <FileNumber>49</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -991,7 +968,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>49</FileNumber>
+ <FileNumber>50</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1003,7 +980,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>50</FileNumber>
+ <FileNumber>51</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1015,7 +992,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>51</FileNumber>
+ <FileNumber>52</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1027,7 +1004,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>52</FileNumber>
+ <FileNumber>53</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1039,7 +1016,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>53</FileNumber>
+ <FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1051,7 +1028,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1063,7 +1040,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>55</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1075,7 +1052,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>56</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1087,7 +1064,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>57</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1099,7 +1076,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>58</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1111,7 +1088,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>59</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1123,7 +1100,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1135,7 +1112,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1147,7 +1124,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1159,7 +1136,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>63</FileNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1171,7 +1148,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1183,7 +1160,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>65</FileNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1195,7 +1172,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>66</FileNumber>
+ <FileNumber>67</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1207,7 +1184,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>67</FileNumber>
+ <FileNumber>68</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1219,7 +1196,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>68</FileNumber>
+ <FileNumber>69</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1231,7 +1208,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>69</FileNumber>
+ <FileNumber>70</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1243,7 +1220,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>70</FileNumber>
+ <FileNumber>71</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1255,7 +1232,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>71</FileNumber>
+ <FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1267,7 +1244,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>72</FileNumber>
+ <FileNumber>73</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1279,7 +1256,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>73</FileNumber>
+ <FileNumber>74</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1291,7 +1268,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>74</FileNumber>
+ <FileNumber>75</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1303,7 +1280,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>75</FileNumber>
+ <FileNumber>76</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1315,7 +1292,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>76</FileNumber>
+ <FileNumber>77</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1335,7 +1312,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>77</FileNumber>
+ <FileNumber>78</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1347,7 +1324,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>78</FileNumber>
+ <FileNumber>79</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1359,7 +1336,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>79</FileNumber>
+ <FileNumber>80</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1379,7 +1356,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>80</FileNumber>
+ <FileNumber>81</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1391,7 +1368,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>81</FileNumber>
+ <FileNumber>82</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1403,7 +1380,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>82</FileNumber>
+ <FileNumber>83</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1415,7 +1392,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>83</FileNumber>
+ <FileNumber>84</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1427,7 +1404,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>84</FileNumber>
+ <FileNumber>85</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1439,7 +1416,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>85</FileNumber>
+ <FileNumber>86</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1451,7 +1428,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>86</FileNumber>
+ <FileNumber>87</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1463,7 +1440,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>87</FileNumber>
+ <FileNumber>88</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1475,7 +1452,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>88</FileNumber>
+ <FileNumber>89</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1487,7 +1464,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>89</FileNumber>
+ <FileNumber>90</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1499,7 +1476,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>90</FileNumber>
+ <FileNumber>91</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1511,7 +1488,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>91</FileNumber>
+ <FileNumber>92</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1523,7 +1500,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>92</FileNumber>
+ <FileNumber>93</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1535,7 +1512,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>93</FileNumber>
+ <FileNumber>94</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1547,7 +1524,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>94</FileNumber>
+ <FileNumber>95</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3