Commit 1a251e0c authored by MagoKimbra's avatar MagoKimbra

Update

parent 2f44269f
...@@ -2026,7 +2026,7 @@ ...@@ -2026,7 +2026,7 @@
/* On some broken versions of the Sanguino libraries the pin definitions are wrong, which then needs SDSS as pin 24. But you better upgrade your Sanguino libraries! See #368. */ /* On some broken versions of the Sanguino libraries the pin definitions are wrong, which then needs SDSS as pin 24. But you better upgrade your Sanguino libraries! See #368. */
//#define SDSS 24 //#define SDSS 24
#ifdef ULTRA_LCD #ifdef ULTRA_LCD
#ifdef NEWPANEL #ifdef NEWPANEL
//we have no buzzer installed //we have no buzzer installed
#define BEEPER -1 #define BEEPER -1
...@@ -2076,9 +2076,9 @@ ...@@ -2076,9 +2076,9 @@
#define SDCARDDETECT -1 #define SDCARDDETECT -1
#endif //Newpanel #endif //Newpanel
#endif //Ultipanel #endif //ULTRA_LCD
#ifdef MAKRPANEL #ifdef MAKRPANEL
#define BEEPER 29 #define BEEPER 29
// Pins for DOGM SPI LCD Support // Pins for DOGM SPI LCD Support
#define DOGLCD_A0 30 #define DOGLCD_A0 30
...@@ -2097,7 +2097,7 @@ ...@@ -2097,7 +2097,7 @@
#define BTN_ENC 16 //the click switch #define BTN_ENC 16 //the click switch
//not connected to a pin //not connected to a pin
#define SDCARDDETECT -1 #define SDCARDDETECT -1
#endif //Makrpanel #endif //Makrpanel
#endif // SANGUINOLOLU_11 #endif // SANGUINOLOLU_11
/****************************************************************************************/ /****************************************************************************************/
......
...@@ -596,10 +596,10 @@ ISR(TIMER1_COMPA_vect) { ...@@ -596,10 +596,10 @@ ISR(TIMER1_COMPA_vect) {
#endif #endif
#define STEP_IF_COUNTER(axis, AXIS) \ #define STEP_IF_COUNTER(axis, AXIS) \
if (counter_## axis > 0) { if (counter_## axis > 0) { \
counter_## axis -= current_block->step_event_count; \ counter_## axis -= current_block->step_event_count; \
count_position[AXIS ##_AXIS] += count_direction[AXIS ##_AXIS]; \ count_position[AXIS ##_AXIS] += count_direction[AXIS ##_AXIS]; \
AXIS ##_STEP_WRITE(LOW); AXIS ##_STEP_WRITE(LOW); \
} }
STEP_IF_COUNTER(x, X); STEP_IF_COUNTER(x, X);
...@@ -711,7 +711,7 @@ ISR(TIMER1_COMPA_vect) { ...@@ -711,7 +711,7 @@ ISR(TIMER1_COMPA_vect) {
// Set E direction (Depends on E direction + advance) // Set E direction (Depends on E direction + advance)
for(unsigned char i=0; i<4;i++) { for(unsigned char i=0; i<4;i++) {
if (e_steps[0] != 0) { if (e_steps[0] != 0) {
E0_STEP_WRITE( INVERT_E_STEP_PIN); E0_STEP_WRITE(INVERT_E_STEP_PIN);
if (e_steps[0] < 0) { if (e_steps[0] < 0) {
E0_DIR_WRITE(INVERT_E0_DIR); E0_DIR_WRITE(INVERT_E0_DIR);
e_steps[0]++; e_steps[0]++;
...@@ -786,7 +786,6 @@ void st_init() { ...@@ -786,7 +786,6 @@ void st_init() {
L6470_init(); L6470_init();
#endif #endif
// Initialize Dir Pins // Initialize Dir Pins
#if defined(X_DIR_PIN) && X_DIR_PIN >= 0 #if defined(X_DIR_PIN) && X_DIR_PIN >= 0
X_DIR_INIT; X_DIR_INIT;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment