Skip to content

Commit

Permalink
Merge branch 'v2.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
@muki01
muki01 authored Jan 24, 2025
2 parents c76970f + 6da6864 commit 7188097
Show file tree
Hide file tree
Showing 17 changed files with 513 additions and 291 deletions.
152 changes: 149 additions & 3 deletions WebServer_Code/Functions.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ byte calculateChecksum(const byte data[], int length) {
return checksum % 256;
}

bool isInArray(String array[], int arrayLength, String searchString) {
for (int i = 0; i < arrayLength; i++) {
if (array[i] == searchString) {
bool isInArray(byte arr[], int size, byte value) {
for (int i = 0; i < size; i++) {
if (arr[i] == value) {
return true;
}
}
Expand Down Expand Up @@ -46,6 +46,38 @@ String convertBytesToHexString(byte* buffer, int length) {
return hexString;
}

String convertBytesToHexStringWithComma(byte arr[], int length) {
String hexString = "";
for (int i = 0; i < length; i++) {
if (arr[i] == 0) {
break;
}
if (i > 0) {
hexString += ", ";
}
if (arr[i] < 0x10) {
hexString += "0";
}
hexString += String(arr[i], HEX);
}
hexString.toUpperCase();
return hexString;
}

String joinStringsWithComma(String arr[], int length) {
String result = "";
for (int i = 0; i < length; i++) {
if (arr[i] == 0) {
break;
}
if (i > 0) {
result += ", ";
}
result += arr[i];
}
return result;
}




Expand Down Expand Up @@ -93,4 +125,118 @@ void BlinkLed(int time, int count) {
delay(time);
}
}
}

struct PidMapping {
byte pid;
const char* jsonKey;
int value;
const char* unit;
};

PidMapping liveDataMappings[] = {
{ 0x01, "Monitor Status Since DTC Cleared", 0, "BIT" },
{ 0x03, "Fuel System Status", 0, "BIT" },
{ 0x04, "Engine Load", 0, "%" },
{ 0x05, "Coolant Temp", 0, "°C" },
{ 0x06, "Short Term Fuel Trim Bank 1", 0, "%" },
{ 0x07, "Long Term Fuel Trim Bank 1", 0, "%" },
{ 0x08, "Short Term Fuel Trim Bank 2", 0, "%" },
{ 0x09, "Long Term Fuel Trim Bank 2", 0, "%" },
{ 0x0A, "Fuel Pressure", 0, "kPa" },
{ 0x0B, "Intake Manifold Abs Pressure", 0, "kPa" },
{ 0x0C, "RPM", 0, "rpm" },
{ 0x0D, "Speed", 0, "km/h" },
{ 0x0E, "Timing Advance (before TDC)", 0, "°" },
{ 0x0F, "Intake Air Temp", 0, "°C" },
{ 0x10, "MAF Flow Rate", 0, "g/s" },
{ 0x11, "Throttle Position", 0, "%" },
{ 0x12, "Commanded Secondary Air Status", 0, "BIT" },
{ 0x13, "Oxygen Sensors Present 2 Banks", 0, "BIT" },
{ 0x14, "Oxygen Sensor 1A", 0, "V %" },
{ 0x15, "Oxygen Sensor 2A", 0, "V %" },
{ 0x16, "Oxygen Sensor 3A", 0, "V %" },
{ 0x17, "Oxygen Sensor 4A", 0, "V %" },
{ 0x18, "Oxygen Sensor 5A", 0, "V %" },
{ 0x19, "Oxygen Sensor 6A", 0, "V %" },
{ 0x1A, "Oxygen Sensor 7A", 0, "V %" },
{ 0x1B, "Oxygen Sensor 8A", 0, "V %" },
{ 0x1C, "OBD Standards", 0, "BIT" },
{ 0x1D, "Oxygen Sensors Present 4 Banks", 0, "BIT" },
{ 0x1E, "Aux Input Status", 0, "BIT" },
{ 0x1F, "Run Time Since Engine Start", 0, "sec" },

{ 0x21, "Distance Traveled With MIL On", 0, "km" },
{ 0x22, "Fuel Rail Pressure", 0, "kPa" },
{ 0x23, "Fuel Rail Guage Pressure", 0, "kPa" },
{ 0x24, "Oxygen Sensor 1B", 0, "ratio V" },
{ 0x25, "Oxygen Sensor 2B", 0, "ratio V" },
{ 0x26, "Oxygen Sensor 3B", 0, "ratio V" },
{ 0x27, "Oxygen Sensor 4B", 0, "ratio V" },
{ 0x28, "Oxygen Sensor 5B", 0, "ratio V" },
{ 0x29, "Oxygen Sensor 6B", 0, "ratio V" },
{ 0x2A, "Oxygen Sensor 7B", 0, "ratio V" },
{ 0x2B, "Oxygen Sensor 8B", 0, "ratio V" },
{ 0x2C, "Commanded EGR", 0, "%" },
{ 0x2D, "EGR Error", 0, "%" },
{ 0x2E, "Commanded Evaporative Purge", 0, "%" },
{ 0x2F, "Fuel Tank Level Input", 0, "%" },
{ 0x30, "Warm UPS Since Codes Cleared", 0, "count" },
{ 0x31, "Dist Trav Since Codes Cleared", 0, "km" },
{ 0x32, "Evap System Vapor Pressure", 0, "Pa" },
{ 0x33, "ABS Barometric Pressure", 0, "kPa" },
{ 0x34, "Oxygen Sensor 1C", 0, "ratio mA" },
{ 0x35, "Oxygen Sensor 2C", 0, "ratio mA" },
{ 0x36, "Oxygen Sensor 3C", 0, "ratio mA" },
{ 0x37, "Oxygen Sensor 4C", 0, "ratio mA" },
{ 0x38, "Oxygen Sensor 5C", 0, "ratio mA" },
{ 0x39, "Oxygen Sensor 6C", 0, "ratio mA" },
{ 0x3A, "Oxygen Sensor 7C", 0, "ratio mA" },
{ 0x3B, "Oxygen Sensor 8C", 0, "ratio mA" },
{ 0x3C, "Catalyst Temp Bank 1 Sensor 1", 0, "°C" },
{ 0x3D, "Catalyst Temp Bank 2 Sensor 1", 0, "°C" },
{ 0x3E, "Catalyst Temp Bank 1 Sensor 2", 0, "°C" },
{ 0x3F, "Catalyst Temp Bank 2 Sensor 2", 0, "°C" }
};

PidMapping freezeFrameMappings[] = {
{ 0x01, "Monitor Status Since DTC Cleared", 0, "BIT" },
{ 0x03, "Fuel System Status", 0, "BIT" },
{ 0x04, "Engine Load", 0, "%" },
{ 0x05, "Coolant Temp", 0, "°C" },
{ 0x06, "Short Term Fuel Trim Bank 1", 0, "%" },
{ 0x07, "Long Term Fuel Trim Bank 1", 0, "%" },
{ 0x08, "Short Term Fuel Trim Bank 2", 0, "%" },
{ 0x09, "Long Term Fuel Trim Bank 2", 0, "%" },
{ 0x0A, "Fuel Pressure", 0, "kPa" },
{ 0x0B, "Intake Manifold Abs Pressure", 0, "kPa" },
{ 0x0C, "RPM", 0, "rpm" },
{ 0x0D, "Speed", 0, "km/h" },
{ 0x0E, "Timing Advance (before TDC)", 0, "°" },
{ 0x0F, "Intake Air Temp", 0, "°C" },
{ 0x10, "MAF Flow Rate", 0, "g/s" },
{ 0x11, "Throttle Position", 0, "%" },
{ 0x12, "Commanded Secondary Air Status", 0, "BIT" },
{ 0x13, "Oxygen Sensors Present 2 Banks", 0, "BIT" },
{ 0x14, "Oxygen Sensor 1A", 0, "V %" },
{ 0x15, "Oxygen Sensor 2A", 0, "V %" },
{ 0x16, "Oxygen Sensor 3A", 0, "V %" },
{ 0x17, "Oxygen Sensor 4A", 0, "V %" },
{ 0x18, "Oxygen Sensor 5A", 0, "V %" },
{ 0x19, "Oxygen Sensor 6A", 0, "V %" },
{ 0x1A, "Oxygen Sensor 7A", 0, "V %" },
{ 0x1B, "Oxygen Sensor 8A", 0, "V %" },
{ 0x1C, "OBD Standards", 0, "BIT" },
{ 0x1D, "Oxygen Sensors Present 4 Banks", 0, "BIT" },
{ 0x1E, "Aux Input Status", 0, "BIT" },
{ 0x1F, "Run Time Since Engine Start", 0, "sec" },
};

void updatePidValue(byte pid, int newValue) {
for (int i = 0; i < 64; i++) {
if (liveDataMappings[i].pid == pid) {
liveDataMappings[i].value = newValue;
return;
}
}
}
Loading

0 comments on commit 7188097

Please sign in to comment.