From fadf2a684268a36b7d3069f0e4e932147416c481 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期一, 21 四月 2025 18:23:57 +0800
Subject: [PATCH] 手环V1.16版本，修改gps闪灯状态e后为1时不用状态机控制，修改5s后关闭4g和gps逻辑，初步测试成功，但OTA中途会重连导致升级不了
---
keil/uwb_simple_example.uvoptx | 389 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 380 insertions(+), 9 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index 94ddf14..b979a4c 100644
--- a/keil/uwb_simple_example.uvoptx
+++ b/keil/uwb_simple_example.uvoptx
@@ -89,7 +89,7 @@
<sRfunc>1</sRfunc>
<sRbox>1</sRbox>
<tLdApp>1</tLdApp>
- <tGomain>1</tGomain>
+ <tGomain>0</tGomain>
<tRbreak>1</tRbreak>
<tRwatch>1</tRwatch>
<tRmem>1</tRmem>
@@ -113,14 +113,15 @@
<tDllPa></tDllPa>
<tDlgDll></tDlgDll>
<tDlgPa></tDlgPa>
- <tIfile></tIfile>
+ <tIfile>.\Loader.ini</tIfile>
<pMon>Segger\JL2CM3.dll</pMon>
</DebugOpt>
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name>
</Name> </SetRegEntry>
+ <Name>?姝�</Name>
+ </SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>JL2CM3</Key>
@@ -447,17 +448,387 @@
<Ww>
<count>59</count>
<WinNumber>1</WinNumber>
- <ItemText>g_com_map[28]</ItemText>
+ <ItemText>g_com_map[28],0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>60</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>acResponse</ItemText>
+ </Ww>
+ <Ww>
+ <count>61</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>u32ResponseLen</ItemText>
+ </Ww>
+ <Ww>
+ <count>62</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>_u8Data</ItemText>
+ </Ww>
+ <Ww>
+ <count>63</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>_u32Len</ItemText>
+ </Ww>
+ <Ww>
+ <count>64</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>_u32Len_temp,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>65</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>receive_id,0x10</ItemText>
+ </Ww>
+ <Ww>
+ <count>66</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>_u32Len_temp,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>67</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_wait_count,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>68</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_need_data_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>69</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_open_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>70</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>71</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>flag_secondtask</ItemText>
+ </Ww>
+ <Ww>
+ <count>72</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>time_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>73</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gga_num,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>74</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_wait_count2</ItemText>
+ </Ww>
+ <Ww>
+ <count>75</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>u32GGaLenth,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>76</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>userkey_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>77</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>m_EUART_DMA_RXBuf</ItemText>
+ </Ww>
+ <Ww>
+ <count>78</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_first_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>79</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map</ItemText>
+ </Ww>
+ <Ww>
+ <count>80</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_open_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>81</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_wait_count,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>82</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_first_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>83</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>84</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>power_low_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>85</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>apcSplitStr</ItemText>
+ </Ww>
+ <Ww>
+ <count>86</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>beepontime,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>87</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>beepontime</ItemText>
+ </Ww>
+ <Ww>
+ <count>88</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>userkey_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>89</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>flag_TCP_reconnectting</ItemText>
+ </Ww>
+ <Ww>
+ <count>90</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>link_error_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>91</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>GGA_Final_message</ItemText>
+ </Ww>
+ <Ww>
+ <count>92</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>active_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>93</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>key_click_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>94</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>keystarttime3,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>95</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>mUsart2ReceivePack</ItemText>
+ </Ww>
+ <Ww>
+ <count>96</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>beepontime</ItemText>
+ </Ww>
+ <Ww>
+ <count>97</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>beep_start_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>98</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>click_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>99</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>long_press_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>100</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>triple_click_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>101</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>single_click_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>102</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>btn_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>103</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>GPS_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>104</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_header</ItemText>
+ </Ww>
+ <Ww>
+ <count>105</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>sos_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>106</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>single_click_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>107</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>long_press_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>108</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>triple_click_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>109</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rising_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>110</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>falling_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>111</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>click_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>112</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>active_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>113</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>click_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>114</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>temp_rising_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>115</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>GPS_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>116</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>wltag_gps_timer</ItemText>
+ </Ww>
+ <Ww>
+ <count>117</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_success_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>118</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>air780_success_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>119</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>wltag_4g_timer</ItemText>
+ </Ww>
+ <Ww>
+ <count>120</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>air780_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>121</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>TCP_reconnect_timer,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>122</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>TCPfail_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>123</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>\\uwb_simple_example\include/src/gps.c\gps_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>124</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>falling_time</ItemText>
+ </Ww>
+ <Ww>
+ <count>125</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nomove_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>126</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>bat_percent,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>127</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>fVoltage_mv,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>128</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>userkey_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>129</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>power_low_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>130</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>GPS_state</ItemText>
</Ww>
</WatchWindow1>
+ <WatchWindow2>
+ <Ww>
+ <count>0</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>_u32DataLen,0x0A</ItemText>
+ </Ww>
+ </WatchWindow2>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>8</SubType>
- <ItemText>\\uwb_simple_example\include/drivers/serial_at_cmd_app.c\mUsart2ReceivePack</ItemText>
+ <ItemText>mUsart2ReceivePack</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
+ <MemoryWindow2>
+ <Mm>
+ <WinNumber>2</WinNumber>
+ <SubType>8</SubType>
+ <ItemText>_u8Data_real</ItemText>
+ <AccSizeX>0</AccSizeX>
+ </Mm>
+ </MemoryWindow2>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
@@ -581,7 +952,7 @@
<Group>
<GroupName>Driver</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -945,7 +1316,7 @@
<GroupNumber>4</GroupNumber>
<FileNumber>35</FileNumber>
<FileType>1</FileType>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\include\drivers\global_param.c</PathWithFileName>
@@ -1053,7 +1424,7 @@
<Group>
<GroupName>OS</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -1265,7 +1636,7 @@
<Group>
<GroupName>HidoLib</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
--
Gitblit v1.9.3