Allow changing baud rate and increased json buffer

Author: jsphuebner

data/index.html

@@ -158,7 +158,13 @@ <h3 class="underline">New CAN Mapping</h3>
 
       <div id="nodeid-div" class="control small-screen-hide">
         <label for="nodeid">Node ID:</label>
-        <input id="nodeid" type="number" id="nodeid" step="1" min="1" max="63" value="1" onchange="ui.setNodeId(this.value)"/>
+        <input id="nodeid" type="number" id="nodeid" step="1" min="1" max="63" value="1" onchange="ui.setNodeIdAndSpeed()"/>
+        <label for="canspeed">Speed:</label>
+        <select name="canspeed" id="canspeed" onchange="ui.setNodeIdAndSpeed()">
+          <option value="0">125k</option>
+          <option value="1">250k</option>
+          <option value="2">500k</option>
+        </select>
       </div>
 			<!-- auto reload toggle -->
 			<div id="auto-reload-toggle-div" class="control small-screen-hide">

data/ui.js

@@ -157,22 +157,24 @@ var ui = {
 
     xmlhttp.onload = function()
     {
-        document.getElementById("nodeid").value = this.responseText;
+        document.getElementById("nodeid").value = this.responseText.split(',')[0];
+        document.getElementById("canspeed").value = this.responseText.split(',')[1];
     }
 
     xmlhttp.open("GET", "/nodeid", true);
     xmlhttp.send();
   },
 
-  setNodeId: function(id) {
+  setNodeIdAndSpeed: function() {
     var xmlhttp = new XMLHttpRequest();
 
     xmlhttp.onload = function()
     {
-        document.getElementById("nodeid").value = this.responseText;
+        document.getElementById("nodeid").value = this.responseText.split(',')[0];
+        document.getElementById("canspeed").value = this.responseText.split(',')[1];
     }
 
-    xmlhttp.open("GET", "/nodeid?id=" + id, true);
+    xmlhttp.open("GET", "/nodeid?id=" + document.getElementById("nodeid").value + "&canspeed=" + document.getElementById("canspeed").value, true);
     xmlhttp.send();
   },
 

esp32-web-interface.ino

@@ -568,12 +568,18 @@ static void handleUpdate()
 
 static void handleNodeId()
 {
-  if(server.hasArg("id")) {
+  if(server.hasArg("id") && server.hasArg("canspeed")) {
     int id = server.arg("id").toInt();
-    OICan::Init(id);
+    int speed = server.arg("canspeed").toInt();
+    OICan::BaudRate baud = speed == 0 ? OICan::Baud125k : (speed == 1 ? OICan::Baud250k : OICan::Baud500k);
+    OICan::Init(id, baud);
+  }
+  else if(server.hasArg("id")) {
+    int id = server.arg("id").toInt();
+    OICan::Init(id, OICan::Baud500k);
   }
 
-  server.send(200, "text/plain", String(OICan::GetNodeId()));
+  server.send(200, "text/plain", String(OICan::GetNodeId()) + "," + String(OICan::GetBaudRate()));
 }
 
 static void handleWifi()
@@ -686,7 +692,7 @@ void setup(void){
 
   MDNS.begin(host);
 
-  OICan::Init(1);
+  OICan::Init(1, OICan::Baud500k);
 
   updater.setup(&server);
 

src/oi_can.cpp

@@ -62,6 +62,7 @@ enum state { IDLE, ERROR, OBTAINSERIAL, OBTAIN_JSON };
 enum updstate { UPD_IDLE, SEND_MAGIC, SEND_SIZE, SEND_PAGE, CHECK_CRC, REQUEST_JSON };
 
 static uint8_t _nodeId;
+static BaudRate baudRate;
 static state state;
 static updstate updstate;
 static uint32_t serial[4]; //contains id sum as well
@@ -328,7 +329,7 @@ int GetCurrentUpdatePage() {
 bool SendJson(WiFiClient client) {
   if (state != IDLE) return false;
 
-  DynamicJsonDocument doc(30000);
+  DynamicJsonDocument doc(50000);
   twai_message_t rxframe;
 
   File file = SPIFFS.open(jsonFileName, "r");
@@ -631,7 +632,11 @@ int GetNodeId() {
   return _nodeId;
 }
 
-void Init(uint8_t nodeId) {
+BaudRate GetBaudRate() {
+  return baudRate;
+}
+
+void Init(uint8_t nodeId, BaudRate baud) {
   twai_general_config_t g_config = {
         .mode = TWAI_MODE_NORMAL,
         .tx_io = GPIO_NUM_25,
@@ -649,7 +654,22 @@ void Init(uint8_t nodeId) {
   twai_stop();
   twai_driver_uninstall();
 
-  twai_timing_config_t t_config = TWAI_TIMING_CONFIG_500KBITS();
+  twai_timing_config_t t_config;
+  baudRate = baud;
+
+  switch (baud)
+  {
+  case Baud125k:
+    t_config = TWAI_TIMING_CONFIG_125KBITS();
+    break;
+  case Baud250k:
+    t_config = TWAI_TIMING_CONFIG_250KBITS();
+    break;
+  case Baud500k:
+    t_config = TWAI_TIMING_CONFIG_500KBITS();
+    break;
+  }
+
   twai_filter_config_t f_config = {.acceptance_code = (uint32_t)(id << 5) | (uint32_t)(0x7de << 21),
                                    .acceptance_mask = 0x001F001F,
                                    .single_filter = false};

src/oi_can.h

@@ -23,9 +23,9 @@
 
 namespace OICan {
 enum SetResult { Ok, UnknownIndex, ValueOutOfRange, CommError };
+enum BaudRate { Baud125k, Baud250k, Baud500k };
 
-
-void Init(uint8_t nodeId);
+void Init(uint8_t nodeId, BaudRate baud);
 void Loop();
 bool SendJson(WiFiClient c);
 void SendCanMapping(WiFiClient c);
@@ -38,6 +38,7 @@ String StreamValues(String names, int samples);
 int StartUpdate(String fileName);
 int GetCurrentUpdatePage();
 int GetNodeId();
+BaudRate GetBaudRate();
 
 }
 #endif