Crash_Override
/
OVMS3
2
0
Fork 0
Code Issues 5 Pull Requests Projects Releases 4 Wiki Activity

Compare commits

base: Crash_Override:34ad8c41b877dc73367510aaaf5415a99d10653b
Branches Tags
Crash_Override:master
Crash_Override:3.3.002-cs143
Crash_Override:3.3.002-cs133
Crash_Override:3.3.002-cs126
Crash_Override:3.3.002-cs109
Crash_Override:3.3.002-cs107
...
compare: Crash_Override:f0aa4187c7d08a81e3f3b9f315fb05a24dc9e853
Branches Tags
Crash_Override:master
Crash_Override:3.3.002-cs143
Crash_Override:3.3.002-cs133
Crash_Override:3.3.002-cs126
Crash_Override:3.3.002-cs109
Crash_Override:3.3.002-cs107

2 Commits
34ad8c41b8 ... f0aa4187c7

Author SHA1 Message Date
Carsten Schmiemann f0aa4187c7 Re arrange can bus interfaces, disable logging because crash 2022-11-20 23:46:21 +01:00
Carsten Schmiemann c1a2b4dbf8 Try menu structure for future command 2022-11-20 23:42:02 +01:00
3 changed files with 24 additions and 8 deletions
Show Stats Expand all files Collapse all files

6
OVMS.V3/components/vehicle_renaultzoe_ph2_can/src/ph2_commands.cpp
View File

@ -43,9 +43,9 @@
void OvmsVehicleRenaultZoePh2CAN::CanInit()
{
OvmsCommand* cmd;
OvmsCommand* obd;
obd = cmd_zoe_ph2->RegisterCommand("can", "CAN tools");
cmd = obd->RegisterCommand("request", "Send ISO-TP request, output response");
OvmsCommand* ph2;
ph2 = cmd_zoe_ph2->RegisterCommand("ph2", "Zoe Ph2 CAN tools");
cmd = ph2->RegisterCommand("request", "Send ISO-TP request, output response");
cmd->RegisterCommand("device", "Send ISO-TP request to a ECU", shell_can_request, "<txid> <rxid> <request>", 3, 3);
cmd->RegisterCommand("broadcast", "Send ISO-TP request as broadcast", shell_can_request, "<request>", 1, 1);
}

25
OVMS.V3/components/vehicle_renaultzoe_ph2_can/src/vehicle_renaultzoe_ph2_can.cpp
View File

@ -56,10 +56,12 @@ OvmsVehicleRenaultZoePh2CAN::OvmsVehicleRenaultZoePh2CAN() {
MyConfig.RegisterParam("xrz2c", "Renault Zoe Ph2 (CAN) configuration", true, true);
ConfigChanged(NULL);
// CAN1: Init Zoe Ph2 M-CAN Interface
// CAN1: Init Zoe Ph2 M-CAN bus
RegisterCanBus(1, CAN_MODE_ACTIVE, CAN_SPEED_500KBPS);
// CAN1: Init Zoe Ph2 V1-CAN Interface
// CAN2: Init Zoe Ph2 EXT-CAN bus
RegisterCanBus(2, CAN_MODE_LISTEN, CAN_SPEED_500KBPS);
// CAN3: Init Zoe Ph2 V1-CAN bus
RegisterCanBus(3, CAN_MODE_LISTEN, CAN_SPEED_500KBPS);
POLLSTATE_OFF;
ESP_LOGI(TAG, "Pollstate switched to OFF");
@ -143,7 +145,8 @@ void OvmsVehicleRenaultZoePh2CAN::ZoeWakeUp() {
*/
void OvmsVehicleRenaultZoePh2CAN::IncomingFrameCan1(CAN_frame_t* p_frame) {
uint8_t *data = p_frame->data.u8;
ESP_LOGI(TAG, "M-CAN: PID:%x DATA: %02x %02x %02x %02x %02x %02x %02x %02x", p_frame->MsgID, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
//ESP_LOGI(TAG, "M-CAN: PID:%x DATA: %02x %02x %02x %02x %02x %02x %02x %02x", p_frame->MsgID, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
//tooooooo many packets, OVMS will crash with logging
//If a CAN message comes in, start polling
if (!mt_bus_awake->AsBool()) {
@ -154,11 +157,23 @@ void OvmsVehicleRenaultZoePh2CAN::IncomingFrameCan1(CAN_frame_t* p_frame) {
}
/**
* Handles incoming CAN-frames on bus 2, connected to V1-CAN
* Handles incoming CAN-frames on bus 2, connected to EXT-CAN
*/
void OvmsVehicleRenaultZoePh2CAN::IncomingFrameCan2(CAN_frame_t* p_frame) {
uint8_t *data = p_frame->data.u8;
ESP_LOGI(TAG, "V1-CAN: PID:%x DATA: %02x %02x %02x %02x %02x %02x %02x %02x", p_frame->MsgID, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
//ESP_LOGI(TAG, "V1-CAN: PID:%x DATA: %02x %02x %02x %02x %02x %02x %02x %02x", p_frame->MsgID, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
//tooooooo many packets, OVMS will crash with logging
//ToDo: Analyse PIDs and copy data to useful metrics
}
/**
* Handles incoming CAN-frames on bus 3, connected to V1-CAN
*/
void OvmsVehicleRenaultZoePh2CAN::IncomingFrameCan3(CAN_frame_t* p_frame) {
uint8_t *data = p_frame->data.u8;
//ESP_LOGI(TAG, "V1-CAN: PID:%x DATA: %02x %02x %02x %02x %02x %02x %02x %02x", p_frame->MsgID, data[0], data[1], data[2], data[3], data[4], data[5], data[6], data[7]);
//tooooooo many packets, OVMS will crash with logging
//ToDo: Analyse PIDs and copy data to useful metrics
}

1
OVMS.V3/components/vehicle_renaultzoe_ph2_can/src/vehicle_renaultzoe_ph2_can.h
View File

@ -69,6 +69,7 @@ class OvmsVehicleRenaultZoePh2CAN : public OvmsVehicle {
void ZoeWakeUp();
void IncomingFrameCan1(CAN_frame_t* p_frame);
void IncomingFrameCan2(CAN_frame_t* p_frame);
void IncomingFrameCan3(CAN_frame_t* p_frame);
void IncomingPollReply(canbus* bus, uint16_t type, uint16_t pid, uint8_t* data, uint8_t length, uint16_t remain);
void WebInit();
void WebDeInit();