Skip to content

J
jiancetai
Commit 2529dcbd authored by 何锐's avatar 何锐
Browse files
Options

Merge branch '2kga_ev2_jiancetai' of... 

Merge branch '2kga_ev2_jiancetai' of http://tyw-server.synology.me:12345/chenjiale/jiancetai into 2kga_ev2_jiancetai
parents 633d1def 9271d298
Show whitespace changes
Inline Side-by-side
Showing with 195 additions and 4 deletions
.vscode/settings.json
View file @ 2529dcbd
...@@ -79,6 +79,8 @@ ...@@ -79,6 +79,8 @@
"rte_gpio.h": "c", "rte_gpio.h": "c",
"task_scheduler.h": "c", "task_scheduler.h": "c",
"gpio.h": "c", "gpio.h": "c",
"string.h": "c" "string.h": "c",
"mwwmhcomm.h": "c",
"wmhcommdata.h": "c"
} }
} }
\ No newline at end of file
YueJin_test_bench/source/Appliciation/WMHCommData.h
View file @ 2529dcbd
...@@ -73,6 +73,106 @@ typedef union { ...@@ -73,6 +73,106 @@ typedef union {
uint8_t Data90_Byte16 :8; uint8_t Data90_Byte16 :8;
} bits; } bits;
uint8_t Bytes[COMM_DATA_UNION_WI_BOX_LENGTH_0X90]; uint8_t Bytes[COMM_DATA_UNION_WI_BOX_LENGTH_0X90];
struct
{
// // ===================== Byte0 =====================
// uint8_t ProductModel :6; // 产品型号
// uint8_t ManufacturerCodingRules :2; // 厂家编码规则
// // ===================== Byte1 =====================
// uint8_t DeviceEncoding :8; // 设备编码
// // ===================== Byte2 =====================
// uint8_t SerialNumberL :8; // 流水号
// // ===================== Byte3 =====================
// uint8_t FaultStatus :1; // 故障状态
// uint8_t ConstantSpeedStatus :1; // 定速巡航状态
// uint8_t GearPStatus :1; // P档状态
// uint8_t ReadyStatus :1; // READY状态
// uint8_t SerialNumberH :4; // 流水号高字节4位
// // ===================== Byte4 =====================
// uint8_t EstimateMileage_H :8; // 预估里程高字节
// // ===================== Byte5 =====================
// uint8_t EstimateMileage_L :8; // 预估里程低字节
// // ===================== Byte6 =====================
// uint8_t EnergyConsumption :8; // 能耗系数
// // ===================== Byte7 =====================
// uint8_t Fault8 :1; // 电机缺相故障
// uint8_t Fault7 :1; // 堵转保护故障
// uint8_t Fault6 :1; // 欠压保护故障
// uint8_t Fault5 :1; // 转把故障
// uint8_t Fault4 :1; // 控制器MOS管故障
// uint8_t Fault3 :1; // 刹车故障
// uint8_t Fault2 :1; // 电机霍尔故障
// uint8_t Fault1 :1; // 过压保护故障
// // ===================== Byte8 =====================
// uint8_t Fault16 :1; // 电池充电过流保护故障
// uint8_t Fault15 :1; // 电池SOC过低故障
// uint8_t Fault14 :1; // 电池总压欠压保护故障
// uint8_t Fault13 :1; // 电池总压过压保护故障
// uint8_t Fault12 :1; // 电池放电MOS故障
// uint8_t Fault11 :1; // 电池充电MOS故障
// uint8_t Fault10 :1; // 控制器过热故障
// uint8_t Fault9 :1; // 电机过热故障
// // ===================== Byte9 =====================
// uint8_t Reserved3 :2; // 预留位3
// uint8_t Fault22 :1; // 电池放电握手失败故障
// uint8_t Fault21 :1; // 电池充电过温保护故障
// uint8_t Fault20 :1; // 电池充电低温保护故障
// uint8_t Fault19 :1; // 电池放电过温保护故障
// uint8_t Fault18 :1; // 电池放电低温保护故障
// uint8_t Fault17 :1; // 电池放电过流保护故障
// // ===================== Byte10 =====================
// uint8_t Espeed_H :8; // 电机脉冲数高字节
// // ===================== Byte11 =====================
// uint8_t Espeed_L :8; // 电机脉冲数低字节
// // ===================== Byte12 =====================
// uint8_t Electricity :8; // 电量
// // ===================== Byte13 =====================
// uint8_t Reserved5 :3; // 预留位5
// uint8_t TCSopen :1; // TCS功能开启
// uint8_t TCSa :1; // TCS动作中
// uint8_t Fault23 :1; // 控制器过流故障
// uint8_t GEAR :1; // 1:S档 0:D档
// uint8_t FaultLED :1; // 故障指示灯
// // ===================== Byte14 =====================
// uint8_t BurglarStatus :1; // 防盗状态
// uint8_t Reserved4 :4; // 预留位4
// uint8_t CartStatus :1; // 推车状态
// uint8_t SideBraceStatus :1; // 边撑状态
// uint8_t EBSStatus :1; // EBS状态
// // ===================== Byte15 =====================
// uint8_t VSpeed :8; // 车速
uint8_t Data90_Byte1 :8;
uint8_t Data90_Byte2 :8;
uint8_t Data90_Byte3 :8;
uint8_t Data90_Byte4 :8;
uint8_t Data90_Byte5 :8;
uint8_t Data90_Byte6 :8;
uint8_t Data90_Byte7 :8;
uint8_t Data90_Byte8 :8;
uint8_t Data90_Byte9 :8;
uint8_t Data90_Byte10 :8;
uint8_t Data90_Byte11 :8;
uint8_t Data90_Byte12 :8;
uint8_t Data90_Byte13 :8;
uint8_t Data90_Byte14 :8;
uint8_t Data90_Byte15 :8;
uint8_t Data90_Byte16 :8;
} bits;
} COMM_DATA_UNION_WI_BOX_0x90; } COMM_DATA_UNION_WI_BOX_0x90;
extern COMM_DATA_UNION_WI_BOX_0x90 WMHCommDataWiBox_0x90; extern COMM_DATA_UNION_WI_BOX_0x90 WMHCommDataWiBox_0x90;
...@@ -93,9 +193,74 @@ typedef union { ...@@ -93,9 +193,74 @@ typedef union {
uint8_t Data91_Byte12 :8; // 预估里程低字节 uint8_t Data91_Byte12 :8; // 预估里程低字节
} bits; } bits;
uint8_t Bytes[COMM_DATA_UNION_WI_BOX_LENGTH_0X91]; uint8_t Bytes[COMM_DATA_UNION_WI_BOX_LENGTH_0X91];
struct
{
// // ===================== Byte0 =====================
// uint8_t Year :8; // 年
// // ===================== Byte1 =====================
// uint8_t Month :8; // 月
// // ===================== Byte2 =====================
// uint8_t Day :8; // 日
// // ===================== Byte3 =====================
// uint8_t Hour :8; // 小时
// // ===================== Byte4 =====================
// uint8_t Minute :8; // 分钟
// // ===================== Byte5 =====================
// uint8_t Second :8; // 秒
// // ===================== Byte6 =====================
// uint8_t BtDistanceSt :1; // 蓝牙感应距离状态
// uint8_t BtConnection :1; // 蓝牙连接状态
// uint8_t SignalStrengthOf4G :3; // LTE网络信号强度格数（CSQ=0或99→0格，CSQ=1-5→1格，CSQ=6-10→2格，CSQ=11-15→3格，CSQ=16-20→4格，CSQ≥21→5格）
// uint8_t SignalStrengthOfGps :3; // GPS信号连接格数（3颗→0格，4颗→1格，5颗→2格，6颗→3格，≥7颗→4格）
// // ===================== Byte7 =====================
// uint8_t Reserved1 :6; // 预留位1
// uint8_t MessageWaittingToAnswer :1; // 信息待回复
// uint8_t PhoneWaittingToAnswer :1; // 电话待接听
// // ===================== Byte8 =====================
// uint8_t PositFault :1; // 定位故障
// uint8_t MasterControlFault :1; // 主控故障
// uint8_t BtFault :1; // 蓝牙故障
// uint8_t PowerFault :1; // 电源故障
// uint8_t ThreeAxisSensorFault :1; // 三轴传感器故障
// uint8_t OneServiceFault :1; // 一线通故障
// uint8_t NetWorkFault :1; // 网络故障
// uint8_t ACCFault :1; // ACC故障
// // ===================== Byte9 =====================
// uint8_t Reserved2 :6; // 预留位2
// uint8_t AntennaFault :1; // 天线故障
// uint8_t RfFault :1; // 射频故障
// // ===================== Byte10 =====================
// uint8_t EstimateMileage_H :8; // 预估里程高字节
// // ===================== Byte11 =====================
// uint8_t EstimateMileage_L :8; // 预估里程低字节
uint8_t Data91_Byte1 :8; // 预估里程低字节
uint8_t Data91_Byte2 :8; // 预估里程低字节
uint8_t Data91_Byte3 :8; // 预估里程低字节
uint8_t Data91_Byte4 :8; // 预估里程低字节
uint8_t Data91_Byte5 :8; // 预估里程低字节
uint8_t Data91_Byte6 :8; // 预估里程低字节
uint8_t Data91_Byte7 :8; // 预估里程低字节
uint8_t Data91_Byte8 :8; // 预估里程低字节
uint8_t Data91_Byte9 :8; // 预估里程低字节
uint8_t Data91_Byte10 :8; // 预估里程低字节
uint8_t Data91_Byte11 :8; // 预估里程低字节
uint8_t Data91_Byte12 :8; // 预估里程低字节
} bits;
} COMM_DATA_UNION_WI_BOX_0x91; } COMM_DATA_UNION_WI_BOX_0x91;
extern COMM_DATA_UNION_WI_BOX_0x91 WMHCommDataWiBox_0x91; extern COMM_DATA_UNION_WI_BOX_0x91 WMHCommDataWiBox_0x91;
#define COMM_DATA_UNION_WI_BOX_LENGTH_0X92 5 #define COMM_DATA_UNION_WI_BOX_LENGTH_0X92 5
typedef union { typedef union {
struct { struct {
...@@ -106,10 +271,30 @@ typedef union { ...@@ -106,10 +271,30 @@ typedef union {
uint8_t Data92_Byte5 :8; // 预估里程低字节 uint8_t Data92_Byte5 :8; // 预估里程低字节
} bits; } bits;
uint8_t Bytes[COMM_DATA_UNION_WI_BOX_LENGTH_0X92]; uint8_t Bytes[COMM_DATA_UNION_WI_BOX_LENGTH_0X92];
} COMM_DATA_UNION_WI_BOX_0x92; struct
extern COMM_DATA_UNION_WI_BOX_0x92 WMHCommDataWiBox_0x92; {
// // ===================== Byte0 =====================
// uint8_t Inquire :8; // 0x00→未查询，0x11→查询里程，~~0x22→查询NFC卡信息~~
// // ===================== Byte1 =====================
// uint8_t Reserved1 :8; // ~~0x00→无操作，0x11→添卡，0x22→删卡~~
// // ===================== Byte2 =====================
// uint8_t Reserved2 :8; // ~~0x00→暂不响应，0x11~0xFF→卡1~卡15~~
// // ===================== Byte3 =====================
// uint8_t Reserved3 :8; // 预留位3
// // ===================== Byte4 =====================
// uint8_t Reserved4 :8; // 预留位4
uint8_t Data92_Byte1 :8; // 预估里程低字节
uint8_t Data92_Byte2 :8; // 预估里程低字节
uint8_t Data92_Byte3 :8; // 预估里程低字节
uint8_t Data92_Byte4 :8; // 预估里程低字节
uint8_t Data92_Byte5 :8; // 预估里程低字节
} bits;
} COMM_DATA_UNION_WI_BOX_0x92;
extern COMM_DATA_UNION_WI_BOX_0x92 WMHCommDataWiBox_0x92;
#define COMM_DATA_UNION_ICM_LENGTH 13 #define COMM_DATA_UNION_ICM_LENGTH 13
...@@ -137,6 +322,10 @@ typedef union { ...@@ -137,6 +322,10 @@ typedef union {
} COMM_DATA_UNION_ICM; } COMM_DATA_UNION_ICM;
extern COMM_DATA_UNION_ICM WMHCommDataIcm; extern COMM_DATA_UNION_ICM WMHCommDataIcm;
extern COMM_DATA_UNION_WI_BOX_0x90 WMHCommDataWiBox_0x90;
extern COMM_DATA_UNION_WI_BOX_0x91 WMHCommDataWiBox_0x91;
extern COMM_DATA_UNION_WI_BOX_0x92 WMHCommDataWiBox_0x92;
extern uint8_t WMHCommFrameCheckSumFunc(uint32_t ID, uint8_t DLC, uint8_t ProtocolVersion, uint8_t *data); extern uint8_t WMHCommFrameCheckSumFunc(uint32_t ID, uint8_t DLC, uint8_t ProtocolVersion, uint8_t *data);
extern void WMHCommFrameCallBack_WiBox_0x80(void); extern void WMHCommFrameCallBack_WiBox_0x80(void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment