systemBus-ize rs232 (FujiNetWIFI#1031)

Author: FozzTexx

.github/workflows/autobuild.yml

@@ -20,7 +20,15 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        target-platform: [ATARI, ATARI-esp32-s3-wroom-1-n16r8, ADAM, APPLE, IEC-LOLIN-D32, IEC-NUGGET, COCO]
+        target-platform:
+          - ADAM
+          - APPLE
+          - ATARI
+          - ATARI-esp32-s3-wroom-1-n16r8
+          - COCO
+          - IEC-LOLIN-D32
+          - IEC-NUGGET
+          - RS232
 
     steps:
     - name: Checkout Source

.github/workflows/release.yml

@@ -17,7 +17,16 @@ jobs:
     runs-on: "ubuntu-latest"
     strategy:
       matrix:
-        target-platform: [ATARI, ATARI-8mb, ADAM, APPLE, COCO, IEC-LOLIN-D32, MASTERIES-REVAB, MASTERIES-REVA-SPIFIX, RS232]
+        target-platform:
+          - ADAM
+          - APPLE
+          - ATARI
+          - ATARI-8mb
+          - COCO
+          - IEC-LOLIN-D32
+          - MASTERIES-REVA-SPIFIX
+          - MASTERIES-REVAB
+          - RS232
     env:
       TAG_NAME: ${{ github.event.inputs.tag || github.ref_name }}
 

lib/bus/rs232/rs232.cpp

@@ -77,7 +77,7 @@ void virtualDevice::bus_to_computer(uint8_t *buf, uint16_t len, bool err)
     // Write checksum
     SYSTEM_BUS.write(rs232_checksum(buf, len));
 
-    SYSTEM_BUS.flush();
+    SYSTEM_BUS.flushOutput();
 }
 
 /*
@@ -124,7 +124,7 @@ uint8_t virtualDevice::bus_to_peripheral(uint8_t *buf, unsigned short len)
 void virtualDevice::rs232_nak()
 {
     SYSTEM_BUS.write('N');
-    SYSTEM_BUS.flush();
+    SYSTEM_BUS.flushOutput();
     Debug_println("NAK!");
 }
 
@@ -133,7 +133,7 @@ void virtualDevice::rs232_ack()
 {
     SYSTEM_BUS.write('A');
     fnSystem.delay_microseconds(DELAY_T5); //?
-    SYSTEM_BUS.flush();
+    SYSTEM_BUS.flushOutput();
     Debug_println("ACK!");
 }
 

lib/bus/rs232/rs232.h

@@ -150,7 +150,7 @@ class virtualDevice
     virtual void rs232_status() = 0;
 
     /**
-     * @brief All RS232 devices repeatedly call this routine to fan out to other methods for each command. 
+     * @brief All RS232 devices repeatedly call this routine to fan out to other methods for each command.
      * This is typcially implemented as a switch() statement.
      */
     virtual void rs232_process(cmdFrame_t *cmd_ptr) = 0;

lib/device/rs232/modem.cpp

@@ -427,7 +427,7 @@ void rs232Modem::rs232_control()
             tcpClient.stop(); // Hang up if DTR drops.
             CRX = false;
             cmdMode = true;
-            
+
             if (listenPort > 0)
             {
                 // tcpServer.stop();
@@ -696,7 +696,7 @@ void rs232Modem::at_cmd_println()
         SYSTEM_BUS.write(ASCII_CR);
         SYSTEM_BUS.write(ASCII_LF);
     }
-    SYSTEM_BUS.flush();
+    SYSTEM_BUS.flushOutput();
 }
 
 void rs232Modem::at_cmd_println(const char *s, bool addEol)
@@ -717,7 +717,7 @@ void rs232Modem::at_cmd_println(const char *s, bool addEol)
             SYSTEM_BUS.write(ASCII_LF);
         }
     }
-    SYSTEM_BUS.flush();
+    SYSTEM_BUS.flushOutput();
 }
 
 void rs232Modem::at_cmd_println(int i, bool addEol)
@@ -738,7 +738,7 @@ void rs232Modem::at_cmd_println(int i, bool addEol)
             SYSTEM_BUS.write(ASCII_LF);
         }
     }
-    SYSTEM_BUS.flush();
+    SYSTEM_BUS.flushOutput();
 }
 
 void rs232Modem::at_cmd_println(std::string s, bool addEol)
@@ -759,7 +759,7 @@ void rs232Modem::at_cmd_println(std::string s, bool addEol)
             SYSTEM_BUS.write(ASCII_LF);
         }
     }
-    SYSTEM_BUS.flush();
+    SYSTEM_BUS.flushOutput();
 }
 
 void rs232Modem::at_handle_wificonnect()
@@ -1025,7 +1025,7 @@ void rs232Modem::at_handle_answer()
         CRX = true;
 
         cmdMode = false;
-        SYSTEM_BUS.flush();
+        SYSTEM_BUS.flushOutput();
         answerHack = false;
     }
 }
@@ -1729,7 +1729,7 @@ void rs232Modem::rs232_handle_modem()
             else
             {
                 SYSTEM_BUS.write(buf, bytesRead);
-                SYSTEM_BUS.flush();
+                SYSTEM_BUS.flushOutput();
             }
 
             // And dump to sniffer, if enabled.
@@ -1747,7 +1747,7 @@ void rs232Modem::rs232_handle_modem()
             Debug_println("Going back to command mode");
 
             at_cmd_println("OK");
-    
+
             cmdMode = true;
 
             plusCount = 0;