add config for canspeed

Author: amrikarisma

src/CANHandler.cpp

@@ -1,12 +1,13 @@
 #include "CANHandler.h"
+#include "DisplayConfig.h"
 #include "Config.h"
 #include "DataTypes.h"
 #include <esp32_can.h>
 #include "Arduino.h"
 
 void setupCAN() {
   CAN0.setCANPins(GPIO_NUM_17, GPIO_NUM_16); // RX, TX
-  CAN0.begin(500000);                       // 500Kbps
+  CAN0.begin(getCanSpeed());                // Use configurable CAN speed
   CAN0.watchFor(0x360);                      // RPM, MAP, TPS
   CAN0.watchFor(0x361);                      // Fuel Pressure
   CAN0.watchFor(0x362);                      // Ignition Angle (Leading)
@@ -18,7 +19,7 @@ void setupCAN() {
   CAN0.watchFor(0x3E4);                      // Indicator
 
   isCANMode = true;  // Set communication mode indicator
-  Serial.println("CAN mode aktif.");
+  Serial.printf("CAN mode aktif. Speed: %u bps\n", getCanSpeed());
 }
 
 void canTask(void *pvParameters) {

src/DisplayConfig.cpp

@@ -31,7 +31,8 @@ DisplayConfiguration defaultDisplayConfig = {
   8, // activePanelCount
   8, // activeIndicatorCount
   0, // rpmDisplayMode (bar)
-  true // showSystemIndicators
+  true, // showSystemIndicators
+  500000 // canSpeed default 500Kbps
 };
 
 DisplayConfiguration currentDisplayConfig;
@@ -167,3 +168,17 @@ uint16_t getDataSourceColor(uint8_t dataSource, float value) {
       return TFT_WHITE;
   }
 }
+
+uint32_t getCanSpeed() {
+  if (currentDisplayConfig.canSpeed == 500000 || currentDisplayConfig.canSpeed == 1000000) {
+    return currentDisplayConfig.canSpeed;
+  } else {
+    // Jika belum pernah di-set atau nilai tidak valid, pakai default 500000
+    return 500000;
+  }
+}
+
+void setCanSpeed(uint32_t speed) {
+  currentDisplayConfig.canSpeed = speed;
+  saveDisplayConfig();
+}

src/DisplayConfig.h

@@ -68,6 +68,7 @@ struct DisplayConfiguration {
   uint8_t activeIndicatorCount;     // Number of active indicators
   uint8_t rpmDisplayMode;           // RPM display mode (0=bar, 1=digital)
   bool showSystemIndicators;        // Show CAN/SER, DEBUG, SIM
+  uint32_t canSpeed;                // CAN speed in bps (e.g. 500000, 1000000)
 };
 
 // Default configuration
@@ -84,5 +85,8 @@ bool getIndicatorValue(uint8_t indicator);
 const char* getDataSourceName(uint8_t dataSource);
 const char* getIndicatorName(uint8_t indicator);
 uint16_t getDataSourceColor(uint8_t dataSource, float value);
+// New CAN speed accessors
+uint32_t getCanSpeed();
+void setCanSpeed(uint32_t speed);
 
 #endif // DISPLAY_CONFIG_H

src/WebServerHandler.cpp

@@ -315,12 +315,35 @@ const char *uploadPage PROGMEM = R"rawliteral(
           });
       }
       
+      function updateCanSpeed() {
+        const select = document.getElementById('canSpeedSelect');
+        const speed = select.value;
+        fetch('/canspeed', {
+          method: 'POST',
+          headers: {'Content-Type': 'application/x-www-form-urlencoded'},
+          body: 'speed=' + speed
+        })
+        .then(response => response.text())
+        .then(data => {
+          alert('CAN speed updated: ' + speed + ' bps');
+        });
+      }
+      function loadCanSpeed() {
+        fetch('/canspeed')
+          .then(response => response.text())
+          .then(speed => {
+            const select = document.getElementById('canSpeedSelect');
+            if (select) select.value = speed;
+          });
+      }
+      
       const startTime = Date.now()/1000;
       setInterval(refreshStatus, 1000);
       
       // Load display config on page load
       window.onload = function() {
         loadDisplayConfig();
+        loadCanSpeed();
       };
     </script>
   </head>
@@ -595,6 +618,21 @@ const char *uploadPage PROGMEM = R"rawliteral(
           WiFi will automatically turn off after 1 minute of inactivity to save power.
         </p>
       </div>
+      
+      <div class="section">
+        <h2>CAN Bus Configuration</h2>
+        <div class="config-item">
+          <label for="canSpeedSelect">CAN Speed:</label>
+          <select id="canSpeedSelect" onchange="updateCanSpeed()">
+            <option value="500000">500 Kbps</option>
+            <option value="1000000">1 Mbps</option>
+          </select>
+        </div>
+        <p style="font-size: 14px; opacity: 0.8;">
+          Pilih kecepatan CAN sesuai kebutuhan hardware/ECU Anda.<br>
+          Perubahan akan disimpan dan digunakan saat restart berikutnya.
+        </p>
+      </div>
     </div>
   </body>
 </html>
@@ -678,7 +716,7 @@ void startWebServer()
   server.on("/status", HTTP_GET, [&]()
             {
               String json = "{";
-              json += "\"commMode\":\"" + String(isCANMode ? "CAN Bus" : "Serial") + "\",";
+              json += "\"commMode\":\"" + String(commMode == COMM_CAN ? "CAN Bus" : "Serial") + "\",";
               json += "\"debugMode\":" + String(debugMode ? "true" : "false") + ",";
 #if ENABLE_SIMULATOR
               json += "\"simulatorMode\":" + String(getSimulatorMode()) + ",";
@@ -790,10 +828,14 @@ void startWebServer()
               server.send(200, "application/json", json);
             });
 
+  server.on("/canspeed", HTTP_GET, handleCanSpeed);
+  server.on("/canspeed", HTTP_POST, handleCanSpeed);
+  
   server.begin();
   wifiActive = true;
   Serial.println("Web server aktif.");
   Serial.printf("WiFi AP: %s\n", ssid);
+  
   Serial.printf("AP IP Address: %s\n", WiFi.softAPIP().toString().c_str());
   Serial.printf("Access web server at: http://%s/\n", WiFi.softAPIP().toString().c_str());
   esp_wifi_set_max_tx_power(78);
@@ -884,6 +926,29 @@ void handleToggle()
   }
 }
 
+void handleCanSpeed() {
+  if (server.method() == HTTP_GET) {
+    char buf[16];
+    snprintf(buf, sizeof(buf), "%u", getCanSpeed());
+    server.send(200, "text/plain", buf);
+  } else if (server.method() == HTTP_POST) {
+    if (server.hasArg("speed")) {
+      uint32_t speed = server.arg("speed").toInt();
+      if (speed == 500000 || speed == 1000000) {
+        setCanSpeed(speed);
+        server.send(200, "text/plain", "OK");
+        Serial.printf("CAN speed set to %u bps via webserver\n", speed);
+      } else {
+        server.send(400, "text/plain", "Invalid speed");
+      }
+    } else {
+      server.send(400, "text/plain", "Missing speed param");
+    }
+  } else {
+    server.send(405, "text/plain", "Method Not Allowed");
+  }
+}
+
 void handleWebServerClients()
 {
   static uint32_t lastClientCheck = 0;

src/WebServerHandler.h

@@ -15,5 +15,14 @@ void handleRoot();
 void handleUpdate();
 void handleToggle();
 void handleWebServerClients();
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void handleCanSpeed();
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif // WEB_SERVER_HANDLER_H