From 15e8dec9b22d31bb80a0182649a1b5a50a9038c7 Mon Sep 17 00:00:00 2001 From: Phil Hord Date: Mon, 27 Jul 2015 15:55:22 -0400 Subject: [PATCH] board.gen3.h: restore {TX,RX}_ENABLE_PIN defs. These were dropped accidentally, I assume, during the Configtool template conversion. Without them the INTERCOM feature does not compile and so board.gen3.h is broken. Add the gen3 config to testcases and regressiontests to ensure this does not drop again. --- Makefile-common | 3 +++ config/board.3drag.h | 3 +++ config/board.cnc-shield-v3.h | 3 +++ config/board.gen3.h | 3 +++ config/board.gen6.h | 3 +++ config/board.gen7-v1.1-v1.3.h | 3 +++ config/board.gen7-v1.4.h | 3 +++ config/board.nanoheart-v1.0.h | 3 +++ config/board.ramps-v1.2.h | 3 +++ config/board.ramps-v1.3.h | 3 +++ config/board.rumba.h | 3 +++ config/board.sanguinololu-v1.1.h | 3 +++ config/board.sanguinololu-v1.2.h | 3 +++ config/board.sanguish.h | 3 +++ config/board.teensy++-v2.0.h | 3 +++ config/board.teensy-v2.0.h | 3 +++ configtool/board.generic.h | 3 +++ testcases/config.regtest-gen3.h | 6 ++++++ 18 files changed, 57 insertions(+) create mode 100644 testcases/config.regtest-gen3.h diff --git a/Makefile-common b/Makefile-common index da98adc..c7a24a1 100644 --- a/Makefile-common +++ b/Makefile-common @@ -126,6 +126,9 @@ regressiontests: # Generic Teensy2 configuration, which uses USB_SERIAL. $(MAKE) -f Makefile-AVR USER_CONFIG=testcases/config.regtest-teensy2.h \ MCU=atmega32u4 F_CPU=16000000UL EXTRA_CFLAGS=-Werror all + # Generic Gen3 configuration for {TX,RX}_ENABLE_PIN. + $(MAKE) -f Makefile-AVR USER_CONFIG=testcases/config.regtest-gen3.h \ + MCU=atmega644p F_CPU=16000000UL EXTRA_CFLAGS=-Werror all # The configuration used for performance measurements. $(MAKE) -f Makefile-AVR USER_CONFIG=testcases/config.h.Profiling \ MCU=atmega644 F_CPU=20000000UL EXTRA_CFLAGS=-Werror all diff --git a/config/board.3drag.h b/config/board.3drag.h index f3c7ab7..afaaab3 100644 --- a/config/board.3drag.h +++ b/config/board.3drag.h @@ -42,6 +42,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO54 #define X_DIR_PIN DIO55 #define X_MIN_PIN DIO3 diff --git a/config/board.cnc-shield-v3.h b/config/board.cnc-shield-v3.h index 1362cb1..c413af7 100644 --- a/config/board.cnc-shield-v3.h +++ b/config/board.cnc-shield-v3.h @@ -45,6 +45,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO2 #define X_DIR_PIN DIO5 #define X_MIN_PIN DIO9 diff --git a/config/board.gen3.h b/config/board.gen3.h index 78d1727..88b9910 100644 --- a/config/board.gen3.h +++ b/config/board.gen3.h @@ -42,6 +42,9 @@ * * \***************************************************************************/ +#define TX_ENABLE_PIN DIO12 +#define RX_ENABLE_PIN DIO13 + #define X_STEP_PIN DIO15 #define X_DIR_PIN DIO18 #define X_MIN_PIN DIO20 diff --git a/config/board.gen6.h b/config/board.gen6.h index ae4f39d..8349c27 100644 --- a/config/board.gen6.h +++ b/config/board.gen6.h @@ -42,6 +42,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO15 #define X_DIR_PIN DIO18 #define X_MIN_PIN DIO20 diff --git a/config/board.gen7-v1.1-v1.3.h b/config/board.gen7-v1.1-v1.3.h index 42f56bb..073e34a 100644 --- a/config/board.gen7-v1.1-v1.3.h +++ b/config/board.gen7-v1.1-v1.3.h @@ -46,6 +46,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO19 #define X_DIR_PIN DIO18 #define X_MIN_PIN DIO7 diff --git a/config/board.gen7-v1.4.h b/config/board.gen7-v1.4.h index fdf43d8..aa70709 100644 --- a/config/board.gen7-v1.4.h +++ b/config/board.gen7-v1.4.h @@ -46,6 +46,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO29 #define X_DIR_PIN DIO28 #define X_MIN_PIN DIO0 diff --git a/config/board.nanoheart-v1.0.h b/config/board.nanoheart-v1.0.h index 66d1c3e..655b744 100644 --- a/config/board.nanoheart-v1.0.h +++ b/config/board.nanoheart-v1.0.h @@ -45,6 +45,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO2 #define X_DIR_PIN DIO4 //#define X_MIN_PIN AIO2 diff --git a/config/board.ramps-v1.2.h b/config/board.ramps-v1.2.h index c573527..8512d05 100644 --- a/config/board.ramps-v1.2.h +++ b/config/board.ramps-v1.2.h @@ -43,6 +43,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO26 #define X_DIR_PIN DIO28 #define X_MIN_PIN DIO3 diff --git a/config/board.ramps-v1.3.h b/config/board.ramps-v1.3.h index 4d455d3..bad1e22 100644 --- a/config/board.ramps-v1.3.h +++ b/config/board.ramps-v1.3.h @@ -43,6 +43,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO54 #define X_DIR_PIN DIO55 #define X_MIN_PIN DIO3 diff --git a/config/board.rumba.h b/config/board.rumba.h index 7eb3986..012db3e 100644 --- a/config/board.rumba.h +++ b/config/board.rumba.h @@ -42,6 +42,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO17 #define X_DIR_PIN DIO16 #define X_MIN_PIN DIO37 diff --git a/config/board.sanguinololu-v1.1.h b/config/board.sanguinololu-v1.1.h index 573e66e..54ec6e1 100644 --- a/config/board.sanguinololu-v1.1.h +++ b/config/board.sanguinololu-v1.1.h @@ -45,6 +45,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO15 #define X_DIR_PIN DIO21 #define X_MIN_PIN DIO18 diff --git a/config/board.sanguinololu-v1.2.h b/config/board.sanguinololu-v1.2.h index de2946e..c8906d9 100644 --- a/config/board.sanguinololu-v1.2.h +++ b/config/board.sanguinololu-v1.2.h @@ -45,6 +45,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO15 #define X_DIR_PIN DIO21 #define X_MIN_PIN DIO18 diff --git a/config/board.sanguish.h b/config/board.sanguish.h index 68c703a..bed32c5 100644 --- a/config/board.sanguish.h +++ b/config/board.sanguish.h @@ -45,6 +45,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO28 #define X_DIR_PIN DIO27 #define X_MIN_PIN DIO2 diff --git a/config/board.teensy++-v2.0.h b/config/board.teensy++-v2.0.h index bdc8a2e..39f4cb3 100644 --- a/config/board.teensy++-v2.0.h +++ b/config/board.teensy++-v2.0.h @@ -42,6 +42,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO28 #define X_DIR_PIN DIO29 #define X_MIN_PIN DIO2 diff --git a/config/board.teensy-v2.0.h b/config/board.teensy-v2.0.h index 85a1b77..9f716b8 100644 --- a/config/board.teensy-v2.0.h +++ b/config/board.teensy-v2.0.h @@ -42,6 +42,9 @@ * * \***************************************************************************/ +//#define TX_ENABLE_PIN xxxx +//#define RX_ENABLE_PIN xxxx + #define X_STEP_PIN DIO18 #define X_DIR_PIN DIO17 #define X_MIN_PIN DIO1 diff --git a/configtool/board.generic.h b/configtool/board.generic.h index af545da..1d8a96c 100644 --- a/configtool/board.generic.h +++ b/configtool/board.generic.h @@ -43,6 +43,9 @@ * * \***************************************************************************/ +#define TX_ENABLE_PIN DIO12 +#define RX_ENABLE_PIN DIO13 + #define X_STEP_PIN DIO54 #define X_DIR_PIN DIO55 #define X_MIN_PIN DIO3 diff --git a/testcases/config.regtest-gen3.h b/testcases/config.regtest-gen3.h new file mode 100644 index 0000000..bda223a --- /dev/null +++ b/testcases/config.regtest-gen3.h @@ -0,0 +1,6 @@ + +// Configuration for controller board. +#include "../config/board.gen3.h" + +// Configuration for printer board. +#include "../config/printer.wolfstrap.h"