yuliang
/
CablePositioningV1.0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX | 自测问题修改

Browse Source
master
yuliang 4 weeks ago
parent a088b88a30
commit 05cee4910b
6 changed files with 425 additions and 431 deletions
Show Stats Download Patch File Download Diff File

826
CablePositioning_IAP_V1.0/EWARM/CableMonitor_V3.2.dep
View File

File diff suppressed because it is too large Load Diff

8
CablePositioning_IAP_V1.0/EWARM/settings/CableMonitor_V3.2.dbgdt
Unescape Escape View File

@ -149,7 +149,7 @@
</IarPane-34066> </IarPane-34066>
<ControlBarVersion> <ControlBarVersion>
<Major>14</Major> <Major>14</Major>
<Minor>38</Minor> <Minor>42</Minor>
</ControlBarVersion> </ControlBarVersion>
<MFCToolBarParameters> <MFCToolBarParameters>
<Tooltips>1</Tooltips> <Tooltips>1</Tooltips>
@ -159,11 +159,11 @@
<RecentlyUsedMenus>1</RecentlyUsedMenus> <RecentlyUsedMenus>1</RecentlyUsedMenus>
<MenuShadows>1</MenuShadows> <MenuShadows>1</MenuShadows>
<ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay> <ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
<CommandsUsage>69000000130059840000010000004881000002000000568400000100000010860000260000000F8100000100000020810000070000000C8100000C00000026DE00000100000055840000030000000E840000060000001F810000030000000E8100000D00000028DE0000020000000B810000010000000584000001000000D184000002000000118600000400000010840000020000004681000010000000</CommandsUsage> <CommandsUsage>6A000000130059840000010000004881000002000000568400000100000010860000260000000F8100000100000020810000070000000C8100000C00000026DE00000100000055840000030000000E840000060000001F810000030000000E8100000D00000028DE0000020000000B810000010000000584000001000000D184000002000000118600000400000010840000020000004681000011000000</CommandsUsage>
</MFCToolBarParameters> </MFCToolBarParameters>
<CommandManager> <CommandManager>
<CommandsWithoutImages>0F007784000007840000FFFFFFFF808C000044D500005584000056840000598400000D8400000F8400000884000054840000328100001C81000009840000</CommandsWithoutImages> <CommandsWithoutImages>0F007784000007840000FFFFFFFF808C000044D500005584000056840000598400000D8400000F8400000884000054840000328100001C81000009840000</CommandsWithoutImages>
<MenuUserImages>1300048400007E00000031840000850000000F81000055000000208100005D0000000C810000520000000684000080000000038400007D00000030840000830000000E840000810000000E810000540000001F8100005C0000000B81000050000000058400007F000000D18400001F000000028400007C000000328400008600000010840000830000000D810000520000000A84000081000000</MenuUserImages> <MenuUserImages>1300048400007E0000003184000085000000208100005D0000000F810000550000000C810000520000000684000080000000038400007D0000000E8400008100000030840000830000001F8100005C0000000E810000540000000B81000050000000D18400001F000000058400007F000000028400007C000000108400008300000032840000860000000A840000810000000D81000052000000</MenuUserImages>
</CommandManager> </CommandManager>
<Pane-59393> <Pane-59393>
<ID>0</ID> <ID>0</ID>
@ -1059,7 +1059,7 @@
</BasePane-34050> </BasePane-34050>
<MFCToolBar-34051> <MFCToolBar-34051>
<Name>Main</Name> <Name>Main</Name>
<Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000066000000FFFEFF000000000000000000000000000100000001000000018001E100000000000067000000FFFEFF000000000000000000000000000100000001000000018003E100000000000069000000FFFEFF000000000000000000000000000100000001000000018000810000000000004A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006C000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006D000000FFFEFF000000000000000000000000000100000001000000018025E100000000000070000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040073000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040074000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005D000000FFFEFF000000000000000000000000000100000001000000018024E10000000000006F000000FFFEFF000000000000000000000000000100000001000000018028E100000000040071000000FFFEFF000000000000000000000000000100000001000000018029E100000000000072000000FFFEFF000000000000000000000000000100000001000000018002810000000000004C000000FFFEFF0000000000000000000000000001000000010000000180298100000000000061000000FFFEFF000000000000000000000000000100000001000000018027810000000000005F000000FFFEFF0000000000000000000000000001000000010000000180288100000000000060000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040059000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000000050000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000051000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000065000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005B000000FFFEFF000000000000000000000000000100000001000000018020810000000000005C000000FFFEFF0000000000000000000000000001000000010000000180468100000000020063000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000</Buttons> <Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000066000000FFFEFF000000000000000000000000000100000001000000018001E100000000000067000000FFFEFF000000000000000000000000000100000001000000018003E100000000000069000000FFFEFF000000000000000000000000000100000001000000018000810000000000004A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006C000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006D000000FFFEFF000000000000000000000000000100000001000000018025E100000000000070000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040073000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040074000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005D000000FFFEFF000000000000000000000000000100000001000000018024E10000000000006F000000FFFEFF000000000000000000000000000100000001000000018028E100000000040071000000FFFEFF000000000000000000000000000100000001000000018029E100000000000072000000FFFEFF000000000000000000000000000100000001000000018002810000000000004C000000FFFEFF0000000000000000000000000001000000010000000180298100000000000061000000FFFEFF000000000000000000000000000100000001000000018027810000000000005F000000FFFEFF0000000000000000000000000001000000010000000180288100000000000060000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040059000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000040050000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000051000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000065000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005B000000FFFEFF000000000000000000000000000100000001000000018020810000000000005C000000FFFEFF0000000000000000000000000001000000010000000180468100000000020063000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000</Buttons>
</MFCToolBar-34051> </MFCToolBar-34051>
<Pane-34051> <Pane-34051>
<ID>34051</ID> <ID>34051</ID>

2
CablePositioning_IAP_V1.0/EWARM/settings/CableMonitor_V3.2.dnx
Unescape Escape View File

@ -24,7 +24,7 @@
<LeaveTargetRunning>_ 0</LeaveTargetRunning> <LeaveTargetRunning>_ 0</LeaveTargetRunning>
</JLinkDriver> </JLinkDriver>
<DebugChecksum> <DebugChecksum>
<Checksum>3054662682</Checksum> <Checksum>3917700858</Checksum>
</DebugChecksum> </DebugChecksum>
<RecentFlashDownload> <RecentFlashDownload>
<Path>D:\Work\CablePositioning\reless\V1.4\FP_IAP_V1.4.out</Path> <Path>D:\Work\CablePositioning\reless\V1.4\FP_IAP_V1.4.out</Path>

12
CablePositioning_IAP_V1.0/EWARM/settings/Project.wsdt
View File

File diff suppressed because one or more lines are too long

5
CablePositioning_IAP_V1.0/Inc/common.h
Unescape Escape View File

@ -42,7 +42,7 @@
/* Define --------------------------------------------------------------------*/ /* Define --------------------------------------------------------------------*/
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 4 #define VERSION_MINOR 5
#define COMPILE_TIME (__DATE__" "__TIME__) #define COMPILE_TIME (__DATE__" "__TIME__)
#define NAME_LEN 32 #define NAME_LEN 32
@ -182,7 +182,8 @@ typedef struct
uint8_t ip_mask[4]; uint8_t ip_mask[4];
uint8_t ip_gw[4]; uint8_t ip_gw[4];
uint8_t server_ip[4]; uint8_t server_ip[4];
uint8_t wireless_server_ip[4]; uint8_t power_type;
uint8_t wireless_server_ip[3];
uint16_t server_port; uint16_t server_port;
uint16_t wireless_server_port; uint16_t wireless_server_port;
/* 版本信息. 224byte */ /* 版本信息. 224byte */

3
CablePositioning_IAP_V1.0/Src/common.c
Unescape Escape View File

@ -398,9 +398,6 @@ static HAL_StatusTypeDef _dev_info_default_set(void)
memcpy(&dev_info.ip[1], &dev_info.mac[3], 3); memcpy(&dev_info.ip[1], &dev_info.mac[3], 3);
dev_info.ip_mask[0] = 255; dev_info.ip_mask[0] = 255;
dev_info.ip_gw[0] = 10; dev_info.ip_gw[3] = 1; dev_info.ip_gw[0] = 10; dev_info.ip_gw[3] = 1;
dev_info.wireless_server_ip[0] = 111;dev_info.wireless_server_ip[1] = 47;
dev_info.wireless_server_ip[2] = 21;dev_info.wireless_server_ip[3] = 141;
dev_info.wireless_server_port = 8809;
dev_info.server_ip[0] = 111;dev_info.server_ip[1] = 47; dev_info.server_ip[0] = 111;dev_info.server_ip[1] = 47;
dev_info.server_ip[2] = 21;dev_info.server_ip[3] = 141; dev_info.server_ip[2] = 21;dev_info.server_ip[3] = 141;
dev_info.server_port = 8809; dev_info.server_port = 8809;

Write Preview
Loading…
Cancel
Save