summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Sprinter/Configuration.h2
-rw-r--r--Sprinter/Sprinter.pde2
-rw-r--r--Sprinter/fastio.h48
-rw-r--r--Sprinter/pins.h47
4 files changed, 26 insertions, 73 deletions
diff --git a/Sprinter/Configuration.h b/Sprinter/Configuration.h
index 2a57812..344a7bd 100644
--- a/Sprinter/Configuration.h
+++ b/Sprinter/Configuration.h
@@ -9,7 +9,7 @@
// Gen6 = 5,
// Sanguinololu up to 1.1 = 6
// Sanguinololu 1.2 and above = 62
-// Gen 7 = 7
+// Gen 7 @ 16MHZ only= 7
// Teensylu (at90usb) = 8
// Gen 3 Plus = 21
// gen 3 Monolithic Electronics = 22
diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde
index 1322b30..c8acc67 100644
--- a/Sprinter/Sprinter.pde
+++ b/Sprinter/Sprinter.pde
@@ -92,7 +92,7 @@ float axis_diff[NUM_AXIS] = {0, 0, 0, 0};
long long_step_delay_ratio = STEP_DELAY_RATIO * 100;
#endif
///oscillation reduction
-ifdef RAPID_OSCILLATION_REDUCTION
+#ifdef RAPID_OSCILLATION_REDUCTION
float cumm_wait_time_in_dir[NUM_AXIS]={0.0,0.0,0.0,0.0};
bool prev_move_direction[NUM_AXIS]={1,1,1,1};
float osc_wait_remainder = 0.0;
diff --git a/Sprinter/fastio.h b/Sprinter/fastio.h
index 5f1f5d1..6b5572a 100644
--- a/Sprinter/fastio.h
+++ b/Sprinter/fastio.h
@@ -625,54 +625,6 @@ pins
#define DIO31_DDR DDRA
#define DIO31_PWM NULL
-#define DIO33_PIN PINA7
-#define DIO33_RPORT PINA
-#define DIO33_WPORT PORTA
-#define DIO33_DDR DDRA
-#define DIO33_PWM NULL
-
-#define DIO34_PIN PINA6
-#define DIO34_RPORT PINA
-#define DIO34_WPORT PORTA
-#define DIO34_DDR DDRA
-#define DIO34_PWM NULL
-
-#define DIO35_PIN PINA5
-#define DIO35_RPORT PINA
-#define DIO35_WPORT PORTA
-#define DIO35_DDR DDRA
-#define DIO35_PWM NULL
-
-#define DIO36_PIN PINA4
-#define DIO36_RPORT PINA
-#define DIO36_WPORT PORTA
-#define DIO36_DDR DDRA
-#define DIO36_PWM NULL
-
-#define DIO37_PIN PINA3
-#define DIO37_RPORT PINA
-#define DIO37_WPORT PORTA
-#define DIO37_DDR DDRA
-#define DIO37_PWM NULL
-
-#define DIO38_PIN PINA2
-#define DIO38_RPORT PINA
-#define DIO38_WPORT PORTA
-#define DIO38_DDR DDRA
-#define DIO38_PWM NULL
-
-#define DIO39_PIN PINA1
-#define DIO39_RPORT PINA
-#define DIO39_WPORT PORTA
-#define DIO39_DDR DDRA
-#define DIO39_PWM NULL
-
-#define DIO40_PIN PINA0
-#define DIO40_RPORT PINA
-#define DIO40_WPORT PORTA
-#define DIO40_DDR DDRA
-#define DIO40_PWM NULL
-
#define AIO0_PIN PINA0
#define AIO0_RPORT PINA
#define AIO0_WPORT PORTA
diff --git a/Sprinter/pins.h b/Sprinter/pins.h
index 01f29ed..3bc337e 100644
--- a/Sprinter/pins.h
+++ b/Sprinter/pins.h
@@ -686,6 +686,7 @@
#endif
+
/****************************************************************************************
* Gen7 pin assignment
*
@@ -693,46 +694,46 @@
#if MOTHERBOARD == 7
#define KNOWN_BOARD 1
-#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) && !defined(__AVR_ATmega644__)
+#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) && !defined(__AVR_ATmega644__)
#error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu.
#endif
//x axis pins
- #define X_STEP_PIN 15
+ #define X_STEP_PIN 19
#define X_DIR_PIN 18
- #define X_ENABLE_PIN 33
- #define X_MIN_PIN 8
- #define X_MAX_PIN 7
+ #define X_ENABLE_PIN -1
+ #define X_MIN_PIN 7
+ #define X_MAX_PIN 6
//y axis pins
- #define Y_STEP_PIN 29
- #define Y_DIR_PIN 28
- #define Y_ENABLE_PIN 33
- #define Y_MIN_PIN 3
- #define Y_MAX_PIN 6
+ #define Y_STEP_PIN 23
+ #define Y_DIR_PIN 22
+ #define Y_ENABLE_PIN -1
+ #define Y_MIN_PIN 5
+ #define Y_MAX_PIN 2
//z axis pins
- #define Z_STEP_PIN 35
- #define Z_DIR_PIN 34
- #define Z_ENABLE_PIN 33
- #define Z_MIN_PIN 2
- #define Z_MAX_PIN 1
+ #define Z_STEP_PIN 26
+ #define Z_DIR_PIN 25
+ #define Z_ENABLE_PIN 24
+ #define Z_MIN_PIN 1
+ #define Z_MAX_PIN 0
//extruder pins
- #define E_STEP_PIN 37
- #define E_DIR_PIN 36
- #define E_ENABLE_PIN 33
- #define TEMP_0_PIN 39 // Extruder
- #define HEATER_0_PIN 5 // Extruder
- #define HEATER_1_PIN 4 // Bed
+ #define E_STEP_PIN 28
+ #define E_DIR_PIN 27
+ #define E_ENABLE_PIN -1
+ #define TEMP_0_PIN 1 // Extruder
+ #define HEATER_0_PIN 4 // Extruder
+ #define HEATER_1_PIN 3 // Bed
#define SDPOWER -1
#define SDSS -1
#define LED_PIN -1
- #define TEMP_1_PIN 38 //Bed
+ #define TEMP_1_PIN 2 //Bed
#define FAN_PIN -1
- #define PS_ON_PIN 21
+ #define PS_ON_PIN 15
#endif