feat(rs232): support BeckerSocket transport (#3)

Author: nwah

fujinet_pc.cmake

@@ -387,6 +387,7 @@ if(FUJINET_TARGET STREQUAL "RS232")
 
     lib/bus/rs232/rs232.h lib/bus/rs232/rs232.cpp
     lib/bus/rs232/FujiBusPacket.h lib/bus/rs232/FujiBusPacket.cpp
+    lib/bus/drivewire/BeckerSocket.h lib/bus/drivewire/BeckerSocket.cpp
 
     lib/media/rs232/diskType.h lib/media/rs232/diskType.cpp
     lib/media/rs232/diskTypeImg.h lib/media/rs232/diskTypeImg.cpp

lib/bus/drivewire/BeckerSocket.cpp

@@ -1,4 +1,4 @@
-#ifdef BUILD_COCO
+#if defined(BUILD_COCO) || defined(BUILD_RS232)
 
 #include "BeckerSocket.h"
 #include "fnSystem.h"
@@ -675,4 +675,4 @@ void BeckerSocket::setHost(std::string host, int port)
     _port = port;
 }
 
-#endif // BUILD_COCO
+#endif // BUILD_COCO || BUILD_RS232

lib/bus/rs232/rs232.cpp

@@ -185,15 +185,15 @@ void systemBus::_rs232_process_cmd()
     {
         _modemDev->modemActive = false;
         Debug_println("Modem was active - resetting RS232 baud");
-        _port.setBaudrate(_rs232Baud);
+        _serial.setBaudrate(_rs232Baud);
     }
 
     // Read CMD frame
     std::string packet;
     int val, count;
     for (count = 0; count < 2; )
     {
-        val = _port.read();
+        val = _port->read();
         if (val < 0)
             break;
         packet.push_back(val);
@@ -263,7 +263,7 @@ void systemBus::service()
         return; // break!
     }
 
-    if (_port.available())
+    if (_port->available())
     {
         _rs232_process_cmd();
     }
@@ -296,11 +296,20 @@ void systemBus::setup()
 
     // Set up UART
 #ifndef FUJINET_OVER_USB
-    _port.begin(ChannelConfig()
-                .baud(Config.get_rs232_baud())
-                .readTimeout(200)
-                .deviceID(SERIAL_DEVICE)
-                );
+    if (Config.get_boip_enabled())
+    {
+        Debug_printf("RS232 SETUP: BOIP host: %s\n", Config.get_boip_host().c_str());
+        _becker.begin(Config.get_boip_host(), Config.get_rs232_baud());
+        _port = &_becker;
+    }
+    else {
+        _serial.begin(ChannelConfig()
+                    .baud(Config.get_rs232_baud())
+                    .readTimeout(200)
+                    .deviceID(SERIAL_DEVICE))
+            ;
+        _port = &_serial;
+    }
 
 #ifdef ESP_PLATFORM
     // // INT PIN
@@ -326,11 +335,12 @@ void systemBus::setup()
     fnSystem.digital_write(PIN_RS232_DSR,DIGI_LOW);
 #endif /* ESP_PLATFORM */
 #else /* FUJINET_OVER_USB */
-    _port.begin();
+    _serial.begin();
+    _port = &_serial;
 #endif /* FUJINET_OVER_USB */
 
     Debug_println("RS232 Setup Flush");
-    _port.discardInput();
+    _port->discardInput();
 }
 
 // Add device to RS232 bus
@@ -445,7 +455,7 @@ void systemBus::setBaudrate(int baud)
 
     Debug_printf("Changing baudrate from %d to %d\n", _rs232Baud, baud);
     _rs232Baud = baud;
-    _port.setBaudrate(baud);
+    _serial.setBaudrate(baud);
 }
 
 #ifdef OBSOLETE
@@ -479,63 +489,63 @@ void systemBus::sendReplyPacket(fujiDeviceID_t source, bool ack, void *data, siz
     FujiBusPacket packet(source, ack ? FUJICMD_ACK : FUJICMD_NAK,
                          ack ? std::string(static_cast<const char*>(data), length) : nullptr);
     std::string encoded = packet.serialize();
-    _port.write(encoded.data(), encoded.size());
+    _port->write(encoded.data(), encoded.size());
     return;
 }
 
 /* Convert direct bus access into bus packets? */
 size_t systemBus::read(void *buffer, size_t length)
 {
     abort();
-    return _port.read(buffer, length);
+    return _port->read(buffer, length);
 }
 
 size_t systemBus::read()
 {
     abort();
-    return _port.read();
+    return _port->read();
 }
 
 size_t systemBus::write(const void *buffer, size_t length)
 {
     abort();
-    return _port.write(buffer, length);
+    return _port->write(buffer, length);
 }
 
 size_t systemBus::write(int n)
 {
     abort();
-    return _port.write(n);
+    return _port->write(n);
 }
 
 size_t systemBus::available()
 {
     abort();
-    return _port.available();
+    return _port->available();
 }
 
 void systemBus::flushOutput()
 {
     abort();
-    _port.flushOutput();
+    _port->flushOutput();
 }
 
 size_t systemBus::print(int n, int base)
 {
     abort();
-    return _port.print(n, base);
+    return _port->print(n, base);
 }
 
 size_t systemBus::print(const char *str)
 {
     abort();
-    return _port.print(str);
+    return _port->print(str);
 }
 
 size_t systemBus::print(const std::string &str)
 {
     abort();
-    return _port.print(str);
+    return _port->print(str);
 }
 
 #endif /* BUILD_RS232 */

lib/bus/rs232/rs232.h

@@ -3,6 +3,7 @@
 
 #include "UARTChannel.h"
 #include "FujiBusPacket.h"
+#include "../drivewire/BeckerSocket.h"
 
 #ifdef ESP_PLATFORM
 #include <freertos/FreeRTOS.h>
@@ -216,11 +217,9 @@ class systemBus
 
     bool useUltraHigh = false; // Use fujinet derived clock.
 
-#if FUJINET_OVER_USB
-    ACMChannel _port;
-#else /* ! FUJINET_OVER_USB */
-    UARTChannel _port;
-#endif /* FUJINET_OVER_USB */
+    IOChannel *_port;
+    UARTChannel _serial;
+    BeckerSocket _becker;
 
     void _rs232_process_cmd();
     /* void _rs232_process_queue(); */