add rts pin to config

wib100 · Jul 7, 2022 · 9390e07 · 9390e07
1 parent 80ace83
commit 9390e07
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 8 deletions.
diff --git a/include/config.h b/include/config.h
@@ -13,6 +13,7 @@
             uint32_t _tcpTimeout;
             unsigned long _modbusBaudRate;
             uint32_t _modbusConfig;
+            int8_t _modbusRtsPin;
             unsigned long _serialBaudRate;
             uint32_t _serialConfig;
         public:
@@ -31,6 +32,8 @@
             void setModbusParity(uint8_t value);
             uint8_t getModbusStopBits();
             void setModbusStopBits(uint8_t value);
+            int8_t getModbusRtsPin();
+            void setModbusRtsPin(int8_t value);
             uint32_t getSerialConfig();
             unsigned long getSerialBaudRate();
             void setSerialBaudRate(unsigned long value);

diff --git a/src/config.cpp b/src/config.cpp
@@ -6,6 +6,7 @@ Config::Config()
     ,_tcpTimeout(10000)
     ,_modbusBaudRate(9600)
     ,_modbusConfig(SERIAL_8N1)
+    ,_modbusRtsPin(-1)
     ,_serialBaudRate(115200)
     ,_serialConfig(SERIAL_8N1)
 {}
@@ -17,6 +18,7 @@ void Config::begin(Preferences *prefs)
     _tcpTimeout = _prefs->getULong("tcpTimeout", _tcpTimeout);
     _modbusBaudRate = _prefs->getULong("modbusBaudRate", _modbusBaudRate);
     _modbusConfig = _prefs->getULong("modbusConfig", _modbusConfig);
+    _modbusRtsPin = _prefs->getChar("modbusRtsPin", _modbusRtsPin);
     _serialBaudRate = _prefs->getULong("serialBaudRate", _serialBaudRate);
     _serialConfig = _prefs->getULong("serialConfig", _serialConfig);
 }
@@ -92,6 +94,16 @@ void Config::setModbusStopBits(uint8_t value){
     _prefs->putULong("modbusConfig", _modbusConfig);
 }
 
+int8_t Config::getModbusRtsPin(){
+    return _modbusRtsPin;
+}
+
+void Config::setModbusRtsPin(int8_t value){
+    if (_modbusRtsPin == value) return;
+    _modbusRtsPin = value;
+    _prefs->putChar("modbusRtsPin", _modbusRtsPin);
+}
+
 uint32_t Config::getSerialConfig(){
     return _serialConfig;
 }

diff --git a/src/main.cpp b/src/main.cpp
@@ -12,7 +12,7 @@
 AsyncWebServer webServer(80);
 Config config;
 Preferences prefs;
-ModbusClientRTU MBclient(modbusSerial);
+ModbusClientRTU *MBclient;
 ModbusBridgeWiFi MBbridge;
 WiFiManager wm;
 
@@ -31,15 +31,16 @@ void setup() {
   dbgln("[wifi] finished");
   dbgln("[modbus] start");
   modbusSerial.begin(config.getModbusBaudRate(), config.getModbusConfig());
-  MBclient.setTimeout(1000);
-  MBclient.begin();
+  MBclient = new ModbusClientRTU(modbusSerial, config.getModbusRtsPin());
+  MBclient->setTimeout(1000);
+  MBclient->begin();
   for (uint8_t i = 1; i < 248; i++)
   {
-    MBbridge.attachServer(i, i, ANY_FUNCTION_CODE, &MBclient);
+    MBbridge.attachServer(i, i, ANY_FUNCTION_CODE, MBclient);
   }  
   MBbridge.start(config.getTcpPort(), 10, config.getTcpTimeout());
   dbgln("[modbus] finished");
-  setupPages(&webServer, &MBclient, &MBbridge, &config, &wm);
+  setupPages(&webServer, MBclient, &MBbridge, &config, &wm);
   webServer.begin();
   dbgln("[setup] finished");
 }

diff --git a/src/pages.cpp b/src/pages.cpp
@@ -105,9 +105,32 @@ void setupPages(AsyncWebServer *server, ModbusClientRTU *rtu, ModbusBridgeWiFi *
           "</td>"
           "<td>");
     response->printf("<select id=\"ms\" name=\"ms\" data-value=\"%d\">", config->getModbusStopBits());
-    response->print("<option value=\"1\">1 bit</option>"
-              "<option value=\"2\">1.5 bits</option>"
-              "<option value=\"3\">2 bits</option>"
+    response->print("<option value=\"0\">None</option>"
+              "<option value=\"2\">Even</option>"
+              "<option value=\"3\">Odd</option>"
+            "</select>"
+          "</td>"
+        "</tr>"
+        "<tr>"
+          "<td>"
+            "<label for=\"mr\">RTS Pin</label>"
+          "</td>"
+          "<td>");
+    response->printf("<select id=\"mr\" name=\"mr\" data-value=\"%d\">", config->getModbusRtsPin());
+    response->print("<option value=\"-1\">Auto</option>"
+              "<option value=\"4\">D4</option>"
+              "<option value=\"13\">D13</option>"
+              "<option value=\"14\">D14</option>"
+              "<option value=\"18\">D18</option>"
+              "<option value=\"19\">D19</option>"
+              "<option value=\"21\">D21</option>"
+              "<option value=\"22\">D22</option>"
+              "<option value=\"23\">D23</option>"
+              "<option value=\"25\">D25</option>"
+              "<option value=\"26\">D26</option>"
+              "<option value=\"27\">D27</option>"
+              "<option value=\"32\">D32</option>"
+              "<option value=\"33\">D33</option>"
             "</select>"
           "</td>"
         "</tr>"
@@ -201,6 +224,11 @@ void setupPages(AsyncWebServer *server, ModbusClientRTU *rtu, ModbusBridgeWiFi *
       config->setModbusStopBits(stop);
       dbgln("[webserver] saved modbus stop bits");
     }
+    if (request->hasParam("mr", true)){
+      auto rts = request->getParam("mr", true)->value().toInt();
+      config->setModbusRtsPin(rts);
+      dbgln("[webserver] saved modbus rts pin");
+    }
     if (request->hasParam("sb", true)){
       auto baud = request->getParam("sb", true)->value().toInt();
       config->setSerialBaudRate(baud);