Merge branch 'master' into privatize-iec

Author: FozzTexx

build-platforms/platformio-fujinet-coco-devkitc.ini

@@ -3,11 +3,18 @@ build_platform = BUILD_COCO
 build_bus      = DRIVEWIRE
 build_board    = fujinet-coco-devkitc
 
+[env]
+upload_port = /dev/ttyUSB0
+upload_speed = 460800
+monitor_port = /dev/ttyUSB0
+monitor_speed = 115200
+
 [env:fujinet-coco-devkitc]
 platform = espressif32@${fujinet.esp32_platform_version}
 platform_packages = ${fujinet.esp32_platform_packages}
 board = fujinet-v1-8mb
 build_type = debug
 build_flags =
     ${env.build_flags}
-    -D PINMAP_COCO_DEVKITC
+    -D PINMAP_COCO_CART
+    -D FORCE_UART_BAUD=115200

pico/coco/main.c

@@ -15,6 +15,7 @@
 #define RWPIN      24
 //      CLKPIN     25 - defined in cococart.pio
 //		  CTSPIN	   26 - defined in cococart.pio	
+#define NMIPIN     27
 #define ADDRWIDTH  16 // 64k address space
 // #define ROMWIDTH   14 // 16k cart rom space
 // #define DATAWIDTH   8
@@ -121,7 +122,7 @@ void initio()
 {
   const uint32_t addrmask = 0xffff << PINROMADDR;
   const uint32_t datamask = 0xff << PINROMDATA;
-  const uint32_t ctrlmask = (1 << CLKPIN) | (1 << CTSPIN) | (1 << RWPIN);
+  const uint32_t ctrlmask = (1 << CLKPIN) | (1 << CTSPIN) | (1 << RWPIN) | (1 << NMIPIN);
 
   gpio_init_mask(addrmask | datamask | ctrlmask);
   gpio_set_dir_all_bits(0);
@@ -135,6 +136,7 @@ void initio()
   gpio_set_pulls(CTSPIN, true, false);
   gpio_disable_pulls(CLKPIN);
   gpio_disable_pulls(RWPIN);
+  gpio_disable_pulls(NMIPIN);
   // gpio_set_pulls(BUGPIN, false, true);
 
 }