MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Cleanup trailing whitespace

Browse Source
This commit is contained in:
Scott Lahteine 2017-11-03 04:07:45 -05:00
parent 6827e243a0
commit 31f112cf58
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/gcode/calibrate/G33.cpp
View File

@ -50,8 +50,8 @@ enum CalEnum { // the 7 main calibration points -
_CA = __C + _7P_STEP, _CA = __C + _7P_STEP,
}; };
#define LOOP_CAL_PT(VAR, S, N) for (uint8_t VAR=S; VAR<=NPP; VAR+=N) #define LOOP_CAL_PT(VAR, S, N) for (uint8_t VAR=S; VAR<=NPP; VAR+=N)
#define F_LOOP_CAL_PT(VAR, S, N) for (float VAR=S; VAR<NPP+0.9999; VAR+=N) #define F_LOOP_CAL_PT(VAR, S, N) for (float VAR=S; VAR<NPP+0.9999; VAR+=N)
#define I_LOOP_CAL_PT(VAR, S, N) for (float VAR=S; VAR>CEN+0.9999; VAR-=N) #define I_LOOP_CAL_PT(VAR, S, N) for (float VAR=S; VAR>CEN+0.9999; VAR-=N)
#define LOOP_CAL_ALL(VAR) LOOP_CAL_PT(VAR, CEN, 1) #define LOOP_CAL_ALL(VAR) LOOP_CAL_PT(VAR, CEN, 1)
#define LOOP_CAL_RAD(VAR) LOOP_CAL_PT(VAR, __A, _7P_STEP) #define LOOP_CAL_RAD(VAR) LOOP_CAL_PT(VAR, __A, _7P_STEP)
@ -189,8 +189,8 @@ static float probe_G33_points(float z_at_pt[NPP + 1], const int8_t probe_points,
_7p_8_intermediates ? _7P_STEP / 9.0 : // 9r * 6 + 10c = 64 _7p_8_intermediates ? _7P_STEP / 9.0 : // 9r * 6 + 10c = 64
_7p_6_intermediates ? _7P_STEP / 7.0 : // 7r * 6 + 7c = 49 _7p_6_intermediates ? _7P_STEP / 7.0 : // 7r * 6 + 7c = 49
_7p_4_intermediates ? _7P_STEP / 5.0 : // 5r * 6 + 6c = 36 _7p_4_intermediates ? _7P_STEP / 5.0 : // 5r * 6 + 6c = 36
_7p_2_intermediates ? _7P_STEP / 3.0 : // 3r * 6 + 7c = 25 _7p_2_intermediates ? _7P_STEP / 3.0 : // 3r * 6 + 7c = 25
_7p_1_intermediates ? _7P_STEP / 2.0 : // 2r * 6 + 4c = 16 _7p_1_intermediates ? _7P_STEP / 2.0 : // 2r * 6 + 4c = 16
_7p_no_intermediates ? _7P_STEP : // 1r * 6 + 3c = 9 _7p_no_intermediates ? _7P_STEP : // 1r * 6 + 3c = 9
_4P_STEP; // .5r * 6 + 1c = 4 _4P_STEP; // .5r * 6 + 1c = 4
bool zig_zag = true; bool zig_zag = true;

8
Marlin/src/pins/pins_SILVER_GATE.h
View File

@ -20,7 +20,7 @@
* *
*/ */
#if !defined(__AVR_ATmega1281__) && !defined(__AVR_ATmega2561__) #if !defined(__AVR_ATmega1281__) && !defined(__AVR_ATmega2561__)
#error Oops! Make sure you have 'Silvergate' selected from the 'Tools -> Boards' menu. #error Oops! Make sure you have 'Silvergate' selected from the 'Tools -> Boards' menu.
#endif #endif
@ -71,7 +71,7 @@
#define TEMP_BED_PIN 6 #define TEMP_BED_PIN 6
#if ENABLED(DOGLCD) #if ENABLED(DOGLCD)
#if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 #if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920
#define LCD_PINS_RS 30 #define LCD_PINS_RS 30
#define LCD_PINS_ENABLE 20 #define LCD_PINS_ENABLE 20
#define LCD_PINS_D4 25 #define LCD_PINS_D4 25
@ -80,7 +80,7 @@
#define BTN_EN2 22 #define BTN_EN2 22
#define BTN_ENC 24 #define BTN_ENC 24
#define LCD_BACKLIGHT_PIN 6 #define LCD_BACKLIGHT_PIN 6
#if ENABLED(SILVER_GATE_GLCD_CONTROLLER) #if ENABLED(SILVER_GATE_GLCD_CONTROLLER)
#define KILL_PIN 21 #define KILL_PIN 21
#define HOME_PIN 28 #define HOME_PIN 28
#endif #endif
@ -88,7 +88,7 @@
#endif #endif
#define SD_DETECT_PIN 15 #define SD_DETECT_PIN 15
#define STAT_LED_RED_PIN 23 #define STAT_LED_RED_PIN 23
#define STAT_LED_BLUE_PIN 26 #define STAT_LED_BLUE_PIN 26
#define CASE_LIGHT_PIN 51 #define CASE_LIGHT_PIN 51