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

switch (#1250)

This commit is contained in:
Matthew Kennedy 2020-04-02 13:26:06 -07:00 committed by GitHub
parent ea4cfa9046
commit a193ae3e42
3 changed files with 80 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
firmware/controllers/can/can_dash.cpp
View File

@ -11,10 +11,8 @@
#if EFI_CAN_SUPPORT #if EFI_CAN_SUPPORT
#include "engine.h" #include "engine.h"
#include "can.h"
#include "can_hw.h"
#include "can_dash.h" #include "can_dash.h"
#include "can_msg_tx.h"
#include "allsensors.h" #include "allsensors.h"
#include "vehicle_speed.h" #include "vehicle_speed.h"
@ -46,98 +44,103 @@ EXTERN_ENGINE;
#define CAN_VAG_CLT_V2 0x420 #define CAN_VAG_CLT_V2 0x420
#define CAN_VAG_IMMO 0x3D0 #define CAN_VAG_IMMO 0x3D0
extern CANTxFrame txmsg;
static void setShortValue(CANTxFrame *txmsg, int value, int offset) {
txmsg->data8[offset] = value;
txmsg->data8[offset + 1] = value >> 8;
}
void canDashboardBMW(void) { void canDashboardBMW(void) {
//BMW Dashboard //BMW Dashboard
commonTxInit(CAN_BMW_E46_SPEED); {
setShortValue(&txmsg, 10 * 8, 1); CanTxMessage msg(CAN_BMW_E46_SPEED);
sendCanMessage(); msg.setShortValue(10 * 8, 1);
}
commonTxInit(CAN_BMW_E46_RPM); {
setShortValue(&txmsg, (int) (GET_RPM() * 6.4), 2); CanTxMessage msg(CAN_BMW_E46_RPM);
sendCanMessage(); msg.setShortValue((int) (GET_RPM() * 6.4), 2);
}
commonTxInit(CAN_BMW_E46_DME2); {
setShortValue(&txmsg, (int) ((getCoolantTemperature() + 48.373) / 0.75), 1); CanTxMessage msg(CAN_BMW_E46_DME2);
sendCanMessage(); msg.setShortValue((int) ((getCoolantTemperature() + 48.373) / 0.75), 1);
}
} }
void canMazdaRX8(void) { void canMazdaRX8(void) {
commonTxInit(CAN_MAZDA_RX_STEERING_WARNING); {
CanTxMessage msg(CAN_MAZDA_RX_STEERING_WARNING);
// todo: something needs to be set here? see http://rusefi.com/wiki/index.php?title=Vehicle:Mazda_Rx8_2004 // todo: something needs to be set here? see http://rusefi.com/wiki/index.php?title=Vehicle:Mazda_Rx8_2004
sendCanMessage(); }
commonTxInit(CAN_MAZDA_RX_RPM_SPEED); {
CanTxMessage msg(CAN_MAZDA_RX_RPM_SPEED);
float kph = getVehicleSpeed(); float kph = getVehicleSpeed();
setShortValue(&txmsg, SWAP_UINT16(GET_RPM() * 4), 0); msg.setShortValue(SWAP_UINT16(GET_RPM() * 4), 0);
setShortValue(&txmsg, 0xFFFF, 2); msg.setShortValue(0xFFFF, 2);
setShortValue(&txmsg, SWAP_UINT16((int )(100 * kph + 10000)), 4); msg.setShortValue(SWAP_UINT16((int )(100 * kph + 10000)), 4);
setShortValue(&txmsg, 0, 6); msg.setShortValue(0, 6);
sendCanMessage(); }
commonTxInit(CAN_MAZDA_RX_STATUS_1); {
txmsg.data8[0] = 0xFE; //Unknown CanTxMessage msg(CAN_MAZDA_RX_STATUS_1);
txmsg.data8[1] = 0xFE; //Unknown msg[0] = 0xFE; //Unknown
txmsg.data8[2] = 0xFE; //Unknown msg[1] = 0xFE; //Unknown
txmsg.data8[3] = 0x34; //DSC OFF in combo with byte 5 Live data only seen 0x34 msg[2] = 0xFE; //Unknown
txmsg.data8[4] = 0x00; // B01000000; // Brake warning B00001000; //ABS warning msg[3] = 0x34; //DSC OFF in combo with byte 5 Live data only seen 0x34
txmsg.data8[5] = 0x40; // TCS in combo with byte 3 msg[4] = 0x00; // B01000000; // Brake warning B00001000; //ABS warning
txmsg.data8[6] = 0x00; // Unknown msg[5] = 0x40; // TCS in combo with byte 3
txmsg.data8[7] = 0x00; // Unused msg[6] = 0x00; // Unknown
sendCanMessage(); msg[7] = 0x00; // Unused
}
commonTxInit(CAN_MAZDA_RX_STATUS_2); {
txmsg.data8[0] = (uint8_t)(getCoolantTemperature() + 69); //temp gauge //~170 is red, ~165 last bar, 152 centre, 90 first bar, 92 second bar CanTxMessage msg(CAN_MAZDA_RX_STATUS_2);
txmsg.data8[1] = ((int16_t)(engine->engineState.vssEventCounter*(engineConfiguration->vehicleSpeedCoef*0.277*2.58))) & 0xff; msg[0] = (uint8_t)(getCoolantTemperature() + 69); //temp gauge //~170 is red, ~165 last bar, 152 centre, 90 first bar, 92 second bar
txmsg.data8[2] = 0x00; // unknown msg[1] = ((int16_t)(engine->engineState.vssEventCounter*(engineConfiguration->vehicleSpeedCoef*0.277*2.58))) & 0xff;
txmsg.data8[3] = 0x00; //unknown msg[2] = 0x00; // unknown
txmsg.data8[4] = 0x01; //Oil Pressure (not really a gauge) msg[3] = 0x00; //unknown
txmsg.data8[5] = 0x00; //check engine light msg[4] = 0x01; //Oil Pressure (not really a gauge)
txmsg.data8[6] = 0x00; //Coolant, oil and battery msg[5] = 0x00; //check engine light
msg[6] = 0x00; //Coolant, oil and battery
if ((GET_RPM()>0) && (engine->sensors.vBatt<13)) { if ((GET_RPM()>0) && (engine->sensors.vBatt<13)) {
setTxBit(6, 6); // battery light msg.setBit(6, 6); // battery light
} }
if (getCoolantTemperature() > 105) { if (getCoolantTemperature() > 105) {
setTxBit(6, 1); // coolant light, 101 - red zone, light means its get too hot msg.setBit(6, 1); // coolant light, 101 - red zone, light means its get too hot
} }
//oil pressure warning lamp bit is 7 //oil pressure warning lamp bit is 7
txmsg.data8[7] = 0x00; //unused msg[7] = 0x00; //unused
sendCanMessage(); }
} }
void canDashboardFiat(void) { void canDashboardFiat(void) {
{
//Fiat Dashboard //Fiat Dashboard
commonTxInit(CAN_FIAT_MOTOR_INFO); CanTxMessage msg(CAN_FIAT_MOTOR_INFO);
setShortValue(&txmsg, (int) (getCoolantTemperature() - 40), 3); //Coolant Temp msg.setShortValue((int) (getCoolantTemperature() - 40), 3); //Coolant Temp
setShortValue(&txmsg, GET_RPM() / 32, 6); //RPM msg.setShortValue(GET_RPM() / 32, 6); //RPM
sendCanMessage(); }
} }
void canDashboardVAG(void) { void canDashboardVAG(void) {
{
//VAG Dashboard //VAG Dashboard
commonTxInit(CAN_VAG_RPM); CanTxMessage msg(CAN_VAG_RPM);
setShortValue(&txmsg, GET_RPM() * 4, 2); //RPM msg.setShortValue(GET_RPM() * 4, 2); //RPM
sendCanMessage(); }
commonTxInit(CAN_VAG_CLT); {
setShortValue(&txmsg, (int) ((getCoolantTemperature() + 48.373) / 0.75), 1); //Coolant Temp CanTxMessage msg(CAN_VAG_CLT);
sendCanMessage(); msg.setShortValue((int) ((getCoolantTemperature() + 48.373) / 0.75), 1); //Coolant Temp
}
commonTxInit(CAN_VAG_CLT_V2); {
setShortValue(&txmsg, (int) ((getCoolantTemperature() + 48.373) / 0.75), 4); //Coolant Temp CanTxMessage msg(CAN_VAG_CLT_V2);
sendCanMessage(); msg.setShortValue((int) ((getCoolantTemperature() + 48.373) / 0.75), 4); //Coolant Temp
}
commonTxInit(CAN_VAG_IMMO); {
setShortValue(&txmsg, 0x80, 1); CanTxMessage msg(CAN_VAG_IMMO);
sendCanMessage(); msg.setShortValue(0x80, 1);
}
} }
#endif // EFI_CAN_SUPPORT #endif // EFI_CAN_SUPPORT

35
firmware/hw_layer/drivers/can/can_hw.cpp
View File

@ -69,41 +69,6 @@ static const CANConfig canConfig1000 = {
CAN_MCR_ABOM | CAN_MCR_AWUM | CAN_MCR_TXFP, CAN_MCR_ABOM | CAN_MCR_AWUM | CAN_MCR_TXFP,
CAN_BTR_1k0 }; CAN_BTR_1k0 };
CANTxFrame txmsg;
void setTxBit(int offset, int index) {
txmsg.data8[offset] = txmsg.data8[offset] | (1 << index);
}
void commonTxInit(int eid) {
memset(&txmsg, 0, sizeof(txmsg));
txmsg.IDE = CAN_IDE_STD;
txmsg.EID = eid;
txmsg.RTR = CAN_RTR_DATA;
txmsg.DLC = 8;
}
/**
* send CAN message from txmsg buffer
*/
void sendCanMessage(int size) {
CANDriver *device = detectCanDevice(CONFIG(canRxPin),
CONFIG(canTxPin));
if (device == NULL) {
warning(CUSTOM_ERR_CAN_CONFIGURATION, "CAN configuration issue");
return;
}
txmsg.DLC = size;
// 100 ms timeout
msg_t result = canTransmit(device, CAN_ANY_MAILBOX, &txmsg, TIME_MS2I(100));
if (result == MSG_OK) {
canWriteOk++;
} else {
canWriteNotOk++;
}
}
class CanRead final : public ThreadController<256> { class CanRead final : public ThreadController<256> {
public: public:
CanRead() CanRead()

3
firmware/hw_layer/drivers/can/can_hw.h
View File

@ -13,10 +13,7 @@
#endif /* EFI_TUNER_STUDIO */ #endif /* EFI_TUNER_STUDIO */
void initCan(void); void initCan(void);
void commonTxInit(int eid);
void sendCanMessage(int size = 8);
void setCanType(int type); void setCanType(int type);
void setTxBit(int offset, int index);
#if EFI_CAN_SUPPORT #if EFI_CAN_SUPPORT
void stopCanPins(DECLARE_ENGINE_PARAMETER_SIGNATURE); void stopCanPins(DECLARE_ENGINE_PARAMETER_SIGNATURE);