Merge remote-tracking branch 'upstream/master'

merged with upstream
implemented SYSTEM_BUS changes in Lynx

Author: shawnjefferson22

.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 }}
 

Makefile

@@ -21,6 +21,9 @@ all:
 zip:
 	$(call builder, -z)
 
+atari-lwm:
+	$(call builder, -p ATARI -g)
+
 coco-lwm:
 	$(call builder, -p COCO -g)
 

lib/bus/adamnet/adamnet.cpp

@@ -162,11 +162,11 @@ void virtualDevice::reset()
 
 void virtualDevice::adamnet_response_ack(bool doNotWaitForIdle)
 {
-    int64_t t = esp_timer_get_time() - AdamNet.start_time;
+    int64_t t = esp_timer_get_time() - SYSTEM_BUS.start_time;
 
     if (!doNotWaitForIdle)
     {
-        AdamNet.wait_for_idle();
+        SYSTEM_BUS.wait_for_idle();
     }
 
     if (t < 300)
@@ -177,11 +177,11 @@ void virtualDevice::adamnet_response_ack(bool doNotWaitForIdle)
 
 void virtualDevice::adamnet_response_nack(bool doNotWaitForIdle)
 {
-    int64_t t = esp_timer_get_time() - AdamNet.start_time;
+    int64_t t = esp_timer_get_time() - SYSTEM_BUS.start_time;
 
     if (!doNotWaitForIdle)
     {
-        AdamNet.wait_for_idle();
+        SYSTEM_BUS.wait_for_idle();
     }
 
     if (t < 300)
@@ -226,7 +226,7 @@ void virtualDevice::adamnet_process(uint8_t b)
 
 void virtualDevice::adamnet_control_status()
 {
-    AdamNet.start_time=esp_timer_get_time();
+    SYSTEM_BUS.start_time=esp_timer_get_time();
    adamnet_response_status();
 }
 
@@ -434,6 +434,4 @@ void systemBus::disableDevice(uint8_t device_id)
     if (_daisyChain.find(device_id) != _daisyChain.end())
         _daisyChain[device_id]->device_active = false;
 }
-
-systemBus AdamNet;
-#endif /* BUILD_ADAM */
+#endif /* BUILD_ADAM */

lib/bus/adamnet/adamnet.h

@@ -281,6 +281,6 @@ class systemBus
     bool getShuttingDown() { return shuttingDown; };
 };
 
-extern systemBus AdamNet;
+extern systemBus SYSTEM_BUS;
 
-#endif /* ADAMNET_H */
+#endif /* ADAMNET_H */

lib/bus/bus.h

@@ -3,7 +3,6 @@
 
 #ifdef BUILD_ATARI
 #include "sio/sio.h"
-#define SYSTEM_BUS SIO
 #ifdef ESP_PLATFORM
   #define FN_BUS_PORT fnUartBUS
 #else
@@ -13,73 +12,61 @@
 
 #ifdef BUILD_IEC
 #include "iec/iec.h"
-#define SYSTEM_BUS IEC
 #define FN_BUS_PORT fnUartBUS  // TBD
 #endif
 
 #ifdef BUILD_ADAM
 #include "adamnet/adamnet.h"
-#define SYSTEM_BUS AdamNet
 #define FN_BUS_PORT fnUartBUS
 #endif
 
 #ifdef BUILD_LYNX
 #include "comlynx/comlynx.h"
-#define SYSTEM_BUS ComLynx
 #define FN_BUS_PORT fnUartBUS
 #endif
 
 #ifdef NEW_TARGET
 #include "new/adamnet.h"
-#define SYSTEM_BUS AdamNet
 #define FN_BUS_PORT fnUartBUS
 #endif
 
 #ifdef BUILD_APPLE
 #include "iwm/iwm.h"
-#define SYSTEM_BUS IWM
 #define FN_BUS_PORT fnUartBUS // TBD
 #endif
 
 #ifdef BUILD_MAC
 #include "mac/mac.h"
-#define SYSTEM_BUS MAC
 #define FN_BUS_PORT fnUartBUS
 #endif
 
 #ifdef BUILD_S100
 #include "s100spi/s100spi.h"
-#define SYSTEM_BUS s100Bus
 #define FN_BUS_PORT fnUartBUS // TBD
 #endif
 
 #ifdef BUILD_RS232
 #include "rs232/rs232.h"
-#define SYSTEM_BUS RS232
 #define FN_BUS_PORT fnUartBUS
 #endif
 
 #ifdef BUILD_CX16
 #include "cx16_i2c/cx16_i2c.h"
-#define SYSTEM_BUS CX16
 #define FN_BUS_PORT fnUartBUS // TBD
 #endif
 
 #ifdef BUILD_RC2014
 #include "rc2014bus/rc2014bus.h"
-#define SYSTEM_BUS rc2014Bus
 #define FN_BUS_PORT fnUartBUS
 #endif
 
 #ifdef BUILD_H89
 #include "h89/h89.h"
-#define SYSTEM_BUS H89Bus
 #define FN_BUS_PORT fnUartBUS // TBD
 #endif
 
 #ifdef BUILD_COCO
 #include "drivewire/drivewire.h"
-#define SYSTEM_BUS DRIVEWIRE
 #define FN_BUS_PORT fnDwCom
 #endif
 

lib/bus/comlynx/comlynx.cpp

@@ -15,6 +15,8 @@
 
 #define IDLE_TIME 500 // Idle tolerance in microseconds (roughly three characters at 62500 baud)
 
+//systemBus SYSTEM_BUS.;
+
 static QueueHandle_t reset_evt_queue = NULL;
 
 static void IRAM_ATTR comlynx_reset_isr_handler(void *arg)
@@ -81,8 +83,8 @@ void virtualDevice::comlynx_send(uint8_t b)
     Debug_printf("comlynx_send_buffer: %X\n", b);
 
     // Wait for idle only when in UDPStream mode
-    if (ComLynx._udpDev->udpstreamActive)
-        ComLynx.wait_for_idle();
+    if (SYSTEM_BUS._udpDev->udpstreamActive)
+        SYSTEM_BUS.wait_for_idle();
 
     // Write the byte
     fnUartBUS.write(b);
@@ -97,8 +99,8 @@ void virtualDevice::comlynx_send_buffer(uint8_t *buf, unsigned short len)
     //Debug_printf("comlynx_send_buffer: len:%d %0X %0X %0X %0X %0X %0X\n", len, buf[0], buf[1], buf[2], buf[3], buf[4], buf[len-1]);
 
     // Wait for idle only when in UDPStream mode
-    if (ComLynx._udpDev->udpstreamActive)
-        ComLynx.wait_for_idle();
+    if (SYSTEM_BUS._udpDev->udpstreamActive)
+        SYSTEM_BUS.wait_for_idle();
 
     fnUartBUS.write(buf, len);
     fnUartBUS.readBytes(buf, len);
@@ -270,7 +272,7 @@ void virtualDevice::comlynx_process(uint8_t b)
 
 void virtualDevice::comlynx_control_status()
 {
-    //ComLynx.start_time = esp_timer_get_time();
+    //SYSTEM_BUS.start_time = esp_timer_get_time();
     comlynx_response_status();
 }
 
@@ -561,9 +563,7 @@ void systemBus::setRedeyeGameRemap(uint32_t remap)
 {
    Debug_printf("setComlynxIdleTime, %d\n", idle_time);
 
-   ComLynx.comlynx_idle_time = idle_time; 
+   SYSTEM_BUS.comlynx_idle_time = idle_time; 
 }*/
 
-
-systemBus ComLynx;
-#endif /* BUILD_LYNX */
+#endif /* BUILD_LYNX */

lib/bus/comlynx/comlynx.h

@@ -286,12 +286,12 @@ class systemBus
 
     void setRedeyeMode(bool enable);
     void setRedeyeGameRemap(uint32_t remap);
-    //void setComlynxIdleTime(uint64_t idle_time);
 
     bool shuttingDown = false;                                  // TRUE if we are in shutdown process
     bool getShuttingDown() { return shuttingDown; };
 };
 
-extern systemBus ComLynx;
+extern systemBus SYSTEM_BUS;
+//extern systemBus ComLynx;
 
-#endif /* COMLYNX_H */
+#endif /* COMLYNX_H */

lib/bus/cx16_i2c/cx16_i2c.cpp

@@ -248,7 +248,4 @@ void systemBus::shutdown()
     }
     Debug_printf("All devices shut down.\n");
 }
-
-systemBus CX16;
-
-#endif /* BUILD_CX16 */
+#endif /* BUILD_CX16 */

lib/bus/cx16_i2c/cx16_i2c.h

@@ -221,11 +221,6 @@ class virtualDevice
      * @brief is device active (turned on?)
      */
     bool device_active = true;
-
-    /**
-     * @brief Get the systemBus object that this virtualDevice is attached to.
-     */
-    systemBus get_bus();
 };
 
 /**
@@ -374,6 +369,6 @@ class systemBus
 /**
  * @brief Return
  */
-extern systemBus CX16;
+extern systemBus SYSTEM_BUS;
 
-#endif /* CX16_I2C_H */
+#endif /* CX16_I2C_H */