Update

1a251e0c · MagoKimbra · 2f44269f · 1a251e0c · 1a251e0c
Commit 1a251e0c authored Mar 17, 2015 by MagoKimbra
Hide whitespace changes
Inline Side-by-side

Showing with 75 additions and 76 deletions

pins.h MarlinKimbra/pins.h +72 -72

stepper.cpp MarlinKimbra/stepper.cpp +3 -4

No files found.
--- a/MarlinKimbra/pins.h
+++ b/MarlinKimbra/pins.h
@@ -2026,78 +2026,78 @@
 /* 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
- #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
-	 //we can't regulate contrast by default
+    //we can't regulate contrast by default
-	 #define LCD_CONTRAST -1
+    #define LCD_CONTRAST -1
-     //LCD Pins
+    //LCD Pins
-     #ifdef DOGLCD
+    #ifdef DOGLCD
-	   #ifdef U8GLIB_ST7920 //SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
+      #ifdef U8GLIB_ST7920 //SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
-	  	 #define LCD_PINS_RS 30 //CS chip select /SS chip slave select
+        #define LCD_PINS_RS 30 //CS chip select /SS chip slave select
-	  	 #define LCD_PINS_ENABLE 29 //SID (MOSI)
+        #define LCD_PINS_ENABLE 29 //SID (MOSI)
-	  	 #define LCD_PINS_D4 17 //SCK (CLK) clock
+        #define LCD_PINS_D4 17 //SCK (CLK) clock
-	  	 #define BEEPER 27 // Pin 27 is take by LED_Pin, but Melzi LED do nothing with Marlin and I take this pin for BEEPER.... See here > [github.com] , If you want use this pin with Gcode M42 instead BEEPER
+        #define BEEPER 27 // Pin 27 is take by LED_Pin, but Melzi LED do nothing with Marlin and I take this pin for BEEPER.... See here > [github.com] , If you want use this pin with Gcode M42 instead BEEPER
-	   #else
+      #else
-	  	 // Pins for DOGM SPI LCD Support
+	  	  // Pins for DOGM SPI LCD Support
-	  	 #define DOGLCD_A0 30
+	  	  #define DOGLCD_A0 30
-	  	 #define DOGLCD_CS 29
+	  	  #define DOGLCD_CS 29
-		 #define LCD_CONTRAST 1
+		    #define LCD_CONTRAST 1
-	   #endif
+      #endif
-       // Uncomment screen orientation
+      // Uncomment screen orientation
-       #define LCD_SCREEN_ROT_0
+      #define LCD_SCREEN_ROT_0
-         // #define LCD_SCREEN_ROT_90
+      // #define LCD_SCREEN_ROT_90
-         // #define LCD_SCREEN_ROT_180
+      // #define LCD_SCREEN_ROT_180
-         // #define LCD_SCREEN_ROT_270
+      // #define LCD_SCREEN_ROT_270
-       #else // standard Hitachi LCD controller
+    #else // standard Hitachi LCD controller
-       #define LCD_PINS_RS        4
+      #define LCD_PINS_RS        4
-       #define LCD_PINS_ENABLE    17
+      #define LCD_PINS_ENABLE    17
-       #define LCD_PINS_D4        30
+      #define LCD_PINS_D4        30
-       #define LCD_PINS_D5        29
+      #define LCD_PINS_D5        29
-       #define LCD_PINS_D6        28
+      #define LCD_PINS_D6        28
-       #define LCD_PINS_D7        27
+      #define LCD_PINS_D7        27
-     #endif
+    #endif
-     //The encoder and click button
+    //The encoder and click button
-     #define BTN_EN1 11
+    #define BTN_EN1 11
-     #define BTN_EN2 10
+    #define BTN_EN2 10
-     #ifdef LCD_I2C_PANELOLU2
+    #ifdef LCD_I2C_PANELOLU2
-       #ifdef MELZI
+      #ifdef MELZI
-         #define BTN_ENC 29 //the click switch
+        #define BTN_ENC 29 //the click switch
-         #define LCD_SDSS 30 //to use the SD card reader on the Panelolu2 rather than the melzi board
+        #define LCD_SDSS 30 //to use the SD card reader on the Panelolu2 rather than the melzi board
-       #else
+      #else
-         #define BTN_ENC 30 //the click switch
+        #define BTN_ENC 30 //the click switch
-       #endif
+      #endif
-     #else
+    #else
-       #define BTN_ENC 16  //the click switch
+      #define BTN_ENC 16  //the click switch
-       #define LCD_SDSS 28 //to use the SD card reader on the smart controller rather than the melzi board
+      #define LCD_SDSS 28 //to use the SD card reader on the smart controller rather than the melzi board
-     #endif //Panelolu2
+    #endif //Panelolu2
-     //not connected to a pin
+    //not connected to a pin
-     #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
-     #define DOGLCD_CS  17
+  #define DOGLCD_CS  17
-     #define LCD_PIN_BL 28  // backlight LED on PA3
+  #define LCD_PIN_BL 28  // backlight LED on PA3
-     // GLCD features
+  // GLCD features
-     #define LCD_CONTRAST 1
+  #define LCD_CONTRAST 1
-     // Uncomment screen orientation
+  // Uncomment screen orientation
-     #define LCD_SCREEN_ROT_0
+  #define LCD_SCREEN_ROT_0
-       // #define LCD_SCREEN_ROT_90
+  // #define LCD_SCREEN_ROT_90
-       // #define LCD_SCREEN_ROT_180
+  // #define LCD_SCREEN_ROT_180
-       // #define LCD_SCREEN_ROT_270
+  // #define LCD_SCREEN_ROT_270
-     //The encoder and click button
+  //The encoder and click button
-     #define BTN_EN1 11
+  #define BTN_EN1 11
-     #define BTN_EN2 10
+  #define BTN_EN2 10
-     #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
 /****************************************************************************************/

--- a/MarlinKimbra/stepper.cpp
+++ b/MarlinKimbra/stepper.cpp
@@ -596,10 +596,10 @@ ISR(TIMER1_COMPA_vect) {
        #endif
        #define STEP_IF_COUNTER(axis, AXIS) \
-          if (counter_## axis > 0) {
+          if (counter_## axis > 0) { \
            counter_## axis -= current_block->step_event_count; \
            count_position[AXIS ##_AXIS] += count_direction[AXIS ##_AXIS]; \
-            AXIS ##_STEP_WRITE(LOW);
+            AXIS ##_STEP_WRITE(LOW); \
          }
        STEP_IF_COUNTER(x, X);
@@ -711,7 +711,7 @@ ISR(TIMER1_COMPA_vect) {
    // Set E direction (Depends on E direction + advance)
    for(unsigned char i=0; i<4;i++) {
      if (e_steps[0] != 0) {
-        E0_STEP_WRITE( INVERT_E_STEP_PIN);
+        E0_STEP_WRITE(INVERT_E_STEP_PIN);
        if (e_steps[0] < 0) {
          E0_DIR_WRITE(INVERT_E0_DIR);
          e_steps[0]++;
@@ -786,7 +786,6 @@ void st_init() {
    L6470_init();
  #endif
  // Initialize Dir Pins
  #if defined(X_DIR_PIN) && X_DIR_PIN >= 0
    X_DIR_INIT;