Procházet zdrojové kódy

Fixed: warning: extra tokens at end of #endif directive

jbrazio před 9 roky
rodič
revize
80f221ed11
1 změnil soubory, kde provedl 6 přidání a 6 odebrání
  1. 6
    6
      Marlin/ultralcd.cpp

+ 6
- 6
Marlin/ultralcd.cpp Zobrazit soubor

486
 #if ENABLED(BABYSTEPPING)
486
 #if ENABLED(BABYSTEPPING)
487
 
487
 
488
   static void _lcd_babystep(const int axis, const char* msg) {
488
   static void _lcd_babystep(const int axis, const char* msg) {
489
-    ENCODER_DIRECTION_NORMAL(); 
489
+    ENCODER_DIRECTION_NORMAL();
490
     if (encoderPosition != 0) {
490
     if (encoderPosition != 0) {
491
       encoderPosition = 0;
491
       encoderPosition = 0;
492
       lcdDrawUpdate = 1;
492
       lcdDrawUpdate = 1;
901
 static void lcd_move_menu_axis();
901
 static void lcd_move_menu_axis();
902
 
902
 
903
 static void _lcd_move(const char* name, AxisEnum axis, int min, int max) {
903
 static void _lcd_move(const char* name, AxisEnum axis, int min, int max) {
904
-  ENCODER_DIRECTION_NORMAL(); 
904
+  ENCODER_DIRECTION_NORMAL();
905
   if ((encoderPosition != 0) && (movesplanned() <= 3)) {
905
   if ((encoderPosition != 0) && (movesplanned() <= 3)) {
906
     refresh_cmd_timeout();
906
     refresh_cmd_timeout();
907
     current_position[axis] += float((int)encoderPosition) * move_menu_scale;
907
     current_position[axis] += float((int)encoderPosition) * move_menu_scale;
929
     uint8_t e
929
     uint8_t e
930
   #endif
930
   #endif
931
 ) {
931
 ) {
932
-  ENCODER_DIRECTION_NORMAL(); 
932
+  ENCODER_DIRECTION_NORMAL();
933
   #if EXTRUDERS > 1
933
   #if EXTRUDERS > 1
934
     unsigned short original_active_extruder = active_extruder;
934
     unsigned short original_active_extruder = active_extruder;
935
     active_extruder = e;
935
     active_extruder = e;
1092
     enqueue_and_echo_command_now(cmd);
1092
     enqueue_and_echo_command_now(cmd);
1093
   }
1093
   }
1094
 
1094
 
1095
-#endif PIDTEMP || PIDTEMPBED
1095
+#endif //PIDTEMP || PIDTEMPBED
1096
 
1096
 
1097
 #if ENABLED(PIDTEMP)
1097
 #if ENABLED(PIDTEMP)
1098
 
1098
 
1514
  *
1514
  *
1515
  *
1515
  *
1516
  * Also: MENU_MULTIPLIER_ITEM_EDIT, MENU_ITEM_EDIT_CALLBACK, and MENU_MULTIPLIER_ITEM_EDIT_CALLBACK
1516
  * Also: MENU_MULTIPLIER_ITEM_EDIT, MENU_ITEM_EDIT_CALLBACK, and MENU_MULTIPLIER_ITEM_EDIT_CALLBACK
1517
- *     
1517
+ *
1518
  *       menu_action_setting_edit_int3(PSTR(MSG_SPEED), &feedrate_multiplier, 10, 999)
1518
  *       menu_action_setting_edit_int3(PSTR(MSG_SPEED), &feedrate_multiplier, 10, 999)
1519
  */
1519
  */
1520
 #define menu_edit_type(_type, _name, _strFunc, scale) \
1520
 #define menu_edit_type(_type, _name, _strFunc, scale) \
2380
    *   - Click saves the Z and goes to the next mesh point
2380
    *   - Click saves the Z and goes to the next mesh point
2381
    */
2381
    */
2382
   static void _lcd_level_bed() {
2382
   static void _lcd_level_bed() {
2383
-    ENCODER_DIRECTION_NORMAL(); 
2383
+    ENCODER_DIRECTION_NORMAL();
2384
     if ((encoderPosition != 0) && (movesplanned() <= 3)) {
2384
     if ((encoderPosition != 0) && (movesplanned() <= 3)) {
2385
       refresh_cmd_timeout();
2385
       refresh_cmd_timeout();
2386
       current_position[Z_AXIS] += float((int)encoderPosition) * (MBL_Z_STEP);
2386
       current_position[Z_AXIS] += float((int)encoderPosition) * (MBL_Z_STEP);

Loading…
Zrušit
Uložit