From 7faab99671c6560d75c2dfbf07ff4613896b7d13 Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Fri, 27 Nov 2015 16:54:41 +0100 Subject: [PATCH] board.gen7-arm.h: adjust for the released Gen7-ARM. Just a few pin changes and similar stuff, no code change. --- Makefile-ARM | 12 +++--------- config/board.gen7-arm.h | 18 +++++++++--------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/Makefile-ARM b/Makefile-ARM index 39ed0ef..db85f90 100644 --- a/Makefile-ARM +++ b/Makefile-ARM @@ -41,13 +41,6 @@ ############################################################################## MCU ?= lpc1114 -# MCU ?= atmega328p -# MCU ?= atmega644 -# MCU ?= atmega1284p -# MCU ?= atmega1280 -# MCU ?= atmega2560 -# MCU ?= at90usb1286 -# MCU ?= atmega32u4 # CPU clock rate not defined here, but in the CMSIS headers. @@ -74,11 +67,12 @@ TOOLCHAIN = arm-none-eabi- # in the rules for the 'program' target. # Frequency of the on-chip R/C oscillator or the on-board quartz crystal. +# Not to confuse with the CPU's clock frequency, which is usually much higher. F_CRYSTAL ?= 12000000 # Serial port the electronics is connected to. -UPLOADER_PORT ?= /dev/ttyUSB0 -#UPLOADER_PORT ?= /dev/ttyACM0 +#UPLOADER_PORT ?= /dev/ttyUSB0 +UPLOADER_PORT ?= /dev/ttyACM0 #UPLOADER_PORT ?= com1 ############################################################################## diff --git a/config/board.gen7-arm.h b/config/board.gen7-arm.h index 62a2668..003f066 100644 --- a/config/board.gen7-arm.h +++ b/config/board.gen7-arm.h @@ -75,15 +75,15 @@ //#define Z_INVERT_MAX //#define Z_INVERT_ENABLE -#define E_STEP_PIN PIO0_4 +#define E_STEP_PIN PIO0_3 #define E_DIR_PIN PIO0_7 //#define E_ENABLE_PIN xxxx //#define E_INVERT_DIR //#define E_INVERT_ENABLE -#define PS_ON_PIN PIO0_3 +#define PS_ON_PIN PIO0_4 //#define PS_MOSFET_PIN xxxx -#define STEPPER_ENABLE_PIN PIO0_3 +#define STEPPER_ENABLE_PIN PIO0_4 #define STEPPER_INVERT_ENABLE /** \def DEBUG_LED_PIN @@ -96,7 +96,7 @@ a LED in hardware), see http://reprap.org/wiki/Teacup_Firmware#Doing_precision_profiling */ -#define DEBUG_LED_PIN PIO1_9 +//#define DEBUG_LED_PIN PIO1_9 /** \def SD_CARD_SELECT_PIN @@ -163,12 +163,12 @@ */ //DEFINE_TEMP_SENSORS_START // name type pin additional -DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, PIO1_0,THERMISTOR_EXTRUDER) -DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, PIO1_1,THERMISTOR_BED) +DEFINE_TEMP_SENSOR(extruder, TT_THERMISTOR, PIO1_1,THERMISTOR_EXTRUDER) +DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, PIO1_0,THERMISTOR_BED) // Beta algorithm r0 beta r2 vadc // Steinhart-Hart rp t0 r0 t1 r1 t2 r2 -//TEMP_TABLE EXTRUDER (100000, 4092, 4700, 5.0) +//TEMP_TABLE EXTRUDER (100000, 4092, 1000, 5.0) //TEMP_TABLE BED (100000, 4092, 4700, 5.0) //DEFINE_TEMP_SENSORS_END @@ -188,7 +188,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, PIO1_1,THERMISTOR_BED) commented out. */ //#define HEATER_PIN PIO0_10 -//#define HEATER_PIN PIO0_11 +//#define HEATER_PIN PIO1_9 /** \def DEFINE_HEATER Define your heaters and devices here. @@ -233,7 +233,7 @@ DEFINE_TEMP_SENSOR(bed, TT_THERMISTOR, PIO1_1,THERMISTOR_BED) //DEFINE_HEATERS_START // name pin invert pwm DEFINE_HEATER(extruder, PIO0_10, 0, 20000) -DEFINE_HEATER(bed, PIO0_11, 1, 10) +DEFINE_HEATER(bed, PIO1_9, 1, 10) #define HEATER_EXTRUDER HEATER_extruder #define HEATER_BED HEATER_bed