diff --git a/speeduino/board_teensy35.h b/speeduino/board_teensy35.h
index 5da03d91..87b4aefc 100644
--- a/speeduino/board_teensy35.h
+++ b/speeduino/board_teensy35.h
@@ -18,8 +18,9 @@
   #define SERIAL_BUFFER_SIZE 517 //Size of the serial buffer used by new comms protocol. For SD transfers this must be at least 512 + 1 (flag) + 4 (sector)
   #define FPU_MAX_SIZE 32 //Size of the FPU buffer. 0 means no FPU.
   #define SD_LOGGING //SD logging enabled by default for Teensy 3.5 as it has the slot built in
-  #define BOARD_MAX_DIGITAL_PINS 34
-  #define BOARD_MAX_IO_PINS 34 //digital pins + analog channels + 1
+  #define BOARD_MAX_DIGITAL_PINS 57
+  #define BOARD_MAX_IO_PINS 57
+  #define BOARD_MAX_ADC_PINS  26 //Number of analog pins
   #ifdef USE_SPI_EEPROM
     #define EEPROM_LIB_H "src/SPIAsEEPROM/SPIAsEEPROM.h"
     typedef uint16_t eeprom_address_t;
diff --git a/speeduino/board_teensy41.h b/speeduino/board_teensy41.h
index c77c0cfd..cc101481 100644
--- a/speeduino/board_teensy41.h
+++ b/speeduino/board_teensy41.h
@@ -19,8 +19,9 @@
   #define COUNTER_TYPE uint16_t
   #define SERIAL_BUFFER_SIZE 517 //Size of the serial buffer used by new comms protocol. For SD transfers this must be at least 512 + 1 (flag) + 4 (sector)
   #define FPU_MAX_SIZE 32 //Size of the FPU buffer. 0 means no FPU.
-  #define BOARD_MAX_DIGITAL_PINS 34
-  #define BOARD_MAX_IO_PINS 34 //digital pins + analog channels + 1
+  #define BOARD_MAX_DIGITAL_PINS 54
+  #define BOARD_MAX_IO_PINS 54
+  #define BOARD_MAX_ADC_PINS  17 //Number of analog pins
   #define EEPROM_LIB_H <EEPROM.h>
   typedef int eeprom_address_t;
   #define RTC_ENABLED
diff --git a/speeduino/globals.h b/speeduino/globals.h
index 859aa5b8..277a7d26 100644
--- a/speeduino/globals.h
+++ b/speeduino/globals.h
@@ -65,11 +65,9 @@
   #if defined(__MK64FX512__) || defined(__MK66FX1M0__)
     #define CORE_TEENSY35
     #define BOARD_H "board_teensy35.h"
-    #define BOARD_MAX_ADC_PINS  22 //Number of analog pins
   #elif defined(__IMXRT1062__)
     #define CORE_TEENSY41
     #define BOARD_H "board_teensy41.h"
-    #define BOARD_MAX_ADC_PINS  17 //Number of analog pins
   #endif
   #define INJ_CHANNELS 8
   #define IGN_CHANNELS 8