Skip to content

Commit

Permalink
Test update EGS51 CAN
Browse files Browse the repository at this point in the history
  • Loading branch information
@rnd-ash
rnd-ash committed Sep 12, 2024
1 parent 1b4b67b commit e5e1327
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 173 deletions.
65 changes: 3 additions & 62 deletions lib/egs51_ecus/can_data.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,68 +131,9 @@ ECU MS51
SIGNAL OEL_FS, OFFSET: 48, LEN: 8, DESC: oil level, DATA TYPE NUMBER(_MULTIPLIER_: 1.0, _OFFSET_: 0.0)
SIGNAL OEL_QUAL, OFFSET: 56, LEN: 8, DESC: oil quality, DATA TYPE NUMBER(_MULTIPLIER_: 1.0, _OFFSET_: 0.0)
FRAME MS_210h (0x00000210)
SIGNAL KOMP_NOTAUS, OFFSET: 0, LEN: 1, DESC: Air compressor Emergency Shutdown, DATA TYPE BOOL
SIGNAL SLV_MS, OFFSET: 1, LEN: 4, DESC: switching line shift MS, DATA TYPE ENUM
ENUM SKL0, RAW: 0, DESC: Shift characteristic "0"
ENUM SKL1, RAW: 1, DESC: Shift characteristic "1"
ENUM SKL2, RAW: 2, DESC: Shift characteristic "2"
ENUM SKL3, RAW: 3, DESC: Shift characteristic "3"
ENUM SKL4, RAW: 4, DESC: Shift characteristic "4"
ENUM SKL5, RAW: 5, DESC: Shift characteristic "5"
ENUM SKL6, RAW: 6, DESC: Shift characteristic "6"
ENUM SKL7, RAW: 7, DESC: Shift characteristic "7"
ENUM SKL8, RAW: 8, DESC: Shift characteristic "8"
ENUM SKL9, RAW: 9, DESC: Shift characteristic "9"
ENUM SKL10, RAW: 10, DESC: Shift characteristic "10"
SIGNAL KRIECH_AUS, OFFSET: 6, LEN: 1, DESC: Switch KSG-creep, DATA TYPE BOOL
SIGNAL ANF1, OFFSET: 7, LEN: 1, DESC: MS-wish: "Approach 1.Gang", DATA TYPE BOOL
SIGNAL AKT_R_MS, OFFSET: 8, LEN: 1, DESC: MS-wish: "Active downshift", DATA TYPE BOOL
SIGNAL ZH_AUS_MS, OFFSET: 9, LEN: 1, DESC: Turn off heater, DATA TYPE BOOL
SIGNAL GMAX_MS, OFFSET: 10, LEN: 3, DESC: Gear, upper limit, DATA TYPE ENUM
ENUM PASSIVE, RAW: 0, DESC: passive value
ENUM G1, RAW: 1, DESC: Gear, upper limit = 1
ENUM G2, RAW: 2, DESC: Gear, upper limit = 2
ENUM G3, RAW: 3, DESC: Gear, upper limit = 3
ENUM G4, RAW: 4, DESC: Gear, upper limit = 4
ENUM G5, RAW: 5, DESC: Gear, upper limit = 5
ENUM G6, RAW: 6, DESC: Gear, upper limit = 6
ENUM G7, RAW: 7, DESC: Gear, upper limit = 7
SIGNAL GMIN_MS, OFFSET: 13, LEN: 3, DESC: Gear, lower limit, DATA TYPE ENUM
ENUM PASSIVE, RAW: 0, DESC: passive value
ENUM G1, RAW: 1, DESC: Gear, lower limit = 1
ENUM G2, RAW: 2, DESC: Gear, lower limit = 2
ENUM G3, RAW: 3, DESC: Gear, lower limit = 3
ENUM G4, RAW: 4, DESC: Gear, lower limit = 4
ENUM G5, RAW: 5, DESC: Gear, lower limit = 5
ENUM G6, RAW: 6, DESC: Gear, lower limit = 6
ENUM G7, RAW: 7, DESC: Gear, lower limit = 7
SIGNAL PW, OFFSET: 16, LEN: 8, DESC: pedal, DATA TYPE NUMBER(_MULTIPLIER_: 1.0, _OFFSET_: 0.0)
SIGNAL V_DSPL_NEU, OFFSET: 24, LEN: 1, DESC: retrigger minimum display time in the display: S, DATA TYPE BOOL
SIGNAL LL_STBL, OFFSET: 25, LEN: 1, DESC: idle is stable, DATA TYPE BOOL
SIGNAL VGL_ST, OFFSET: 26, LEN: 1, DESC: Vorglühstatus, DATA TYPE BOOL
SIGNAL MSS_DEF, OFFSET: 27, LEN: 1, DESC: Engine Start / Stop system is defective, DATA TYPE BOOL
SIGNAL MSS_KL, OFFSET: 28, LEN: 1, DESC: engine start / stop system warning, DATA TYPE BOOL
SIGNAL MSS_AKT, OFFSET: 29, LEN: 1, DESC: engine start / stop system active, DATA TYPE BOOL
SIGNAL KOMP_BAUS, OFFSET: 30, LEN: 1, DESC: turn air compressor:: S acceleration, DATA TYPE BOOL
SIGNAL CRASH_MS, OFFSET: 31, LEN: 1, DESC: Crash signal from motor control, DATA TYPE BOOL
SIGNAL PWG_ERR, OFFSET: 32, LEN: 1, DESC: error pedal sensor, DATA TYPE BOOL
SIGNAL LL, OFFSET: 33, LEN: 1, DESC: idle, DATA TYPE BOOL
SIGNAL KUEB_S_A, OFFSET: 34, LEN: 1, DESC: beg. "Slip" lock-up clutch, DATA TYPE BOOL
SIGNAL TM_REG, OFFSET: 35, LEN: 1, DESC: cruise control regulates, DATA TYPE BOOL
SIGNAL V_MAX_EIN, OFFSET: 36, LEN: 1, DESC: activated speed limit, DATA TYPE BOOL
SIGNAL KD_MS, OFFSET: 37, LEN: 1, DESC: Kick Down (changeover scenario open!), DATA TYPE BOOL
SIGNAL NOTL, OFFSET: 38, LEN: 1, DESC: emergency operation, DATA TYPE BOOL
SIGNAL V_MAX_SUM, OFFSET: 39, LEN: 1, DESC: Warning buzzer, DATA TYPE BOOL
SIGNAL FBS_SE, OFFSET: 40, LEN: 1, DESC: FBStart Error, DATA TYPE BOOL
SIGNAL V_DSPL_PGB, OFFSET: 41, LEN: 1, DESC: "achieved winter tires limitation" Indicated on display, DATA TYPE BOOL
SIGNAL TM_EIN, OFFSET: 42, LEN: 1, DESC: activated cruise control, DATA TYPE BOOL
SIGNAL V_MAX_REG, OFFSET: 43, LEN: 1, DESC: Speed ​​controls, DATA TYPE BOOL
SIGNAL V_DSPL_LIM, OFFSET: 44, LEN: 1, DESC: Display "limit?" on display, DATA TYPE BOOL
SIGNAL V_DSPL_ERR, OFFSET: 45, LEN: 1, DESC: "Error" indicator on the display, DATA TYPE BOOL
SIGNAL V_DSPL_BL, OFFSET: 46, LEN: 1, DESC: display flashes, DATA TYPE BOOL
SIGNAL V_DSPL_EIN, OFFSET: 47, LEN: 1, DESC: Geschw.begrenzer- / cruise control display a, DATA TYPE BOOL
SIGNAL FMMOTMAX, OFFSET: 48, LEN: 8, DESC: factor for fill value. d. max. Mom with remo.. A.druck, DATA TYPE NUMBER(_MULTIPLIER_: 1.0, _OFFSET_: 0.0)
SIGNAL V_MAX_TM, OFFSET: 56, LEN: 8, DESC: Set maximum or cruise control speed, DATA TYPE NUMBER(_MULTIPLIER_: 1.0, _OFFSET_: 0.0)
SIGNAL IGN_ANG, OFFSET: 16, LEN: 8, DESC: Ignition angle, DATA TYPE NUMBER(_MULTIPLIER_: 0.35, _OFFSET_: 0.0)
SIGNAL PW, OFFSET: 16, LEN: 8, DESC: Pedal position, DATA TYPE NUMBER(_MULTIPLIER_: 1.0, _OFFSET_: 0.0)
SIGNAL M_ESP, OFFSET: 48, LEN: 8, DESC: Motor torque for ESP, DATA TYPE NUMBER(_MULTIPLIER_: 3.0, _OFFSET_: 0.0)
FRAME MS_310h (0x00000310)
SIGNAL MAX_TRQ_FACTOR, OFFSET: 24, LEN: 8, DESC: factor of max torque, DATA TYPE NUMBER(_MULTIPLIER_: 0.0078, _OFFSET_: 0.0)
SIGNAL IND_TORQUE, OFFSET: 32, LEN: 8, DESC: engine indicated torque, DATA TYPE NUMBER(_MULTIPLIER_: 3.0, _OFFSET_: 0.0)
Expand Down
123 changes: 12 additions & 111 deletions lib/egs51_ecus/src/MS51.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,45 +18,6 @@
#define MS_310_EGS51_CAN_ID 0x0310
#define MS_608_EGS51_CAN_ID 0x0608

/** switching line shift MS */
enum class MS_210h_SLV_MS_EGS51 : uint16_t {
SKL0 = 0, // Shift characteristic "0"
SKL1 = 1, // Shift characteristic "1"
SKL2 = 2, // Shift characteristic "2"
SKL3 = 3, // Shift characteristic "3"
SKL4 = 4, // Shift characteristic "4"
SKL5 = 5, // Shift characteristic "5"
SKL6 = 6, // Shift characteristic "6"
SKL7 = 7, // Shift characteristic "7"
SKL8 = 8, // Shift characteristic "8"
SKL9 = 9, // Shift characteristic "9"
SKL10 = 10, // Shift characteristic "10"
};

/** Gear, upper limit */
enum class MS_210h_GMAX_MS_EGS51 : uint16_t {
PASSIVE = 0, // passive value
G1 = 1, // Gear, upper limit = 1
G2 = 2, // Gear, upper limit = 2
G3 = 3, // Gear, upper limit = 3
G4 = 4, // Gear, upper limit = 4
G5 = 5, // Gear, upper limit = 5
G6 = 6, // Gear, upper limit = 6
G7 = 7, // Gear, upper limit = 7
};

/** Gear, lower limit */
enum class MS_210h_GMIN_MS_EGS51 : uint16_t {
PASSIVE = 0, // passive value
G1 = 1, // Gear, lower limit = 1
G2 = 2, // Gear, lower limit = 2
G3 = 3, // Gear, lower limit = 3
G4 = 4, // Gear, lower limit = 4
G5 = 5, // Gear, lower limit = 5
G6 = 6, // Gear, lower limit = 6
G7 = 7, // Gear, lower limit = 7
};



typedef union {
Expand Down Expand Up @@ -130,78 +91,18 @@ typedef union {
uint64_t raw;
uint8_t bytes[8];
struct {
/** Set maximum or cruise control speed **/
uint8_t V_MAX_TM: 8;
/** factor for fill value. d. max. Mom with remo.. A.druck **/
uint8_t FMMOTMAX: 8;
/** Geschw.begrenzer- / cruise control display a **/
bool V_DSPL_EIN: 1;
/** display flashes **/
bool V_DSPL_BL: 1;
/** "Error" indicator on the display **/
bool V_DSPL_ERR: 1;
/** Display "limit?" on display **/
bool V_DSPL_LIM: 1;
/** Speed ​​controls **/
bool V_MAX_REG: 1;
/** activated cruise control **/
bool TM_EIN: 1;
/** "achieved winter tires limitation" Indicated on display **/
bool V_DSPL_PGB: 1;
/** FBStart Error **/
bool FBS_SE: 1;
/** Warning buzzer **/
bool V_MAX_SUM: 1;
/** emergency operation **/
bool NOTL: 1;
/** Kick Down (changeover scenario open!) **/
bool KD_MS: 1;
/** activated speed limit **/
bool V_MAX_EIN: 1;
/** cruise control regulates **/
bool TM_REG: 1;
/** beg. "Slip" lock-up clutch **/
bool KUEB_S_A: 1;
/** idle **/
bool LL: 1;
/** error pedal sensor **/
bool PWG_ERR: 1;
/** Crash signal from motor control **/
bool CRASH_MS: 1;
/** turn air compressor:: S acceleration **/
bool KOMP_BAUS: 1;
/** engine start / stop system active **/
bool MSS_AKT: 1;
/** engine start / stop system warning **/
bool MSS_KL: 1;
/** Engine Start / Stop system is defective **/
bool MSS_DEF: 1;
/** Vorglühstatus **/
bool VGL_ST: 1;
/** idle is stable **/
bool LL_STBL: 1;
/** retrigger minimum display time in the display: S **/
bool V_DSPL_NEU: 1;
/** pedal **/
/** BITFIELD PADDING. DO NOT CHANGE **/
uint8_t __PADDING1__: 8;
/** Motor torque for ESP **/
uint8_t M_ESP: 8;
/** BITFIELD PADDING. DO NOT CHANGE **/
uint32_t __PADDING2__: 24;
/** Pedal position **/
uint8_t PW: 8;
/** Gear, lower limit **/
MS_210h_GMIN_MS_EGS51 GMIN_MS: 3;
/** Gear, upper limit **/
MS_210h_GMAX_MS_EGS51 GMAX_MS: 3;
/** Turn off heater **/
bool ZH_AUS_MS: 1;
/** MS-wish: "Active downshift" **/
bool AKT_R_MS: 1;
/** MS-wish: "Approach 1.Gang" **/
bool ANF1: 1;
/** Switch KSG-creep **/
bool KRIECH_AUS: 1;
/** Ignition angle **/
uint8_t IGN_ANG: 8;
/** BITFIELD PADDING. DO NOT CHANGE **/
bool __PADDING1__: 1;
/** switching line shift MS **/
MS_210h_SLV_MS_EGS51 SLV_MS: 4;
/** Air compressor Emergency Shutdown **/
bool KOMP_NOTAUS: 1;
uint8_t __PADDING3__: 8;
} __attribute__((packed));
/** Gets CAN ID of MS_210_EGS51 **/
uint32_t get_canid(){ return MS_210_EGS51_CAN_ID; }
Expand All @@ -221,9 +122,9 @@ typedef union {
uint8_t DRG_TORQUE: 8;
/** engine indicated torque **/
uint8_t IND_TORQUE: 8;
/** factor of max torque **/
/** factor of max torque **/
uint8_t MAX_TRQ_FACTOR: 8;
/** BITFIELD PADDING. DO NOT CHANGE **/
/** BITFIELD PADDING. DO NOT CHANGE **/
uint32_t __PADDING1__: 24;
} __attribute__((packed));
/** Gets CAN ID of MS_310_EGS51 **/
Expand Down

0 comments on commit e5e1327

Please sign in to comment.