huahua/RP-01
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新信号矩阵

Browse Source
This commit is contained in:
sunbeam 2025-04-21 14:02:00 +08:00
parent 52929f1608
commit d6f2305dd3
4 changed files with 63 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cva_asw_m0146/src/CANmatrix/dbc/DMK-RP-01_CAN_V0.1.dbc
View File

@ -104,6 +104,7 @@ BO_ 1025 SCM_DEBUG1: 8 SCM
SG_ DEBUG_MOTOR_HG_CURRENT : 0|8@1+ (1,0) [0|255] "" PANEL
BO_ 769 SCM_STATE: 8 SCM
SG_ ZY_MSSG_STATE_ZD : 22|2@1+ (1,0) [0|3] "" PANEL
SG_ test5 : 56|8@1+ (1,0) [0|0] "" PANEL
SG_ test4 : 48|8@1+ (1,0) [0|0] "" PANEL
SG_ test3 : 40|8@1+ (1,0) [0|0] "" PANEL
@ -120,6 +121,7 @@ BO_ 769 SCM_STATE: 8 SCM
SG_ MOTOR_HG_STATE : 0|2@1+ (1,0) [0|0] "" PANEL
BO_ 513 Panel_Key: 8 PANEL
SG_ KEY_ZY_MSSG_ZD : 21|1@1+ (1,0) [0|0] "" SCM
SG_ KEY_TJ_ZD_R_PLUS : 46|1@1+ (1,0) [0|0] "" SCM
SG_ KEY_TJ_ZD_R_MINUS : 47|1@1+ (1,0) [0|0] "" SCM
SG_ KEY_TJ_ZD_L_PLUS : 44|1@1+ (1,0) [0|0] "" SCM
@ -247,6 +249,7 @@ VAL_ 3221225472 SCM_ERR_HALL_TT 1 "ERROR" 0 "NO_ERROR" ;
VAL_ 3221225472 SCM_ERR_HALL_KB 1 "ERROR" 0 "NO_ERROR" ;
VAL_ 3221225472 SCM_ERR_UV 1 "ERROR" 0 "NO_ERROR" ;
VAL_ 3221225472 SCM_ERR_OV 1 "ERROR" 0 "NO_ERROR" ;
VAL_ 769 ZY_MSSG_STATE_ZD 3 "LEVEL3" 2 "LEVEL2" 1 "LEVEL1" 0 "OFF" ;
VAL_ 769 ZY_MSSG_STATE 3 "LEVEL3" 2 "LEVEL2" 1 "LEVEL1" 0 "OFF" ;
VAL_ 769 ZY_HEAT_STATE 3 "LEVEL3" 2 "LEVEL2" 1 "LEVEL1" 0 "OFF" ;
VAL_ 769 ZY_FAN_STATE 3 "LEVEL3" 2 "LEVEL2" 1 "LEVEL1" 0 "OFF" ;
@ -256,6 +259,7 @@ VAL_ 769 MOTOR_TZ_STATE 3 "FAULT" 2 "ACT_CCW" 1 "ACT_CW" 0 "NO_ACT" ;
VAL_ 769 MOTOR_TT_STATE 3 "FAULT" 2 "ACT_CCW" 1 "ACT_CW" 0 "NO_ACT" ;
VAL_ 769 MOTOR_KB_STATE 3 "FAULT" 2 "ACT_CCW" 1 "ACT_CW" 0 "NO_ACT" ;
VAL_ 769 MOTOR_HG_STATE 3 "FAULT" 2 "ACT_CCW" 1 "ACT_CW" 0 "NO_ACT" ;
VAL_ 513 KEY_ZY_MSSG_ZD 1 "PRESSED" 0 "NOT_PRESS" ;
VAL_ 513 KEY_TJ_ZD_R_PLUS 1 "PRESSED" 0 "NOT_PRESS" ;
VAL_ 513 KEY_TJ_ZD_R_MINUS 1 "PRESSED" 0 "NOT_PRESS" ;
VAL_ 513 KEY_TJ_ZD_L_PLUS 1 "PRESSED" 0 "NOT_PRESS" ;

2
cva_asw_m0146/src/CANmatrix/lib/canmatrix-fmon.h
View File

@ -1,5 +1,5 @@
// Generator version : v3.1
// Generation time : 2025.04.01 15:44:06
// Generation time : 2025.04.21 13:58:17
// DBC filename : DMK-RP-01_CAN_V0.1.dbc
#pragma once

12
cva_asw_m0146/src/CANmatrix/lib/canmatrix.c
View File

@ -1,5 +1,5 @@
// Generator version : v3.1
// Generation time : 2024.12.17 14:33:44
// Generation time : 2025.04.21 13:58:17
// DBC filename : DMK-RP-01_CAN_V0.1.dbc
#include "canmatrix.h"
@ -65,6 +65,7 @@ uint32_t Unpack_Panel_Key_CANmatrix(Panel_Key_t* _m, const uint8_t* _d, uint8_t
_m->KEY_ZY_FAN = (uint8_t) ( (_d[2] & (0x01U)) );
_m->KEY_ZY_HEAT = (uint8_t) ( ((_d[2] >> 1U) & (0x01U)) );
_m->KEY_ZY_MSSG = (uint8_t) ( ((_d[2] >> 4U) & (0x01U)) );
_m->KEY_ZY_MSSG_ZD = (uint8_t) ( ((_d[2] >> 5U) & (0x01U)) );
_m->KEY_MEMORY_3 = (uint8_t) ( (_d[3] & (0x01U)) );
_m->KEY_MEMORY_2 = (uint8_t) ( ((_d[3] >> 1U) & (0x01U)) );
_m->KEY_MEMORY_1 = (uint8_t) ( ((_d[3] >> 2U) & (0x01U)) );
@ -99,7 +100,7 @@ uint32_t Pack_Panel_Key_CANmatrix(Panel_Key_t* _m, __CoderDbcCanFrame_t__* cfram
cframe->Data[0] |= (uint8_t) ( (_m->KEY_ZY_D & (0x01U)) | ((_m->KEY_ZY_U & (0x01U)) << 1U) | ((_m->KEY_TT_R & (0x01U)) << 2U) | ((_m->KEY_TT_F & (0x01U)) << 3U) | ((_m->KEY_KB_R & (0x01U)) << 4U) | ((_m->KEY_KB_F & (0x01U)) << 5U) | ((_m->KEY_HG_R & (0x01U)) << 6U) | ((_m->KEY_HG_F & (0x01U)) << 7U) );
cframe->Data[1] |= (uint8_t) ( (_m->KEY_YT_D & (0x01U)) | ((_m->KEY_YT_U & (0x01U)) << 1U) | ((_m->KEY_TZ_D & (0x01U)) << 2U) | ((_m->KEY_TZ_U & (0x01U)) << 3U) );
cframe->Data[2] |= (uint8_t) ( (_m->KEY_ZY_FAN & (0x01U)) | ((_m->KEY_ZY_HEAT & (0x01U)) << 1U) | ((_m->KEY_ZY_MSSG & (0x01U)) << 4U) );
cframe->Data[2] |= (uint8_t) ( (_m->KEY_ZY_FAN & (0x01U)) | ((_m->KEY_ZY_HEAT & (0x01U)) << 1U) | ((_m->KEY_ZY_MSSG & (0x01U)) << 4U) | ((_m->KEY_ZY_MSSG_ZD & (0x01U)) << 5U) );
cframe->Data[3] |= (uint8_t) ( (_m->KEY_MEMORY_3 & (0x01U)) | ((_m->KEY_MEMORY_2 & (0x01U)) << 1U) | ((_m->KEY_MEMORY_1 & (0x01U)) << 2U) | ((_m->KEY_MEMORY_SET & (0x01U)) << 3U) );
cframe->Data[4] |= (uint8_t) ( (_m->KEY_ZY_FLAT & (0x01U)) | ((_m->KEY_RESET & (0x01U)) << 1U) );
cframe->Data[5] |= (uint8_t) ( (_m->KEY_TJ_KB_U_PLUS & (0x01U)) | ((_m->KEY_TJ_KB_U_MINUS & (0x01U)) << 1U) | ((_m->KEY_TJ_KB_D_PLUS & (0x01U)) << 2U) | ((_m->KEY_TJ_KB_D_MINUS & (0x01U)) << 3U) | ((_m->KEY_TJ_ZD_L_PLUS & (0x01U)) << 4U) | ((_m->KEY_TJ_ZD_L_MINUS & (0x01U)) << 5U) | ((_m->KEY_TJ_ZD_R_PLUS & (0x01U)) << 6U) | ((_m->KEY_TJ_ZD_R_MINUS & (0x01U)) << 7U) );
@ -118,7 +119,7 @@ uint32_t Pack_Panel_Key_CANmatrix(Panel_Key_t* _m, uint8_t* _d, uint8_t* _len, u
_d[0] |= (uint8_t) ( (_m->KEY_ZY_D & (0x01U)) | ((_m->KEY_ZY_U & (0x01U)) << 1U) | ((_m->KEY_TT_R & (0x01U)) << 2U) | ((_m->KEY_TT_F & (0x01U)) << 3U) | ((_m->KEY_KB_R & (0x01U)) << 4U) | ((_m->KEY_KB_F & (0x01U)) << 5U) | ((_m->KEY_HG_R & (0x01U)) << 6U) | ((_m->KEY_HG_F & (0x01U)) << 7U) );
_d[1] |= (uint8_t) ( (_m->KEY_YT_D & (0x01U)) | ((_m->KEY_YT_U & (0x01U)) << 1U) | ((_m->KEY_TZ_D & (0x01U)) << 2U) | ((_m->KEY_TZ_U & (0x01U)) << 3U) );
_d[2] |= (uint8_t) ( (_m->KEY_ZY_FAN & (0x01U)) | ((_m->KEY_ZY_HEAT & (0x01U)) << 1U) | ((_m->KEY_ZY_MSSG & (0x01U)) << 4U) );
_d[2] |= (uint8_t) ( (_m->KEY_ZY_FAN & (0x01U)) | ((_m->KEY_ZY_HEAT & (0x01U)) << 1U) | ((_m->KEY_ZY_MSSG & (0x01U)) << 4U) | ((_m->KEY_ZY_MSSG_ZD & (0x01U)) << 5U) );
_d[3] |= (uint8_t) ( (_m->KEY_MEMORY_3 & (0x01U)) | ((_m->KEY_MEMORY_2 & (0x01U)) << 1U) | ((_m->KEY_MEMORY_1 & (0x01U)) << 2U) | ((_m->KEY_MEMORY_SET & (0x01U)) << 3U) );
_d[4] |= (uint8_t) ( (_m->KEY_ZY_FLAT & (0x01U)) | ((_m->KEY_RESET & (0x01U)) << 1U) );
_d[5] |= (uint8_t) ( (_m->KEY_TJ_KB_U_PLUS & (0x01U)) | ((_m->KEY_TJ_KB_U_MINUS & (0x01U)) << 1U) | ((_m->KEY_TJ_KB_D_PLUS & (0x01U)) << 2U) | ((_m->KEY_TJ_KB_D_MINUS & (0x01U)) << 3U) | ((_m->KEY_TJ_ZD_L_PLUS & (0x01U)) << 4U) | ((_m->KEY_TJ_ZD_L_MINUS & (0x01U)) << 5U) | ((_m->KEY_TJ_ZD_R_PLUS & (0x01U)) << 6U) | ((_m->KEY_TJ_ZD_R_MINUS & (0x01U)) << 7U) );
@ -142,6 +143,7 @@ uint32_t Unpack_SCM_STATE_CANmatrix(SCM_STATE_t* _m, const uint8_t* _d, uint8_t
_m->ZY_FAN_STATE = (uint8_t) ( (_d[2] & (0x03U)) );
_m->ZY_HEAT_STATE = (uint8_t) ( ((_d[2] >> 2U) & (0x03U)) );
_m->ZY_MSSG_STATE = (uint8_t) ( ((_d[2] >> 4U) & (0x03U)) );
_m->ZY_MSSG_STATE_ZD = (uint8_t) ( ((_d[2] >> 6U) & (0x03U)) );
_m->test1 = (uint8_t) ( (_d[3] & (0xFFU)) );
_m->test2 = (uint8_t) ( (_d[4] & (0xFFU)) );
_m->test3 = (uint8_t) ( (_d[5] & (0xFFU)) );
@ -167,7 +169,7 @@ uint32_t Pack_SCM_STATE_CANmatrix(SCM_STATE_t* _m, __CoderDbcCanFrame_t__* cfram
cframe->Data[0] |= (uint8_t) ( (_m->MOTOR_HG_STATE & (0x03U)) | ((_m->MOTOR_KB_STATE & (0x03U)) << 2U) | ((_m->MOTOR_TT_STATE & (0x03U)) << 4U) | ((_m->MOTOR_TZ_STATE & (0x03U)) << 6U) );
cframe->Data[1] |= (uint8_t) ( (_m->MOTOR_YT_STATE & (0x03U)) | ((_m->MOTOR_ZY_STATE & (0x03U)) << 2U) );
cframe->Data[2] |= (uint8_t) ( (_m->ZY_FAN_STATE & (0x03U)) | ((_m->ZY_HEAT_STATE & (0x03U)) << 2U) | ((_m->ZY_MSSG_STATE & (0x03U)) << 4U) );
cframe->Data[2] |= (uint8_t) ( (_m->ZY_FAN_STATE & (0x03U)) | ((_m->ZY_HEAT_STATE & (0x03U)) << 2U) | ((_m->ZY_MSSG_STATE & (0x03U)) << 4U) | ((_m->ZY_MSSG_STATE_ZD & (0x03U)) << 6U) );
cframe->Data[3] |= (uint8_t) ( (_m->test1 & (0xFFU)) );
cframe->Data[4] |= (uint8_t) ( (_m->test2 & (0xFFU)) );
cframe->Data[5] |= (uint8_t) ( (_m->test3 & (0xFFU)) );
@ -188,7 +190,7 @@ uint32_t Pack_SCM_STATE_CANmatrix(SCM_STATE_t* _m, uint8_t* _d, uint8_t* _len, u
_d[0] |= (uint8_t) ( (_m->MOTOR_HG_STATE & (0x03U)) | ((_m->MOTOR_KB_STATE & (0x03U)) << 2U) | ((_m->MOTOR_TT_STATE & (0x03U)) << 4U) | ((_m->MOTOR_TZ_STATE & (0x03U)) << 6U) );
_d[1] |= (uint8_t) ( (_m->MOTOR_YT_STATE & (0x03U)) | ((_m->MOTOR_ZY_STATE & (0x03U)) << 2U) );
_d[2] |= (uint8_t) ( (_m->ZY_FAN_STATE & (0x03U)) | ((_m->ZY_HEAT_STATE & (0x03U)) << 2U) | ((_m->ZY_MSSG_STATE & (0x03U)) << 4U) );
_d[2] |= (uint8_t) ( (_m->ZY_FAN_STATE & (0x03U)) | ((_m->ZY_HEAT_STATE & (0x03U)) << 2U) | ((_m->ZY_MSSG_STATE & (0x03U)) << 4U) | ((_m->ZY_MSSG_STATE_ZD & (0x03U)) << 6U) );
_d[3] |= (uint8_t) ( (_m->test1 & (0xFFU)) );
_d[4] |= (uint8_t) ( (_m->test2 & (0xFFU)) );
_d[5] |= (uint8_t) ( (_m->test3 & (0xFFU)) );

52
cva_asw_m0146/src/CANmatrix/lib/canmatrix.h
View File

@ -1,5 +1,5 @@
// Generator version : v3.1
// Generation time : 2024.12.17 14:33:44
// Generation time : 2025.04.21 13:58:17
// DBC filename : DMK-RP-01_CAN_V0.1.dbc
#pragma once
@ -215,6 +215,17 @@ extern "C" {
#endif
// Value tables for @KEY_ZY_MSSG_ZD signal
#ifndef KEY_ZY_MSSG_ZD_Panel_Key_PRESSED
#define KEY_ZY_MSSG_ZD_Panel_Key_PRESSED (1)
#endif
#ifndef KEY_ZY_MSSG_ZD_Panel_Key_NOT_PRESS
#define KEY_ZY_MSSG_ZD_Panel_Key_NOT_PRESS (0)
#endif
// Value tables for @KEY_MEMORY_3 signal
#ifndef KEY_MEMORY_3_Panel_Key_PRESSED
@ -433,6 +444,10 @@ typedef struct
// 0 : "NOT_PRESS"
uint8_t KEY_ZY_MSSG : 1; // Bits= 1
// 1 : "PRESSED"
// 0 : "NOT_PRESS"
uint8_t KEY_ZY_MSSG_ZD : 1; // Bits= 1
// 1 : "PRESSED"
// 0 : "NOT_PRESS"
uint8_t KEY_MEMORY_3 : 1; // Bits= 1
@ -551,6 +566,10 @@ typedef struct
// 0 : "NOT_PRESS"
uint8_t KEY_ZY_MSSG; // Bits= 1
// 1 : "PRESSED"
// 0 : "NOT_PRESS"
uint8_t KEY_ZY_MSSG_ZD; // Bits= 1
// 1 : "PRESSED"
// 0 : "NOT_PRESS"
uint8_t KEY_MEMORY_3; // Bits= 1
@ -793,6 +812,25 @@ typedef struct
#endif
// Value tables for @ZY_MSSG_STATE_ZD signal
#ifndef ZY_MSSG_STATE_ZD_SCM_STATE_LEVEL3
#define ZY_MSSG_STATE_ZD_SCM_STATE_LEVEL3 (3)
#endif
#ifndef ZY_MSSG_STATE_ZD_SCM_STATE_LEVEL2
#define ZY_MSSG_STATE_ZD_SCM_STATE_LEVEL2 (2)
#endif
#ifndef ZY_MSSG_STATE_ZD_SCM_STATE_LEVEL1
#define ZY_MSSG_STATE_ZD_SCM_STATE_LEVEL1 (1)
#endif
#ifndef ZY_MSSG_STATE_ZD_SCM_STATE_OFF
#define ZY_MSSG_STATE_ZD_SCM_STATE_OFF (0)
#endif
typedef struct
{
#ifdef CANMATRIX_USE_BITS_SIGNAL
@ -851,6 +889,12 @@ typedef struct
// 0 : "OFF"
uint8_t ZY_MSSG_STATE : 2; // Bits= 2
// 3 : "LEVEL3"
// 2 : "LEVEL2"
// 1 : "LEVEL1"
// 0 : "OFF"
uint8_t ZY_MSSG_STATE_ZD : 2; // Bits= 2
uint8_t test1; // Bits= 8
uint8_t test2; // Bits= 8
@ -917,6 +961,12 @@ typedef struct
// 0 : "OFF"
uint8_t ZY_MSSG_STATE; // Bits= 2
// 3 : "LEVEL3"
// 2 : "LEVEL2"
// 1 : "LEVEL1"
// 0 : "OFF"
uint8_t ZY_MSSG_STATE_ZD; // Bits= 2
uint8_t test1; // Bits= 8
uint8_t test2; // Bits= 8