josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Phil Hord 2015-07-27 15:55:22 -04:00 committed by Markus Hitter
parent 22b640697b
commit 15e8dec9b2
18 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile-common
View File

@ -126,6 +126,9 @@ regressiontests:
# Generic Teensy2 configuration, which uses USB_SERIAL. # Generic Teensy2 configuration, which uses USB_SERIAL.
$(MAKE) -f Makefile-AVR USER_CONFIG=testcases/config.regtest-teensy2.h \ $(MAKE) -f Makefile-AVR USER_CONFIG=testcases/config.regtest-teensy2.h \
MCU=atmega32u4 F_CPU=16000000UL EXTRA_CFLAGS=-Werror all 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. # The configuration used for performance measurements.
$(MAKE) -f Makefile-AVR USER_CONFIG=testcases/config.h.Profiling \ $(MAKE) -f Makefile-AVR USER_CONFIG=testcases/config.h.Profiling \
MCU=atmega644 F_CPU=20000000UL EXTRA_CFLAGS=-Werror all MCU=atmega644 F_CPU=20000000UL EXTRA_CFLAGS=-Werror all

3
config/board.3drag.h
View File

@ -42,6 +42,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO54 #define X_STEP_PIN DIO54
#define X_DIR_PIN DIO55 #define X_DIR_PIN DIO55
#define X_MIN_PIN DIO3 #define X_MIN_PIN DIO3

3
config/board.cnc-shield-v3.h
View File

@ -45,6 +45,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO2 #define X_STEP_PIN DIO2
#define X_DIR_PIN DIO5 #define X_DIR_PIN DIO5
#define X_MIN_PIN DIO9 #define X_MIN_PIN DIO9

3
config/board.gen3.h
View File

@ -42,6 +42,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
#define TX_ENABLE_PIN DIO12
#define RX_ENABLE_PIN DIO13
#define X_STEP_PIN DIO15 #define X_STEP_PIN DIO15
#define X_DIR_PIN DIO18 #define X_DIR_PIN DIO18
#define X_MIN_PIN DIO20 #define X_MIN_PIN DIO20

3
config/board.gen6.h
View File

@ -42,6 +42,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO15 #define X_STEP_PIN DIO15
#define X_DIR_PIN DIO18 #define X_DIR_PIN DIO18
#define X_MIN_PIN DIO20 #define X_MIN_PIN DIO20

3
config/board.gen7-v1.1-v1.3.h
View File

@ -46,6 +46,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO19 #define X_STEP_PIN DIO19
#define X_DIR_PIN DIO18 #define X_DIR_PIN DIO18
#define X_MIN_PIN DIO7 #define X_MIN_PIN DIO7

3
config/board.gen7-v1.4.h
View File

@ -46,6 +46,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO29 #define X_STEP_PIN DIO29
#define X_DIR_PIN DIO28 #define X_DIR_PIN DIO28
#define X_MIN_PIN DIO0 #define X_MIN_PIN DIO0

3
config/board.nanoheart-v1.0.h
View File

@ -45,6 +45,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO2 #define X_STEP_PIN DIO2
#define X_DIR_PIN DIO4 #define X_DIR_PIN DIO4
//#define X_MIN_PIN AIO2 //#define X_MIN_PIN AIO2

3
config/board.ramps-v1.2.h
View File

@ -43,6 +43,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO26 #define X_STEP_PIN DIO26
#define X_DIR_PIN DIO28 #define X_DIR_PIN DIO28
#define X_MIN_PIN DIO3 #define X_MIN_PIN DIO3

3
config/board.ramps-v1.3.h
View File

@ -43,6 +43,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO54 #define X_STEP_PIN DIO54
#define X_DIR_PIN DIO55 #define X_DIR_PIN DIO55
#define X_MIN_PIN DIO3 #define X_MIN_PIN DIO3

3
config/board.rumba.h
View File

@ -42,6 +42,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO17 #define X_STEP_PIN DIO17
#define X_DIR_PIN DIO16 #define X_DIR_PIN DIO16
#define X_MIN_PIN DIO37 #define X_MIN_PIN DIO37

3
config/board.sanguinololu-v1.1.h
View File

@ -45,6 +45,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO15 #define X_STEP_PIN DIO15
#define X_DIR_PIN DIO21 #define X_DIR_PIN DIO21
#define X_MIN_PIN DIO18 #define X_MIN_PIN DIO18

3
config/board.sanguinololu-v1.2.h
View File

@ -45,6 +45,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO15 #define X_STEP_PIN DIO15
#define X_DIR_PIN DIO21 #define X_DIR_PIN DIO21
#define X_MIN_PIN DIO18 #define X_MIN_PIN DIO18

3
config/board.sanguish.h
View File

@ -45,6 +45,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO28 #define X_STEP_PIN DIO28
#define X_DIR_PIN DIO27 #define X_DIR_PIN DIO27
#define X_MIN_PIN DIO2 #define X_MIN_PIN DIO2

3
config/board.teensy++-v2.0.h
View File

@ -42,6 +42,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO28 #define X_STEP_PIN DIO28
#define X_DIR_PIN DIO29 #define X_DIR_PIN DIO29
#define X_MIN_PIN DIO2 #define X_MIN_PIN DIO2

3
config/board.teensy-v2.0.h
View File

@ -42,6 +42,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
//#define TX_ENABLE_PIN xxxx
//#define RX_ENABLE_PIN xxxx
#define X_STEP_PIN DIO18 #define X_STEP_PIN DIO18
#define X_DIR_PIN DIO17 #define X_DIR_PIN DIO17
#define X_MIN_PIN DIO1 #define X_MIN_PIN DIO1

3
configtool/board.generic.h
View File

@ -43,6 +43,9 @@
* * * *
\***************************************************************************/ \***************************************************************************/
#define TX_ENABLE_PIN DIO12
#define RX_ENABLE_PIN DIO13
#define X_STEP_PIN DIO54 #define X_STEP_PIN DIO54
#define X_DIR_PIN DIO55 #define X_DIR_PIN DIO55
#define X_MIN_PIN DIO3 #define X_MIN_PIN DIO3

6
testcases/config.regtest-gen3.h Normal file
View File

@ -0,0 +1,6 @@
// Configuration for controller board.
#include "../config/board.gen3.h"
// Configuration for printer board.
#include "../config/printer.wolfstrap.h"