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

Compare commits

base: Crash_Override:705a4d1d3a8fe627bd330d332e98e1e9eaba1b65
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:b4486dd06e34a707c660dd4f708b28dd7f384c5c
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
705a4d1d3a ... b4486dd06e

Author SHA1 Message Date
Carsten Schmiemann b4486dd06e Include zoe modules default build 2022-11-20 19:10:55 +01:00
Carsten Schmiemann a3bb202c6a Add can msg text log, charge type, gen type 2022-11-20 19:05:11 +01:00
5 changed files with 32 additions and 14 deletions
Show stats Expand all files Collapse all files

6
OVMS.V3/components/can/src/canlog.cpp
View file

@ -596,7 +596,11 @@ void canlog::LogInfo(canbus* bus, CAN_log_type_t type, const char* text)
msg.origin = bus;
msg.text = strdup(text);
m_msgcount++;
if (xQueueSend(m_queue, &msg, 0) != pdTRUE) m_dropcount++;
if (xQueueSend(m_queue, &msg, 0) != pdTRUE)
{
m_dropcount++;
free(msg.text);
}
}
else
{

12
OVMS.V3/components/vehicle/vehicle.cpp
View file

@ -1502,6 +1502,12 @@ void OvmsVehicle::MetricModified(OvmsMetric* metric)
NotifyChargeState();
}
}
else if (metric == StandardMetrics.ms_v_charge_type)
{
std::string m = metric->AsString();
MyEvents.SignalEvent("vehicle.charge.type", (void*)m.c_str(), m.size()+1);
NotifiedVehicleChargeType(m);
}
else if (metric == StandardMetrics.ms_v_gen_state)
{
std::string state = metric->AsString();
@ -1509,6 +1515,12 @@ void OvmsVehicle::MetricModified(OvmsMetric* metric)
if (m_autonotifications)
NotifyGenState();
}
else if (metric == StandardMetrics.ms_v_gen_type)
{
std::string m = metric->AsString();
MyEvents.SignalEvent("vehicle.gen.type", (void*)m.c_str(), m.size()+1);
NotifiedVehicleGenType(m);
}
else if (metric == StandardMetrics.ms_v_pos_speed)
{
// Collect data for trip speed average:

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

@ -447,7 +447,9 @@ class OvmsVehicle : public InternalRamAllocated
virtual void NotifiedVehicleDrivemode(int drivemode) {}
virtual void NotifiedVehicleChargeMode(const char* m) {}
virtual void NotifiedVehicleChargeState(const char* s) {}
virtual void NotifiedVehicleChargeType(const std::string& state) {}
virtual void NotifiedVehicleGenState(const std::string& state) {}
virtual void NotifiedVehicleGenType(const std::string& state) {}
protected:
virtual void ConfigChanged(OvmsConfigParam* param);