[rs232] tweaks.

Author: tschak909

include/pinmap/rs232_rev0.h

@@ -14,8 +14,6 @@
 #define PIN_UART0_TX            GPIO_NUM_1  // USB Serial
 #define PIN_UART1_RX            GPIO_NUM_13 // RS232
 #define PIN_UART1_TX            GPIO_NUM_21 // RS232
-//#define PIN_UART2_RX          GPIO_NUM_33
-//#define PIN_UART2_TX          GPIO_NUM_21
 
 /* Buttons - keys.cpp */
 #define PIN_BUTTON_A            GPIO_NUM_0  // Button 0 on DEVKITC-VE

lib/bus/rs232/rs232.cpp

@@ -297,11 +297,11 @@ void systemBus::setup()
     // Set up UART
     fnUartBUS.begin(_rs232Baud);
 
-    // INT PIN
-    fnSystem.set_pin_mode(PIN_RS232_RI, gpio_mode_t::GPIO_MODE_OUTPUT_OD, SystemManager::pull_updown_t::PULL_UP);
-    fnSystem.digital_write(PIN_RS232_RI, DIGI_HIGH);
+    // // INT PIN
+    // fnSystem.set_pin_mode(PIN_RS232_RI, gpio_mode_t::GPIO_MODE_OUTPUT_OD, SystemManager::pull_updown_t::PULL_UP);
+    // fnSystem.digital_write(PIN_RS232_RI, DIGI_HIGH);
     // PROC PIN
-    fnSystem.set_pin_mode(PIN_RS232_RI, gpio_mode_t::GPIO_MODE_OUTPUT_OD, SystemManager::pull_updown_t::PULL_UP);
+    fnSystem.set_pin_mode(PIN_RS232_RI, gpio_mode_t::GPIO_MODE_OUTPUT, SystemManager::pull_updown_t::PULL_UP);
     fnSystem.digital_write(PIN_RS232_RI, DIGI_HIGH);
     // INVALID PIN
     //fnSystem.set_pin_mode(PIN_RS232_INVALID, PINMODE_INPUT | PINMODE_PULLDOWN); // There's no PULLUP/PULLDOWN on pins 34-39

lib/device/rs232/fuji.cpp

@@ -1470,9 +1470,11 @@ rs232Disk *rs232Fuji::bootdisk()
 
 void rs232Fuji::rs232_test()
 {
+    uint8_t buf[512];
+
     Debug_printf("rs232_test()\n");
-    vTaskDelay(1);
-    rs232_complete();
+    memset(buf,'A',512);
+    bus_to_computer(buf,512,false);
 }
 
 void rs232Fuji::rs232_process(uint32_t commanddata, uint8_t checksum)
@@ -1624,6 +1626,11 @@ void rs232Fuji::rs232_process(uint32_t commanddata, uint8_t checksum)
         rs232_ack();
         rs232_enable_udpstream();
         break;
+    case FUJICMD_DEVICE_READY:
+        Debug_printf("FUJICMD DEVICE TEST\n");
+        rs232_ack();
+        rs232_test();
+        break;
     default:
         rs232_nak();
     }

lib/device/rs232/network.cpp

@@ -811,6 +811,18 @@ void rs232Network::rs232_process(uint32_t commanddata, uint8_t checksum)
     case 'S':
         rs232_status();
         break;
+    case 'P':
+        rs232_ack();
+        rs232_parse_json();
+        break;
+    case 'Q':
+        rs232_ack();
+        rs232_set_json_query();
+        break;
+    case 0xFC:
+        rs232_ack();
+        rs232_set_channel_mode();
+        break;
     case 0xFF:
         rs232_special_inquiry();
         break;
@@ -836,6 +848,8 @@ void rs232Network::rs232_poll_interrupt()
 
         if (status.rxBytesWaiting > 0 || status.connected == 0)
             rs232_assert_interrupt();
+        else
+            fnSystem.digital_write(PIN_RS232_RI,DIGI_HIGH);
 
         reservedSave = status.connected;
         errorSave = status.error;
@@ -996,7 +1010,7 @@ void rs232Network::processCommaFromDevicespec()
  * Called to pulse the PROCEED interrupt, rate limited by the interrupt timer.
  */
 void rs232Network::rs232_assert_interrupt()
-{
+{ 
     fnSystem.digital_write(PIN_RS232_RI, interruptProceed == true ? DIGI_HIGH : DIGI_LOW);
 }
 
@@ -1031,6 +1045,7 @@ void rs232Network::rs232_set_json_query()
 
     inp = strrchr((const char *)in, ':');
     inp++;
+    Debug_printv("Q: %s\n",in);
     json.setReadQuery(string(inp),cmdFrame.aux2);
     json_bytes_remaining = json.readValueLen();
     tmp = (uint8_t *)malloc(json.readValueLen());

src/main.cpp

@@ -302,6 +302,9 @@ void main_setup(int argc, char *argv[])
     theFuji.setup(&RS232);
     RS232.setup();
     RS232.addDevice(&theFuji,0x70);
+    if (Config.get_apetime_enabled() == true)
+        RS232.addDevice(&apeTime, RS232_DEVICEID_APETIME); // Clock for Atari, APETime compatible, but extended for additional return types
+
 #endif
 
 #ifdef BUILD_RC2014