kkkjtr
/
bleSDK_expansion_board
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加游客模式手动关闭功能 zsxfly20240825

This commit is contained in:
zsx 2024-08-25 16:39:07 +08:00
parent 4e16916b1b
commit 572d57647d
6 changed files with 5249 additions and 5079 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10264
projects/blezongkong/mdk/JLinkLog.txt
View File

File diff suppressed because it is too large Load Diff

18
projects/blezongkong/mdk/zhongkong.uvguix.zsx
View File

@ -101,17 +101,17 @@
<yPos>-1</yPos>
</MaxPosition>
<NormalPosition>
<Top>51</Top>
<Left>-5</Left>
<Right>1180</Right>
<Bottom>997</Bottom>
<Top>100</Top>
<Left>370</Left>
<Right>1555</Right>
<Bottom>1046</Bottom>
</NormalPosition>
</WindowPosition>
<MDIClientArea>
<RegID>0</RegID>
<MDITabState>
<Len>424</Len>
<Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000002000000010000000100000060443A5C686F6D655C4465736B746F705C6974656D735CD3B2BCFED0A1CFEEC4BF5CD6D0BFD8B0E55CC8EDBCFE5C626C6553444B365F76312E342E315C70726F6A656374735C626C657A6F6E676B6F6E675C7372635C6170705F72616461722E63000000000B6170705F72616461722E6300000000C5D4F200FFFFFFFF61443A5C686F6D655C4465736B746F705C6974656D735CD3B2BCFED0A1CFEEC4BF5CD6D0BFD8B0E55CC8EDBCFE5C626C6553444B365F76312E342E315C70726F6A656374735C626C657A6F6E676B6F6E675C7372635C6170705F7773323831322E63000000000C6170705F7773323831322E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000EE000000A100000094040000B4020000</Data>
<Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000002000000010000000100000060443A5C686F6D655C4465736B746F705C6974656D735CD3B2BCFED0A1CFEEC4BF5CD6D0BFD8B0E55CC8EDBCFE5C626C6553444B365F76312E342E315C70726F6A656374735C626C657A6F6E676B6F6E675C7372635C6170705F72616461722E63000000000B6170705F72616461722E6300000000C5D4F200FFFFFFFF61443A5C686F6D655C4465736B746F705C6974656D735CD3B2BCFED0A1CFEEC4BF5CD6D0BFD8B0E55CC8EDBCFE5C626C6553444B365F76312E342E315C70726F6A656374735C626C657A6F6E676B6F6E675C7372635C6170705F7773323831322E63000000000C6170705F7773323831322E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000065020000D20000000B060000E5020000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
@ -1838,7 +1838,7 @@
<Name>Debug</Name>
<Buttons>
<Len>2373</Len>
<Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
<Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
</Buttons>
<OriginalItems>
<Len>898</Len>
@ -3615,9 +3615,9 @@
</Doc>
<Doc>
<Name>..\src\app_ws2812.c</Name>
<ColumnNumber>13</ColumnNumber>
<TopLine>16</TopLine>
<CurrentLine>38</CurrentLine>
<ColumnNumber>20</ColumnNumber>
<TopLine>17</TopLine>
<CurrentLine>43</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>

3
projects/blezongkong/src/app_control_out.c
View File

@ -26,7 +26,7 @@ bool app_control_en[PA_MAX]={
[OUT_12V_Control] =OE_HIGH, // 12V电源控制输出 /H:12V输出
[OUT_Door_lock] =OE_HIGH, // 开锁 /H:开锁(同)
[IN_01] =OE_LOW, // 自定义输入
[IN_GPS] =OE_LOW, // GPS输入0 /L:低使能/边沿触发
[IN_GPS] =OE_HIGH, // GPS输入0 /H:低使能/边沿触发
[IO_MANAGER_MODE] =OE_LOW, // 管理员模式 /边沿触发
[IO_BACK] =OE_LOW, // 倒车 /H:前进/L:后退
[IO_BRAKE] =OE_LOW, // 制动 /L:低使能
@ -201,6 +201,7 @@ void app_control_init(void){
sys_sta.A_brake = 0;
sys_sta.A_Speed_Cut = 0;
sys_sta.O_lock = 0;
sys_sta.P_Radar_EN =1;
sys_sta.Reserve0 = 0;
sys_sta.IO_TX = Get_Status(IO_TTL_TX);

7
projects/blezongkong/src/app_control_out.h
View File

@ -30,8 +30,8 @@ enum app_adc_dac_chx{
enum app_control{
OUT_12V_Control =PA17, // 12V电源控制输出 /H:12V输出
OUT_Door_lock =PA18, // 电门锁 /H:开锁
IN_01 =PA03, // 自定义输入
IN_GPS =PA19, // GPS输入0 /边沿触发
IN_01 =PA19, // 自定义输入
IN_GPS =PA03, // GPS输入0 /边沿触发
IO_MANAGER_MODE =PA13, // 管理员模式 /边沿触发
IO_BACK =PA14, // 倒车 /H:前进/L:后退
IO_BRAKE =PA15, // 制动 /L:低使能
@ -80,7 +80,8 @@ typedef struct sys_sta{
uint8_t A_brake :1; // 自动刹车状态
uint8_t A_Speed_Cut :1; // 自动减速状态
uint8_t O_lock :1; // 电门锁输出状态
uint8_t Reserve0:2;
uint8_t P_Radar_EN :1; // PAD雷达输出使能状态
uint8_t Reserve0:1;
};
};
union{// 输入输出状态

34
projects/blezongkong/src/app_modbus.c
View File

@ -8,7 +8,7 @@
#include "app_ota.h"
#include "sys_config.h"
#define ModbusCRC16_EN 0
#define ModbusCRC16_EN 1
#define DEBUG_MODBUS 1
@ -131,7 +131,7 @@ void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_
break;
}
}else if(CMDCode == 0x06){
sys_conf.Manager_sLim =reg_val_num & 0xff;
sys_conf.Manager_sLim =reg_val_num > 100 ? 100 : reg_val_num;
MODBUS_Sent_BUF[len_count++] =sys_conf.Manager_sLim >> 8;
MODBUS_Sent_BUF[len_count++] =sys_conf.Manager_sLim & 0xff;
break;
@ -145,7 +145,7 @@ void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_
break;
}
}else if(CMDCode == 0x06){
sys_conf.Tourist_sLim =reg_val_num & 0xff;
sys_conf.Tourist_sLim =reg_val_num > 100 ? 100 : reg_val_num;
MODBUS_Sent_BUF[len_count++] =sys_conf.Tourist_sLim >> 8;
MODBUS_Sent_BUF[len_count++] =sys_conf.Tourist_sLim & 0xff;
break;
@ -159,7 +159,7 @@ void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_
break;
}
}else if(CMDCode == 0x06){
sys_conf.Speed_Cut_sLim =reg_val_num & 0xff;
sys_conf.Speed_Cut_sLim =reg_val_num > 100 ? 100 : reg_val_num;
MODBUS_Sent_BUF[len_count++] =sys_conf.Speed_Cut_sLim >> 8;
MODBUS_Sent_BUF[len_count++] =sys_conf.Speed_Cut_sLim & 0xff;
break;
@ -173,7 +173,7 @@ void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_
break;
}
}else if(CMDCode == 0x06){
sys_conf.Brake_DLimit =reg_val_num;
sys_conf.Brake_DLimit =reg_val_num>4500 ? 4500 : reg_val_num;
MODBUS_Sent_BUF[len_count++] =sys_conf.Brake_DLimit >> 8;
MODBUS_Sent_BUF[len_count++] =sys_conf.Brake_DLimit & 0xff;
break;
@ -187,7 +187,7 @@ void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_
break;
}
}else if(CMDCode == 0x06){
sys_conf.Speed_Cut_DLimit =reg_val_num;
sys_conf.Speed_Cut_DLimit =reg_val_num>4500 ? 4500 : reg_val_num;
MODBUS_Sent_BUF[len_count++] =sys_conf.Speed_Cut_DLimit >> 8;
MODBUS_Sent_BUF[len_count++] =sys_conf.Speed_Cut_DLimit & 0xff;
break;
@ -201,7 +201,7 @@ void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_
break;
}
}else if(CMDCode == 0x06){
sys_conf.Brake_DLimit_B =reg_val_num;
sys_conf.Brake_DLimit_B =reg_val_num>4500 ? 4500 : reg_val_num;
MODBUS_Sent_BUF[len_count++] =sys_conf.Brake_DLimit_B >> 8;
MODBUS_Sent_BUF[len_count++] =sys_conf.Brake_DLimit_B & 0xff;
break;
@ -215,7 +215,7 @@ void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_
break;
}
}else if(CMDCode == 0x06){
sys_conf.Speed_Cut_DLimit_B =reg_val_num;
sys_conf.Speed_Cut_DLimit_B =reg_val_num>4500 ? 4500 : reg_val_num;
MODBUS_Sent_BUF[len_count++] =sys_conf.Speed_Cut_DLimit_B >> 8;
MODBUS_Sent_BUF[len_count++] =sys_conf.Speed_Cut_DLimit_B & 0xff;
break;
@ -231,7 +231,7 @@ void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_
break;
}
}else if(CMDCode == 0x06){
sys_sta.Pmode =reg_val_num & 0xff;
sys_sta.Pmode =reg_val_num & 0x03;
MODBUS_Sent_BUF[len_count++] =sys_sta.Pmode >> 8;
MODBUS_Sent_BUF[len_count++] =sys_sta.Pmode & 0xff;
break;
@ -288,11 +288,25 @@ void FunctionalCode_03_06(uint8_t CMDCode, uint16_t reg_addr , uint16_t reg_val_
break;
}
}else if(CMDCode == 0x06){
sys_sta.O_12V =reg_val_num & 0xff;
sys_sta.O_12V =reg_val_num ? 1 : 0;
MODBUS_Sent_BUF[len_count++] =sys_sta.O_12V >> 8;
MODBUS_Sent_BUF[len_count++] =sys_sta.O_12V & 0xff;
break;
}
case 0x0206: //0 关闭游客雷达//1 开启游客雷达
if(CMDCode == 0x03){
MODBUS_Sent_BUF[len_count++] =sys_sta.P_Radar_EN >> 8;
MODBUS_Sent_BUF[len_count++] =sys_sta.P_Radar_EN & 0xff;
MODBUS_Sent_BUF[2] +=2;
if(0 == --reg_val_num){
break;
}
}else if(CMDCode == 0x06){
sys_sta.P_Radar_EN =reg_val_num ? 1 : 0;
MODBUS_Sent_BUF[len_count++] =sys_sta.P_Radar_EN >> 8;
MODBUS_Sent_BUF[len_count++] =sys_sta.P_Radar_EN & 0xff;
break;
}
}
{ // 0x0201-0x0203
case 0x0301: // 电池状态

2
projects/blezongkong/src/app_radar.c
View File

@ -67,7 +67,7 @@ static tmr_tk_t radar_timer_handler(tmr_id_t id){
}
// 进入游客模式开启雷达 //管理员模式优先于游客模式
if((1 == (sys_sta.Pmode | sys_sta.Smode))){
if((0x01 == (sys_sta.Pmode | sys_sta.Smode)) && sys_sta.P_Radar_EN){
// 根据倒车状态确定雷达ID
DEBUG("SendCMD:ID=%#02x", SYS_Back_STA ? RADAR_ID_Back : RADAR_ID_Front);
app_radar_Sendcmd(SYS_Back_STA ? RADAR_ID_Back : RADAR_ID_Front,RADAR_MODE_Real);