rusefi
/
rusefi-hardware
mirror of https://github.com/rusefi/rusefi-hardware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sending out complete configuration

This commit is contained in:
rusefi 2023-05-15 21:48:31 -04:00
parent 64ece98953
commit 42d939bfe4
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
GDI-4ch/firmware/can.cpp
View File

@ -101,17 +101,19 @@ static void sendOutConfiguration() {
m_frame.RTR = CAN_RTR_DATA;
memset(m_frame.data8, 0, sizeof(m_frame.data8));
// CanConfiguration1
m_frame.DLC = 8;
m_frame.data16[0] = configuration.BoostVoltage;
m_frame.data16[1] = float2short100(configuration.BoostCurrent);
m_frame.data16[1] = float2short128(configuration.BoostCurrent);
m_frame.data16[2] = configuration.TBoostMin;
m_frame.data16[3] = configuration.TBoostMax;
m_frame.SID = GDI4_BASE_ADDRESS + 1;
msg_t msg = canTransmitTimeout(&CAND1, CAN_ANY_MAILBOX, &m_frame, CAN_TX_TIMEOUT_100_MS);
countTxResult(msg);
// CanConfiguration2
m_frame.DLC = 8;
m_frame.data16[0] = float2short100(configuration.PeakCurrent);
m_frame.data16[0] = float2short128(configuration.PeakCurrent);
m_frame.data16[1] = configuration.TpeakDuration;
m_frame.data16[2] = configuration.TpeakOff;
m_frame.data16[3] = configuration.Tbypass;
@ -119,8 +121,9 @@ static void sendOutConfiguration() {
msg = canTransmitTimeout(&CAND1, CAN_ANY_MAILBOX, &m_frame, CAN_TX_TIMEOUT_100_MS);
countTxResult(msg);
// CanConfiguration3
m_frame.DLC = 6;
m_frame.data16[0] = float2short100(configuration.HoldCurrent);
m_frame.data16[0] = float2short128(configuration.HoldCurrent);
m_frame.data16[1] = configuration.TholdOff;
m_frame.data16[2] = configuration.THoldDuration;
@ -170,7 +173,7 @@ static float getInt(CANRxFrame *frame, int offset) {
static float getFloat(CANRxFrame *frame, int offset) {
int value = getInt(frame, offset);
return short2float100(value);
return short2float128(value);
}
#define ASSIGN_IF_CHANGED(oldValue, newValue) \

4
GDI-4ch/firmware/persistence.cpp
View File

@ -44,10 +44,10 @@ void saveConfiguration() {
mfs_error_t writeErr = mfsWriteRecord(&mfs1, MFS_RECORD_ID, sizeof(GDIConfiguration), (uint8_t*)&configuration);
}
uint16_t float2short100(float value) {
uint16_t float2short128(float value) {
return FIXED_POINT * value;
}
float short2float100(uint16_t value) {
float short2float128(uint16_t value) {
return value / 1.0 / FIXED_POINT;
}

6
GDI-4ch/firmware/persistence.h
View File

@ -54,7 +54,7 @@ struct GDIConfiguration {
short inputCanID;
};
#define FIXED_POINT 100
#define FIXED_POINT 128
uint16_t float2short100(float value);
float short2float100(uint16_t value);
uint16_t float2short128(float value);
float short2float128(uint16_t value);