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

Revert back to unit16 PID like original, misinterpreted addresses

This commit is contained in:
Carsten Schmiemann 2022-04-12 19:53:42 +02:00
parent b393183b4a
commit 925f8a5163
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OVMS.V3/components/vehicle/vehicle.h
View File

@ -523,7 +523,7 @@ class OvmsVehicle : public InternalRamAllocated
uint16_t type; // UDS poll type / OBD2 "mode", see VEHICLE_POLL_TYPE_…
union
{
uint32_t pid; // PID (shortcut for requests w/o payload)
uint16_t pid; // PID (shortcut for requests w/o payload)
struct
{
uint16_t pid; // PID for requests with additional payload

14
OVMS.V3/components/vehicle_renaultzoe_ph2/src/vehicle_renaultzoe_ph2.cpp
View File

@ -172,7 +172,7 @@ void OvmsVehicleRenaultZoePh2::IncomingFrameCan1(CAN_frame_t* p_frame) {
/**
* Handles incoming poll results
*/
void OvmsVehicleRenaultZoePh2::IncomingPollReply(canbus* bus, uint16_t type, uint32_t pid, uint8_t* data, uint8_t length, uint16_t remain) {
void OvmsVehicleRenaultZoePh2::IncomingPollReply(canbus* bus, uint16_t type, uint16_t pid, uint8_t* data, uint8_t length, uint16_t remain) {
string& rxbuf = zoe_obd_rxbuf;
static uint32_t last_pid = -1;
@ -223,7 +223,7 @@ void OvmsVehicleRenaultZoePh2::IncomingPollReply(canbus* bus, uint16_t type, uin
/**
* Handle incoming polls from the motor inverter
*/
void OvmsVehicleRenaultZoePh2::IncomingINV(uint16_t type, uint32_t pid, const char* data, uint16_t len) {
void OvmsVehicleRenaultZoePh2::IncomingINV(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
switch (pid) {
case 0x700F: { // Motor temperature
StandardMetrics.ms_v_mot_temp->SetValue(CAN_BYTE(0), Celcius);
@ -234,7 +234,7 @@ void OvmsVehicleRenaultZoePh2::IncomingINV(uint16_t type, uint32_t pid, const ch
/**
* Handle incoming polls from the EVC Computer
*/
void OvmsVehicleRenaultZoePh2::IncomingEVC(uint16_t type, uint32_t pid, const char* data, uint16_t len) {
void OvmsVehicleRenaultZoePh2::IncomingEVC(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
switch (pid) {
case 0x2006: { // Odometer (Total Vehicle Distance)
StandardMetrics.ms_v_pos_odometer->SetValue((float) CAN_UINT24(0), Kilometers);
@ -272,7 +272,7 @@ void OvmsVehicleRenaultZoePh2::IncomingEVC(uint16_t type, uint32_t pid, const ch
/**
* Handle incoming polls from the BCB Computer
*/
void OvmsVehicleRenaultZoePh2::IncomingBCB(uint16_t type, uint32_t pid, const char* data, uint16_t len) {
void OvmsVehicleRenaultZoePh2::IncomingBCB(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
switch (pid) {
case 0x504A: {
// 793,24,39,1,20000,0,W,504A,62504A,ff\n" // Mains active power consumed
@ -322,7 +322,7 @@ void OvmsVehicleRenaultZoePh2::IncomingBCB(uint16_t type, uint32_t pid, const ch
/**
* Handle incoming polls from the LBC Computer
*/
void OvmsVehicleRenaultZoePh2::IncomingLBC(uint16_t type, uint32_t pid, const char* data, uint16_t len) {
void OvmsVehicleRenaultZoePh2::IncomingLBC(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
switch (pid) {
case 0x20B6: {
StandardMetrics.ms_v_bat_voltage->SetValue((float) (CAN_UINT(0)));
@ -391,7 +391,7 @@ void OvmsVehicleRenaultZoePh2::IncomingLBC(uint16_t type, uint32_t pid, const ch
/**
* Handle incoming polls from the UBP Computer
*/
void OvmsVehicleRenaultZoePh2::IncomingUCH(uint16_t type, uint32_t pid, const char* data, uint16_t len) {
void OvmsVehicleRenaultZoePh2::IncomingUCH(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
switch (pid) {
case 0x4B7C: {
// Todo
@ -409,7 +409,7 @@ void OvmsVehicleRenaultZoePh2::IncomingUCH(uint16_t type, uint32_t pid, const ch
/**
* Handle incoming polls from the PEB Computer
*/
void OvmsVehicleRenaultZoePh2::IncomingPEB(uint16_t type, uint32_t pid, const char* data, uint16_t len) {
void OvmsVehicleRenaultZoePh2::IncomingPEB(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
switch (pid) {
case 0x3018: {
// 77e,24,39,0.015625,0,2,ºC,3018,623018,ff\n" // DCDC converter temperature

14
OVMS.V3/components/vehicle_renaultzoe_ph2/src/vehicle_renaultzoe_ph2.h
View File

@ -74,15 +74,15 @@ class OvmsVehicleRenaultZoePh2 : public OvmsVehicle {
static OvmsVehicleRenaultZoePh2* GetInstance(OvmsWriter* writer=NULL);
void IncomingFrameCan1(CAN_frame_t* p_frame);
void IncomingPollReply(canbus* bus, uint16_t type, uint32_t pid, uint8_t* data, uint8_t length, uint16_t remain);
void IncomingPollReply(canbus* bus, uint16_t type, uint16_t pid, uint8_t* data, uint8_t length, uint16_t remain);
protected:
void IncomingINV(uint16_t type, uint32_t pid, const char* data, uint16_t len);
void IncomingEVC(uint16_t type, uint32_t pid, const char* data, uint16_t len);
void IncomingBCB(uint16_t type, uint32_t pid, const char* data, uint16_t len);
void IncomingLBC(uint16_t type, uint32_t pid, const char* data, uint16_t len);
void IncomingUCH(uint16_t type, uint32_t pid, const char* data, uint16_t len);
void IncomingPEB(uint16_t type, uint32_t pid, const char* data, uint16_t len);
void IncomingINV(uint16_t type, uint16_t pid, const char* data, uint16_t len);
void IncomingEVC(uint16_t type, uint16_t pid, const char* data, uint16_t len);
void IncomingBCB(uint16_t type, uint16_t pid, const char* data, uint16_t len);
void IncomingLBC(uint16_t type, uint16_t pid, const char* data, uint16_t len);
void IncomingUCH(uint16_t type, uint16_t pid, const char* data, uint16_t len);
void IncomingPEB(uint16_t type, uint16_t pid, const char* data, uint16_t len);
void car_on(bool isOn);
virtual void Ticker1(uint32_t ticker);
virtual void Ticker10(uint32_t ticker);