diff --git a/Firmware/OpeNITHM/Config.h b/Firmware/OpeNITHM/Config.h index be23fa8..d48817f 100644 --- a/Firmware/OpeNITHM/Config.h +++ b/Firmware/OpeNITHM/Config.h @@ -6,6 +6,10 @@ // *** USER EDITABLE CONFIG OPTIONS *** +// Select which board you're using (ignore if not using Teensy) +//#define TEESNY_V1_0 // Version 1.0 (No version number on board) +//#define TEENSY_V1_1 // Version 1.1 (v1.1 on board under logo) + // Uncomment this line to force the processor to use Serial Output //#define FORCE_SERIAL @@ -48,6 +52,13 @@ #ifndef FORCE_SERIAL #define USB #endif + +// Spit out errors for board definitions +#if !defined(TEESNY_V1_0) && !defined(TEENSY_V1_1) +#error "For Teensy, EITHER v1.0 OR v1.1 must be defined in Config.h" +#elif defined(TEESNY_V1_0) && defined(TEENSY_V1_1) +#error "For Teensy, cannot define BOTH v1.0 AND v1.1 in Config.h" +#endif #endif // Comment out these lines to force Serial output diff --git a/Firmware/OpeNITHM/PinConfig.h b/Firmware/OpeNITHM/PinConfig.h index 10bd0fe..9df7998 100644 --- a/Firmware/OpeNITHM/PinConfig.h +++ b/Firmware/OpeNITHM/PinConfig.h @@ -7,9 +7,15 @@ // Multiplexer pin settings #ifdef TEENSY // Teensy LC +#if defined(TEESNY_V1_0) #define MUX_0 20 #define MUX_1 19 #define MUX_2 18 +#elif defined(TEENSY_V1_1) +#define MUX_0 2 +#define MUX_1 1 +#define MUX_2 0 +#endif #else // Pro Micro #define MUX_0 20 #define MUX_1 19 @@ -18,9 +24,15 @@ // Sensor pin settings #ifdef TEENSY +#if defined(TEESNY_V1_0) #define LED_0 16 #define LED_1 21 #define LED_2 5 +#elif defined(TEENSY_V1_1) +#define LED_0 7 +#define LED_1 6 +#define LED_2 5 +#endif #else #define LED_0 0 #define LED_1 2 @@ -31,12 +43,21 @@ #define SENSOR_IN A0 #else #ifdef TEENSY +#if defined(TEESNY_V1_0) #define AIR_SENSOR_0_PIN 10 #define AIR_SENSOR_1_PIN 11 #define AIR_SENSOR_2_PIN 12 #define AIR_SENSOR_3_PIN 6 #define AIR_SENSOR_4_PIN 8 #define AIR_SENSOR_5_PIN 9 +#elif defined(TEENSY_V1_1) +#define AIR_SENSOR_0_PIN 20 +#define AIR_SENSOR_1_PIN 19 +#define AIR_SENSOR_2_PIN 18 +#define AIR_SENSOR_3_PIN 23 +#define AIR_SENSOR_4_PIN 21 +#define AIR_SENSOR_5_PIN 21 +#endif #else #define AIR_SENSOR_0_PIN 4 #define AIR_SENSOR_1_PIN 5 @@ -53,15 +74,24 @@ #define SEND 10 #ifdef TEENSY // Teensy LC +#if defined(TEESNY_V1_0) #define TOUCH_0 22 #define TOUCH_1 23 +#elif defined(TEENSY_V1_1) +#define TOUCH_0 16 +#define TOUCH_1 3 +#endif #endif // Lighting pin settings #define LED_TYPE WS2812B #define LED_ORDER GRB #ifdef TEENSY // Teensy LC +#if defined(TEESNY_V1_0) #define RGBPIN 4 +#elif defined(TEENSY_V1_1) +#define RGBPIN 11 +#endif #else #define RGBPIN 16 // Pro Micro #endif