Fix compile ph2 vehicle module and speed up build by disabling other modules
This commit is contained in:
parent
f6c805db1a
commit
04794f2f86
|
@ -523,7 +523,7 @@ class OvmsVehicle : public InternalRamAllocated
|
|||
uint16_t type; // UDS poll type / OBD2 "mode", see VEHICLE_POLL_TYPE_…
|
||||
union
|
||||
{
|
||||
uint16_t pid; // PID (shortcut for requests w/o payload)
|
||||
uint32_t pid; // PID (shortcut for requests w/o payload)
|
||||
struct
|
||||
{
|
||||
uint16_t pid; // PID for requests with additional payload
|
||||
|
|
|
@ -218,7 +218,7 @@ OvmsVehicle::vehicle_command_t OvmsVehicleRenaultZoe::CommandTrip(int verbosity,
|
|||
void OvmsVehicleRenaultZoe::NotifyTrip() {
|
||||
StringWriter buf(200);
|
||||
CommandTrip(COMMAND_RESULT_NORMAL, &buf);
|
||||
MyNotify.NotifyString("info","xrz.trip",buf.c_str());
|
||||
MyNotify.NotifyString("info","zph2.trip",buf.c_str());
|
||||
}
|
||||
|
||||
OvmsVehicle::vehicle_command_t OvmsVehicleRenaultZoe::CommandStat(int verbosity, OvmsWriter* writer) {
|
||||
|
|
|
@ -54,12 +54,12 @@ static const char *TAG = "v-zoe-ph2";
|
|||
// Pollstate 3 - POLLSTATE_CHARGING - car is charging
|
||||
static const OvmsVehicle::poll_pid_t renault_zoe_polls[] = {
|
||||
//LBC
|
||||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x229001, { 0, 10, 10, 10 }, ISOTP_EXTFRAME }, // SOC
|
||||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2291BC, { 0, 10, 10, 10 }, ISOTP_EXTFRAME }, // SOH
|
||||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x229001, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // SOC
|
||||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2291BC, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // SOH
|
||||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIGROUP, 0x229131, { 0, 60, 600, 60 }, 0, ISOTP_EXTFRAME }, // Temp Bat Module 1
|
||||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIGROUP, 0x229021, { 0, 60, 600, 60 }, 0, ISOTP_EXTFRAME }, // Cell Bat Module 1-62
|
||||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIGROUP, 0x229062, { 0, 60, 600, 60 }, 0, ISOTP_EXTFRAME }, // Cell Bat Module 63-96
|
||||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2220B6, { 0, 10, 10, 10 }, ISOTP_EXTFRAME }, // Battery Voltage
|
||||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2220B6, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // Battery Voltage
|
||||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x22900D, { 0, 30, 1, 2 }, 0, ISOTP_EXTFRAME }, // Battery Current
|
||||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x22291C8, { 0, 30, 1, 2 }, 0, ISOTP_EXTFRAME }, // Battery Available Energy kWh
|
||||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x229243, { 0, 30, 1, 2 }, 0, ISOTP_EXTFRAME }, // Energy charged kWh
|
||||
|
@ -68,20 +68,21 @@ static const OvmsVehicle::poll_pid_t renault_zoe_polls[] = {
|
|||
{ 0x18dadbf1, 0x18daf1db, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2221D9, { 0, 30, 1, 2 }, 0, ISOTP_EXTFRAME }, // Charging State (1: Slow, 2: Fast, 3: Init Charging)
|
||||
|
||||
//EVC-HCM-VCM
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x222006, { 0, 10, 10, 10 }, ISOTP_EXTFRAME }, // Odometer
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2221DF, { 0, 10, 10, 10 }, ISOTP_EXTFRAME }, // 12Battery Current
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x222005, { 0, 10, 10, 10 }, ISOTP_EXTFRAME }, // 12Battery Voltage
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2221D0, { 0, 10, 10, 10 }, ISOTP_EXTFRAME }, // DCDC Temperature
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2221CB, { 0, 10, 10, 10 }, ISOTP_EXTFRAME }, // DCDC Activation
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2221CF, { 0, 10, 10, 10 }, ISOTP_EXTFRAME }, // Inverter Status
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x22303D, { 0, 10, 10, 10 }, ISOTP_EXTFRAME }, // HV Battery Insulation Resistance
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x222006, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // Odometer
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2221DF, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // 12Battery Current
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x222005, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // 12Battery Voltage
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2221D0, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // DCDC Temperature
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2221CB, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // DCDC Activation
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x2221CF, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // Inverter Status
|
||||
{ 0x18daf1da, 0x18dadaf1, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x22303D, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // HV Battery Insulation Resistance
|
||||
|
||||
//Motor Inverter
|
||||
{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x22700F, { 0, 10, 10, 10 }, ISOTP_EXTFRAME }, // Stator Temperature 1
|
||||
{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x227010, { 0, 10, 10, 10 }, ISOTP_EXTFRAME }, // Stator Temperature 2
|
||||
{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x22700F, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // Stator Temperature 1
|
||||
{ 0x18dadff1, 0x18daf1df, VEHICLE_POLL_TYPE_OBDIIEXTENDED, 0x227010, { 0, 10, 10, 10 }, 0, ISOTP_EXTFRAME }, // Stator Temperature 2
|
||||
POLL_LIST_END
|
||||
};
|
||||
|
||||
|
||||
OvmsVehicleRenaultZoePh2* OvmsVehicleRenaultZoePh2::GetInstance(OvmsWriter* writer /*=NULL*/)
|
||||
{
|
||||
OvmsVehicleRenaultZoePh2* zoe = (OvmsVehicleRenaultZoePh2*) MyVehicleFactory.ActiveVehicle();
|
||||
|
@ -94,6 +95,7 @@ OvmsVehicleRenaultZoePh2* OvmsVehicleRenaultZoePh2::GetInstance(OvmsWriter* writ
|
|||
return zoe;
|
||||
}
|
||||
|
||||
|
||||
OvmsVehicleRenaultZoePh2::OvmsVehicleRenaultZoePh2() {
|
||||
ESP_LOGI(TAG, "Start Renault Zoe Ph2 vehicle module");
|
||||
|
||||
|
@ -116,12 +118,10 @@ OvmsVehicleRenaultZoePh2::OvmsVehicleRenaultZoePh2() {
|
|||
mt_pos_odometer_start = MyMetrics.InitFloat("zph2.v.pos.odometer.start", SM_STALE_MID, 0, Kilometers);
|
||||
mt_bus_awake = MyMetrics.InitBool("zph2.v.bus.awake", SM_STALE_MIN, false);
|
||||
mt_available_energy = MyMetrics.InitFloat("zph2.v.avail.energy", SM_STALE_MID, 0, kWh);
|
||||
mt_heatwater_temp = MyMetrics.InitFloat("zph2.v.heatwater.temp", SM_STALE_MID, 0, Celcius);
|
||||
mt_main_power_consumed = MyMetrics.InitFloat("zph2.c.main.power.consumed", SM_STALE_MID, 0, kWh);
|
||||
|
||||
// init commands:
|
||||
cmd_zoe = MyCommandApp.RegisterCommand("zoe-ph2", "Renault Zoe Ph2");
|
||||
cmd_zoe->RegisterCommand("trip", "Show vehicle trip", zoe_trip);
|
||||
|
||||
// BMS configuration:
|
||||
BmsSetCellArrangementVoltage(96, 8);
|
||||
|
@ -162,17 +162,14 @@ void OvmsVehicleRenaultZoePh2::IncomingFrameCan1(CAN_frame_t* p_frame) {
|
|||
|
||||
m_candata_timer = RZ_CANDATA_TIMEOUT;
|
||||
*/
|
||||
|
||||
static bool isCharging = false;
|
||||
static bool lastCharging = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handles incoming poll results
|
||||
*/
|
||||
void OvmsVehicleRenaultZoePh2::IncomingPollReply(canbus* bus, uint16_t type, uint16_t pid, uint8_t* data, uint8_t length, uint16_t remain) {
|
||||
void OvmsVehicleRenaultZoePh2::IncomingPollReply(canbus* bus, uint16_t type, uint32_t pid, uint8_t* data, uint8_t length, uint16_t remain) {
|
||||
string& rxbuf = zoe_obd_rxbuf;
|
||||
static uint16_t last_pid = -1;
|
||||
static uint32_t last_pid = -1;
|
||||
|
||||
if (pid != last_pid) {
|
||||
ESP_LOGD(TAG, "pid: %04x length: %d m_poll_ml_remain: %d m_poll_ml_frame: %d", pid, length, m_poll_ml_remain, m_poll_ml_frame);
|
||||
|
@ -221,7 +218,7 @@ void OvmsVehicleRenaultZoePh2::IncomingPollReply(canbus* bus, uint16_t type, uin
|
|||
/**
|
||||
* Handle incoming polls from the motor inverter
|
||||
*/
|
||||
void OvmsVehicleRenaultZoePh2::IncomingINV(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
|
||||
void OvmsVehicleRenaultZoePh2::IncomingINV(uint16_t type, uint32_t pid, const char* data, uint16_t len) {
|
||||
switch (pid) {
|
||||
case 0x22700F: { // Motor temperature
|
||||
StandardMetrics.ms_v_mot_temp->SetValue(CAN_BYTE(0), Celcius);
|
||||
|
@ -232,40 +229,31 @@ void OvmsVehicleRenaultZoePh2::IncomingINV(uint16_t type, uint16_t pid, const ch
|
|||
/**
|
||||
* Handle incoming polls from the EVC Computer
|
||||
*/
|
||||
void OvmsVehicleRenaultZoePh2::IncomingEVC(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
|
||||
void OvmsVehicleRenaultZoePh2::IncomingEVC(uint16_t type, uint32_t pid, const char* data, uint16_t len) {
|
||||
switch (pid) {
|
||||
case 0x222006: { // Odometer (Total Vehicle Distance)
|
||||
StandardMetrics.ms_v_pos_odometer->SetValue((float) CAN_UINT24(0), Kilometers);
|
||||
break;
|
||||
}
|
||||
case 0x2221DF: {
|
||||
// Todo
|
||||
StandardMetrics.ms_v_charge_12v_current->SetValue((float) (CAN_UINT(0)));
|
||||
break;
|
||||
}
|
||||
case 0x222005: {
|
||||
// Todo
|
||||
StandardMetrics.ms_v_charge_12v_voltage->SetValue((float) (CAN_UINT(0)));
|
||||
break;
|
||||
}
|
||||
case 0x2221D0: {
|
||||
// Todo
|
||||
StandardMetrics.ms_v_gen_temp->SetValue((float) (CAN_UINT(0)));
|
||||
break;
|
||||
}
|
||||
case 0x2221CB: {
|
||||
// Todo
|
||||
StandardMetrics.ms_v_gen_statee->SetValue((float) (CAN_UINT(0)));
|
||||
StandardMetrics.ms_v_gen_state->SetValue((char*) (CAN_BYTE(0)));
|
||||
break;
|
||||
}
|
||||
case 0x33F6: {
|
||||
// ,7ec,24,31,1,40,0,°C,2233F6,6233F6,ff,Temperature of the inverter given by PEB (CAN ETS)
|
||||
ESP_LOGD(TAG, "7ec inv temp: %d", CAN_BYTE(0) - 40);
|
||||
if (IsKangoo()) {
|
||||
int temp = CAN_BYTE(0);
|
||||
if (temp != 0)
|
||||
StandardMetrics.ms_v_charge_temp->SetValue(temp - 40);
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 0x33dc: {
|
||||
|
@ -279,7 +267,7 @@ void OvmsVehicleRenaultZoePh2::IncomingEVC(uint16_t type, uint16_t pid, const ch
|
|||
/**
|
||||
* Handle incoming polls from the BCB Computer
|
||||
*/
|
||||
void OvmsVehicleRenaultZoePh2::IncomingBCB(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
|
||||
void OvmsVehicleRenaultZoePh2::IncomingBCB(uint16_t type, uint32_t pid, const char* data, uint16_t len) {
|
||||
switch (pid) {
|
||||
case 0x504A: {
|
||||
// 793,24,39,1,20000,0,W,22504A,62504A,ff\n" // Mains active power consumed
|
||||
|
@ -329,35 +317,29 @@ void OvmsVehicleRenaultZoePh2::IncomingBCB(uint16_t type, uint16_t pid, const ch
|
|||
/**
|
||||
* Handle incoming polls from the LBC Computer
|
||||
*/
|
||||
void OvmsVehicleRenaultZoePh2::IncomingLBC(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
|
||||
void OvmsVehicleRenaultZoePh2::IncomingLBC(uint16_t type, uint32_t pid, const char* data, uint16_t len) {
|
||||
switch (pid) {
|
||||
case 0x2220B6: {
|
||||
// Todo
|
||||
StandardMetrics.ms_v_bat_voltage->SetValue((float) (CAN_UINT(0)));
|
||||
break;
|
||||
}
|
||||
case 0x22900D: {
|
||||
// Todo
|
||||
StandardMetrics.ms_v_bat_voltage->SetValue((float) (CAN_UINT(0)));
|
||||
break;
|
||||
}
|
||||
case 0x229001: {
|
||||
// Todo
|
||||
StandardMetrics.ms_v_bat_soc->SetValue((float) (CAN_UINT(0)));
|
||||
break;
|
||||
}
|
||||
case 0x2291BC: {
|
||||
// Todo
|
||||
StandardMetrics.ms_v_bat_soh->SetValue((float) (CAN_UINT(0)));
|
||||
break;
|
||||
}
|
||||
case 0x229244: {
|
||||
// Todo
|
||||
StandardMetrics.ms_v_bat_energy_used->SetValue((float) (CAN_UINT(0)));
|
||||
break;
|
||||
}
|
||||
case 0x229246: {
|
||||
// Todo
|
||||
StandardMetrics.ms_v_bat_energy_recd->SetValue((float) (CAN_UINT(0)));
|
||||
break;
|
||||
}
|
||||
|
@ -404,7 +386,7 @@ void OvmsVehicleRenaultZoePh2::IncomingLBC(uint16_t type, uint16_t pid, const ch
|
|||
/**
|
||||
* Handle incoming polls from the UBP Computer
|
||||
*/
|
||||
void OvmsVehicleRenaultZoePh2::IncomingUCH(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
|
||||
void OvmsVehicleRenaultZoePh2::IncomingUCH(uint16_t type, uint32_t pid, const char* data, uint16_t len) {
|
||||
switch (pid) {
|
||||
case 0x4B7C: {
|
||||
// Todo
|
||||
|
@ -422,7 +404,7 @@ void OvmsVehicleRenaultZoePh2::IncomingUCH(uint16_t type, uint16_t pid, const ch
|
|||
/**
|
||||
* Handle incoming polls from the PEB Computer
|
||||
*/
|
||||
void OvmsVehicleRenaultZoePh2::IncomingPEB(uint16_t type, uint16_t pid, const char* data, uint16_t len) {
|
||||
void OvmsVehicleRenaultZoePh2::IncomingPEB(uint16_t type, uint32_t pid, const char* data, uint16_t len) {
|
||||
switch (pid) {
|
||||
case 0x3018: {
|
||||
// 77e,24,39,0.015625,0,2,ºC,223018,623018,ff\n" // DCDC converter temperature
|
||||
|
|
|
@ -72,21 +72,23 @@ class OvmsVehicleRenaultZoePh2 : public OvmsVehicle {
|
|||
OvmsVehicleRenaultZoePh2();
|
||||
~OvmsVehicleRenaultZoePh2();
|
||||
static OvmsVehicleRenaultZoePh2* GetInstance(OvmsWriter* writer=NULL);
|
||||
|
||||
void IncomingFrameCan1(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 IncomingPollReply(canbus* bus, uint16_t type, uint32_t pid, uint8_t* data, uint8_t length, uint16_t remain);
|
||||
|
||||
protected:
|
||||
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 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 car_on(bool isOn);
|
||||
virtual void Ticker1(uint32_t ticker);
|
||||
virtual void Ticker10(uint32_t ticker);
|
||||
void HandleCharging();
|
||||
void HandleEnergy();
|
||||
void NotifyTrip();
|
||||
int calcMinutesRemaining(float target, float charge_voltage, float charge_current);
|
||||
|
||||
OvmsCommand *cmd_zoe;
|
||||
|
@ -97,9 +99,6 @@ class OvmsVehicleRenaultZoePh2 : public OvmsVehicle {
|
|||
OvmsMetricFloat *mt_available_energy; // Available Energy
|
||||
OvmsMetricFloat *mt_main_power_consumed; // Mains active power consumed
|
||||
|
||||
// Rnault Kangoo metrics
|
||||
OvmsMetricFloat *mt_heatwater_temp; // Heat Water Temp
|
||||
|
||||
public:
|
||||
void WebInit();
|
||||
void WebDeInit();
|
||||
|
@ -108,21 +107,9 @@ class OvmsVehicleRenaultZoePh2 : public OvmsVehicle {
|
|||
void ConfigChanged(OvmsConfigParam* param);
|
||||
bool SetFeature(int key, const char* value);
|
||||
const std::string GetFeature(int key);
|
||||
|
||||
public:
|
||||
//virtual vehicle_command_t CommandSetChargeCurrent(uint16_t limit);
|
||||
//virtual vehicle_command_t CommandStat(int verbosity, OvmsWriter* writer);
|
||||
virtual vehicle_command_t CommandWakeup();
|
||||
virtual vehicle_command_t CommandClimateControl(bool enable);
|
||||
virtual vehicle_command_t CommandLock(const char* pin);
|
||||
virtual vehicle_command_t CommandUnlock(const char* pin);
|
||||
virtual vehicle_command_t CommandHomelink(int button, int durationms=1000);
|
||||
virtual vehicle_command_t CommandActivateValet(const char* pin);
|
||||
virtual vehicle_command_t CommandDeactivateValet(const char* pin);
|
||||
virtual vehicle_command_t CommandTrip(int verbosity, OvmsWriter* writer);
|
||||
virtual vehicle_command_t CommandStat(int verbosity, OvmsWriter* writer);
|
||||
void NotifyTrip();
|
||||
|
||||
|
||||
protected:
|
||||
bool m_enable_write; // canwrite
|
||||
char zoe_vin[8] = ""; // last 7 digits of full VIN
|
||||
|
@ -137,19 +124,9 @@ class OvmsVehicleRenaultZoePh2 : public OvmsVehicle {
|
|||
unsigned int m_candata_timer;
|
||||
unsigned int m_candata_poll;
|
||||
|
||||
public:
|
||||
static void zoe_trip(int verbosity, OvmsWriter* writer, OvmsCommand* cmd, int argc, const char* const* argv);
|
||||
|
||||
protected:
|
||||
string zoe_obd_rxbuf;
|
||||
|
||||
public:
|
||||
bool IsZoe() {
|
||||
return m_vehicle_type == 0;
|
||||
}
|
||||
bool IsKangoo() {
|
||||
return m_vehicle_type == 1;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
#endif //#ifndef __VEHICLE_RENAUTZOE_H__
|
||||
#endif //#ifndef __VEHICLE_RENAULTZOE_PH2_H__
|
||||
|
|
|
@ -399,7 +399,7 @@ config OVMS_VEHICLE_RENAULTZOE
|
|||
depends on OVMS
|
||||
depends on OVMS_COMP_CANOPEN
|
||||
help
|
||||
Enable to include support for Renault Zoe vehicles.
|
||||
Enable to include support for Renault Zoe Ph1 vehicles.
|
||||
|
||||
config OVMS_VEHICLE_MAXED3
|
||||
bool "Include support for Maxus eDeliver3 vehicle"
|
||||
|
@ -559,6 +559,14 @@ config OVMS_VEHICLE_CAN_RX_QUEUE_SIZE
|
|||
help
|
||||
The size of the CAN bus RX queue (at the vehicle component).
|
||||
|
||||
config OVMS_VEHICLE_RENAULTZOE_PH2
|
||||
bool "Include support for Renault Zoe PH2 vehicles"
|
||||
default y
|
||||
depends on OVMS
|
||||
depends on OVMS_COMP_CANOPEN
|
||||
help
|
||||
Enable to include support for Renault Zoe Ph2 vehicles.
|
||||
|
||||
endmenu # Vehicle Support
|
||||
|
||||
|
||||
|
|
|
@ -663,32 +663,32 @@ CONFIG_OVMS_VEHICLE_NONE=y
|
|||
CONFIG_OVMS_VEHICLE_OBDII=y
|
||||
CONFIG_OVMS_VEHICLE_TRACK=y
|
||||
CONFIG_OVMS_VEHICLE_DEMO=y
|
||||
CONFIG_OVMS_VEHICLE_TESLAROADSTER=y
|
||||
CONFIG_OVMS_VEHICLE_TESLAMODELS=y
|
||||
CONFIG_OVMS_VEHICLE_TESLAMODEL3=y
|
||||
CONFIG_OVMS_VEHICLE_NISSANLEAF=y
|
||||
CONFIG_OVMS_VEHICLE_RENAULTTWIZY=y
|
||||
CONFIG_OVMS_VEHICLE_RENAULTZOE=y
|
||||
CONFIG_OVMS_VEHICLE_MAXED3=y
|
||||
CONFIG_OVMS_VEHICLE_KIASOULEV=y
|
||||
CONFIG_OVMS_VEHICLE_BOLTEV=y
|
||||
CONFIG_OVMS_VEHICLE_VOLTAMPERA=y
|
||||
CONFIG_OVMS_VEHICLE_THINKCITY=y
|
||||
CONFIG_OVMS_VEHICLE_SMARTED=y
|
||||
CONFIG_OVMS_VEHICLE_SMARTEQ=y
|
||||
CONFIG_OVMS_VEHICLE_MITSUBISHI=y
|
||||
CONFIG_OVMS_VEHICLE_ZEVA=y
|
||||
CONFIG_OVMS_VEHICLE_KIANIROEV=y
|
||||
CONFIG_OVMS_VEHICLE_FIAT500=y
|
||||
CONFIG_OVMS_VEHICLE_VWEUP=y
|
||||
CONFIG_OVMS_VEHICLE_MERCEDESB250E=y
|
||||
CONFIG_OVMS_VEHICLE_CADILLAC_C2_CTS=y
|
||||
CONFIG_OVMS_VEHICLE_CHEVROLET_C6_CORVETTE=y
|
||||
CONFIG_OVMS_VEHICLE_MG_EV=y
|
||||
CONFIG_OVMS_VEHICLE_BMWI3=y
|
||||
CONFIG_OVMS_VEHICLE_HYUNDAI_IONIQVFL=y
|
||||
CONFIG_OVMS_VEHICLE_JAGUARIPACE=y
|
||||
CONFIG_OVMS_VEHICLE_TOYOTARAV4EV=y
|
||||
CONFIG_OVMS_VEHICLE_TESLAROADSTER=n
|
||||
CONFIG_OVMS_VEHICLE_TESLAMODELS=n
|
||||
CONFIG_OVMS_VEHICLE_TESLAMODEL3=n
|
||||
CONFIG_OVMS_VEHICLE_NISSANLEAF=n
|
||||
CONFIG_OVMS_VEHICLE_RENAULTTWIZY=n
|
||||
CONFIG_OVMS_VEHICLE_RENAULTZOE=n
|
||||
CONFIG_OVMS_VEHICLE_MAXED3=n
|
||||
CONFIG_OVMS_VEHICLE_KIASOULEV=n
|
||||
CONFIG_OVMS_VEHICLE_BOLTEV=n
|
||||
CONFIG_OVMS_VEHICLE_VOLTAMPERA=n
|
||||
CONFIG_OVMS_VEHICLE_THINKCITY=n
|
||||
CONFIG_OVMS_VEHICLE_SMARTED=n
|
||||
CONFIG_OVMS_VEHICLE_SMARTEQ=n
|
||||
CONFIG_OVMS_VEHICLE_MITSUBISHI=n
|
||||
CONFIG_OVMS_VEHICLE_ZEVA=n
|
||||
CONFIG_OVMS_VEHICLE_KIANIROEV=n
|
||||
CONFIG_OVMS_VEHICLE_FIAT500=n
|
||||
CONFIG_OVMS_VEHICLE_VWEUP=n
|
||||
CONFIG_OVMS_VEHICLE_MERCEDESB250E=n
|
||||
CONFIG_OVMS_VEHICLE_CADILLAC_C2_CTS=n
|
||||
CONFIG_OVMS_VEHICLE_CHEVROLET_C6_CORVETTE=n
|
||||
CONFIG_OVMS_VEHICLE_MG_EV=n
|
||||
CONFIG_OVMS_VEHICLE_BMWI3=n
|
||||
CONFIG_OVMS_VEHICLE_HYUNDAI_IONIQVFL=n
|
||||
CONFIG_OVMS_VEHICLE_JAGUARIPACE=n
|
||||
CONFIG_OVMS_VEHICLE_TOYOTARAV4EV=n
|
||||
CONFIG_OVMS_VEHICLE_RXTASK_STACK=8192
|
||||
CONFIG_OVMS_VEHICLE_CAN_RX_QUEUE_SIZE=60
|
||||
CONFIG_OVMS_VEHICLE_RENAULTZOE_PH2=y
|
||||
|
|
|
@ -663,32 +663,32 @@ CONFIG_OVMS_VEHICLE_NONE=y
|
|||
CONFIG_OVMS_VEHICLE_OBDII=y
|
||||
CONFIG_OVMS_VEHICLE_TRACK=y
|
||||
CONFIG_OVMS_VEHICLE_DEMO=y
|
||||
CONFIG_OVMS_VEHICLE_TESLAROADSTER=y
|
||||
CONFIG_OVMS_VEHICLE_TESLAMODELS=y
|
||||
CONFIG_OVMS_VEHICLE_TESLAMODEL3=y
|
||||
CONFIG_OVMS_VEHICLE_NISSANLEAF=y
|
||||
CONFIG_OVMS_VEHICLE_RENAULTTWIZY=y
|
||||
CONFIG_OVMS_VEHICLE_RENAULTZOE=y
|
||||
CONFIG_OVMS_VEHICLE_MAXED3=y
|
||||
CONFIG_OVMS_VEHICLE_KIASOULEV=y
|
||||
CONFIG_OVMS_VEHICLE_BOLTEV=y
|
||||
CONFIG_OVMS_VEHICLE_VOLTAMPERA=y
|
||||
CONFIG_OVMS_VEHICLE_THINKCITY=y
|
||||
CONFIG_OVMS_VEHICLE_SMARTED=y
|
||||
CONFIG_OVMS_VEHICLE_SMARTEQ=y
|
||||
CONFIG_OVMS_VEHICLE_MITSUBISHI=y
|
||||
CONFIG_OVMS_VEHICLE_ZEVA=y
|
||||
CONFIG_OVMS_VEHICLE_KIANIROEV=y
|
||||
CONFIG_OVMS_VEHICLE_FIAT500=y
|
||||
CONFIG_OVMS_VEHICLE_VWEUP=y
|
||||
CONFIG_OVMS_VEHICLE_MERCEDESB250E=y
|
||||
CONFIG_OVMS_VEHICLE_CADILLAC_C2_CTS=y
|
||||
CONFIG_OVMS_VEHICLE_CHEVROLET_C6_CORVETTE=y
|
||||
CONFIG_OVMS_VEHICLE_MG_EV=y
|
||||
CONFIG_OVMS_VEHICLE_BMWI3=y
|
||||
CONFIG_OVMS_VEHICLE_HYUNDAI_IONIQVFL=y
|
||||
CONFIG_OVMS_VEHICLE_JAGUARIPACE=y
|
||||
CONFIG_OVMS_VEHICLE_TOYOTARAV4EV=y
|
||||
CONFIG_OVMS_VEHICLE_TESLAROADSTER=n
|
||||
CONFIG_OVMS_VEHICLE_TESLAMODELS=n
|
||||
CONFIG_OVMS_VEHICLE_TESLAMODEL3=n
|
||||
CONFIG_OVMS_VEHICLE_NISSANLEAF=n
|
||||
CONFIG_OVMS_VEHICLE_RENAULTTWIZY=n
|
||||
CONFIG_OVMS_VEHICLE_RENAULTZOE=n
|
||||
CONFIG_OVMS_VEHICLE_MAXED3=n
|
||||
CONFIG_OVMS_VEHICLE_KIASOULEV=n
|
||||
CONFIG_OVMS_VEHICLE_BOLTEV=n
|
||||
CONFIG_OVMS_VEHICLE_VOLTAMPERA=n
|
||||
CONFIG_OVMS_VEHICLE_THINKCITY=n
|
||||
CONFIG_OVMS_VEHICLE_SMARTED=n
|
||||
CONFIG_OVMS_VEHICLE_SMARTEQ=n
|
||||
CONFIG_OVMS_VEHICLE_MITSUBISHI=n
|
||||
CONFIG_OVMS_VEHICLE_ZEVA=n
|
||||
CONFIG_OVMS_VEHICLE_KIANIROEV=n
|
||||
CONFIG_OVMS_VEHICLE_FIAT500=n
|
||||
CONFIG_OVMS_VEHICLE_VWEUP=n
|
||||
CONFIG_OVMS_VEHICLE_MERCEDESB250E=n
|
||||
CONFIG_OVMS_VEHICLE_CADILLAC_C2_CTS=n
|
||||
CONFIG_OVMS_VEHICLE_CHEVROLET_C6_CORVETTE=n
|
||||
CONFIG_OVMS_VEHICLE_MG_EV=n
|
||||
CONFIG_OVMS_VEHICLE_BMWI3=n
|
||||
CONFIG_OVMS_VEHICLE_HYUNDAI_IONIQVFL=n
|
||||
CONFIG_OVMS_VEHICLE_JAGUARIPACE=n
|
||||
CONFIG_OVMS_VEHICLE_TOYOTARAV4EV=n
|
||||
CONFIG_OVMS_VEHICLE_RXTASK_STACK=8192
|
||||
CONFIG_OVMS_VEHICLE_CAN_RX_QUEUE_SIZE=60
|
||||
CONFIG_OVMS_VEHICLE_RENAULTZOE_PH2=y
|
||||
|
|
Loading…
Reference in a new issue