Adapter type submenu

2020-12-20 12:24:56 +01:00
parent 4532105adb
commit 8cc9ca26c1
6 changed files with 85 additions and 17 deletions
--- a/Board320_240.cpp
+++ b/Board320_240.cpp
@@ -836,6 +836,9 @@ String Board320_240::menuItemCaption(int16_t menuItemId, String title) {
    case 107: prefix = (liveData->settings.carType == CAR_KIA_NIRO_PHEV) ? ">" : ""; break;
    case 120: prefix = (liveData->settings.carType == CAR_DEBUG_OBD2_KIA) ? ">" : ""; break;
    //
+    case MENU_ADAPTER_BLE4: prefix = (liveData->settings.commType == COMM_TYPE_OBD2BLE4) ? ">" : ""; break;
+    case MENU_ADAPTER_CAN:  prefix = (liveData->settings.commType == COMM_TYPE_OBD2CAN) ? ">" : ""; break;
+    case MENU_ADAPTER_BT3:  prefix = (liveData->settings.commType == COMM_TYPE_OBD2BT3) ? ">" : ""; break;
    /*case MENU_WIFI:
      suffix = "n/a";
      switch (WiFi.status()) {
@@ -990,6 +993,10 @@ void Board320_240::menuItemClick() {
      case 106: liveData->settings.carType = CAR_RENAULT_ZOE; showMenu(); return; break;
      case 107: liveData->settings.carType = CAR_KIA_NIRO_PHEV; showMenu(); return; break;
      case 120: liveData->settings.carType = CAR_DEBUG_OBD2_KIA; showMenu(); return; break;
+      // Comm type
+      case MENU_ADAPTER_BLE4: liveData->settings.commType = COMM_TYPE_OBD2BLE4; showMenu(); return; break;
+      case MENU_ADAPTER_CAN: liveData->settings.commType = COMM_TYPE_OBD2CAN; showMenu(); return; break;
+      case MENU_ADAPTER_BT3: liveData->settings.commType = COMM_TYPE_OBD2BT3; showMenu(); return; break;
      // Screen orientation
      case MENU_SCREEN_ROTATION: liveData->settings.displayRotation = (liveData->settings.displayRotation == 1) ? 3 : 1; tft.setRotation(liveData->settings.displayRotation); showMenu(); return; break;
      // Default screen
@@ -1327,16 +1334,17 @@ bool Board320_240::sdcardMount() {
  }

  int8_t countdown = 3;
-  bool SdState;
+  bool SdState = false;

  while (1) {
    Serial.print("Initializing SD card...");
+
 #ifdef BOARD_TTGO_T4
    SPIClass * hspi = new SPIClass(HSPI);
    spiSD.begin(pinSdcardSclk, pinSdcardMiso, pinSdcardMosi, pinSdcardCs); //SCK,MISO,MOSI,ss
    SdState = SD.begin(pinSdcardCs, *hspi, SPI_FREQUENCY);
 #endif // BOARD_TTGO_T4
-#ifdef BOARD_M5STACK_COREM5STACK
+#ifdef BOARD_M5STACK_CORE
    SdState = SD.begin(pinSdcardCs);
 #endif // BOARD_M5STACK_CORE

--- a/CarRenaultZoe.cpp
+++ b/CarRenaultZoe.cpp
@@ -9,7 +9,7 @@
 #include "LiveData.h"
 #include "CarRenaultZoe.h"

-#define commandQueueCountRenaultZoe 28
+#define commandQueueCountRenaultZoe 83
 #define commandQueueLoopFromRenaultZoe 9

 /**
@@ -40,24 +40,72 @@ void CarRenaultZoe::activateCommandQueue() {
    "ATFCSH79B",
    "atfcsd300010",
    "atfcsm1",
-    "2101",
-    "2103",
-    "2104",
-    "2141",
-    "2142",
-    "2161",
+    "2101", // 034 61011383138600000000000000000000000009970D620FC920D0000005420000000000000008D80500000B202927100000000000000000
+    "2103", // 01D 6103018516A717240000000001850185000000FFFF07D00516E60000030000000000
+    "2104", // 04D 6104099A37098D37098F3709903709AC3609BB3609A136098B37099737098A37098437099437FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF363637000000000000
+    "2141", // 07e 61410F360F380F380F360F380F380F380F380F390F390F3A0F390F3A0F390F390F380F380F390F380F380F380F390F390F380F380F3A0F390F380F380F380F390F390F350F380F360F380F380F380F380F360F380F360F350F380F360F380F360F360F350F360F360F380F380F380F3A0F380F3A0F3A0F390F390F380F36000000000000
+    "2142", // 04a 61420F3A0F390F390F390F380F380F390F390F390F390F360F360F380F380F360F380F360F380F390F390F3A0F390F390F3A0F3A0F3A0F380F390F390F3A0F390F390F380F38922091F20000
+    "2161", // 014 6161000AA820C8C8C8C2C20001545800004696FF

    // CLUSTER Instrument panel
    "ATSH743",
    "ATFCSH743",
    "atfcsd300010",
    "atfcsm1",
-    "220201",
-    "220202",
-    "220203",
-    "220204",
-    "220205",
-    "220206",
+    "220201", // 62020175300168
+    "220202", // 62020274710123
+//    "220203", // 7F2212
+//    "220204", // 7F2212
+//    "220205", // 7F2212
+    "220206", // 62020600015459
+
+    // BCB 793 Battery Connection Box
+    /*"ATSH792",
+    "ATFCSH792",
+    "atfcsd300010",
+    "atfcsm1",
+    "223101", to     "223114", // all with negative 7F2212*/
+
+    // CLIM 764 CLIMATE CONTROL
+    "ATSH744",
+    "ATFCSH744",
+    "atfcsd300010",
+    "atfcsm1",
+//    "2180", // NO DATA
+//    "2181", // NO DATA
+    "2182", // 618038303139520430343239353031520602051523080201008815
+//    "2125", // 6125000000000000000000000000000000000000
+//    "2126", // NO DATA
+//    "2128", // NO DATA
+
+    // EVC 7ec El vehicle controler
+    "ATSH7E4",
+    "ATFCSH7E4",
+    "atfcsd300010",
+    "atfcsm1",
+    "222001", // 62200136
+    "222002", // 6220020B3D
+    "222003", // 6220030000
+    "222004", // 62200402ED
+    "222005", // 6220050532
+    "222006", // 622006015459
+
+    // PEB 77e Power Electronics Bloc
+    "ATSH75A",
+    "ATFCSH75A",
+    "atfcsd300010",
+    "atfcsm1",
+    "223009", // 6230093640
+
+    // UBP 7bc Uncoupled Braking Pedal
+    "ATSH79C",
+    "ATFCSH79C",
+    "atfcsd300010",
+    "atfcsm1",
+    "21F0", // 61F0303235315204303337333733325215160C0400000101008800
+    "21F1", // 61F10000000000F000000000F0000000000012061400005C91F600
+    "21FE", // 61FE333731325204303337333733325215160C0400010201008800
+    
  };

  //
--- a/INSTALLATION.md
+++ b/INSTALLATION.md
@@ -6,7 +6,7 @@ M5STACK (Many thanks to DimZen)

 https://docs.google.com/document/d/17vJmeveNfN0exQy9wKC-5igU8zzNjsuOn1DPuPV_yJA/edit?usp=sharing

-TTGO-T4 (older)
+TTGO-T4 (older guide)

 https://docs.google.com/document/d/1nEezrtXY-8X6mQ1hiZVWDjBVse1sXQg1SlnizaRmJwU/edit?usp=sharing

--- a/LiveData.h
+++ b/LiveData.h
@@ -23,6 +23,7 @@
 // 
 #define COMM_TYPE_OBD2BLE4  0
 #define COMM_TYPE_OBD2CAN   1
+#define COMM_TYPE_OBD2BT3   2

 // SCREENS
 #define SCREEN_BLANK  0
@@ -164,7 +165,7 @@ typedef struct {
  byte predrawnChargingGraphs; // 0 - off, 1 - on
  // === settings version 4
  // =================================
-  byte commType; // 0 - OBD2 BLE4 adapter, 1 - CAN 
+  byte commType; // 0 - OBD2 BLE4 adapter, 1 - CAN, 2 - BT3
  // Wifi
  byte wifiEnabled; // 0/1 
  char wifiSsid[32];
--- a/config.h
+++ b/config.h
@@ -67,9 +67,14 @@ typedef struct {
 } MENU_ITEM;

 #define MENU_VEHICLE_TYPE 1
+#define MENU_ADAPTER_TYPE 5
 #define MENU_SAVE_SETTINGS 9
 #define MENU_APP_VERSION 10
 //
+#define MENU_ADAPTER_BLE4 501
+#define MENU_ADAPTER_CAN 502
+#define MENU_ADAPTER_BT3 503
+//
 #define MENU_WIFI 301
 #define MENU_GPRS 302
 #define MENU_NTP 303
--- a/menu.h
+++ b/menu.h
@@ -6,6 +6,7 @@ MENU_ITEM menuItemsSource[100] = {

  {0, 0, 0, "<- exit menu"},
  {MENU_VEHICLE_TYPE, 0, -1, "Vehicle type"},
+  {MENU_ADAPTER_TYPE, 0, -1, "Adapter type"},
  {2, 0, -1, "Select OBD2 BLE4 adapter"},
  {3, 0, -1, "Others"},
  {4, 0, -1, "Units"},
@@ -24,6 +25,11 @@ MENU_ITEM menuItemsSource[100] = {
  {107, 1, -1,  "Kia Niro PHEV 8.9kWh"},
  {120, 1, -1,  "Debug OBD2 Kia"},

+  {MENU_ADAPTER_BLE4-1, MENU_ADAPTER_TYPE, 0, "<- parent menu"},
+  {MENU_ADAPTER_BLE4, MENU_ADAPTER_TYPE, -1, "Bluetooth 4 (BLE4)"},
+  {MENU_ADAPTER_CAN, MENU_ADAPTER_TYPE, -1,  "CAN bus (MCP2515-1/SO)"},
+  {MENU_ADAPTER_BT3, MENU_ADAPTER_TYPE, -1,  "Bluetooth 3 (dev)"},
+  
  {300, 3, 0, "<- parent menu"},
  // {MENU_WIFI, 3, -1, "[dev] WiFi network"},
  {MENU_SDCARD, 3, -1, "SD card"},