Josef Pavlik преди 8 години
родител
ревизия
0bd66807b2
променени са 2 файла, в които са добавени 21 реда и са изтрити 21 реда
  1. 9
    9
      Marlin/Marlin_main.cpp
  2. 12
    12
      Marlin/ultralcd.cpp

+ 9
- 9
Marlin/Marlin_main.cpp Целия файл

@@ -634,8 +634,8 @@ static bool send_ok[BUFSIZE];
634 634
   static inline type pgm_read_any(const type *p)  \
635 635
   { return pgm_read_##reader##_near(p); }
636 636
 
637
-DEFINE_PGM_READ_ANY(float,       float);
638
-DEFINE_PGM_READ_ANY(signed char, byte);
637
+DEFINE_PGM_READ_ANY(float,       float)
638
+DEFINE_PGM_READ_ANY(signed char, byte)
639 639
 
640 640
 #define XYZ_CONSTS_FROM_CONFIG(type, array, CONFIG) \
641 641
   static const PROGMEM type array##_P[XYZ] =        \
@@ -643,12 +643,12 @@ DEFINE_PGM_READ_ANY(signed char, byte);
643 643
   static inline type array(int axis)          \
644 644
   { return pgm_read_any(&array##_P[axis]); }
645 645
 
646
-XYZ_CONSTS_FROM_CONFIG(float, base_min_pos,   MIN_POS);
647
-XYZ_CONSTS_FROM_CONFIG(float, base_max_pos,   MAX_POS);
648
-XYZ_CONSTS_FROM_CONFIG(float, base_home_pos,  HOME_POS);
649
-XYZ_CONSTS_FROM_CONFIG(float, max_length,     MAX_LENGTH);
650
-XYZ_CONSTS_FROM_CONFIG(float, home_bump_mm,   HOME_BUMP_MM);
651
-XYZ_CONSTS_FROM_CONFIG(signed char, home_dir, HOME_DIR);
646
+XYZ_CONSTS_FROM_CONFIG(float, base_min_pos,   MIN_POS)
647
+XYZ_CONSTS_FROM_CONFIG(float, base_max_pos,   MAX_POS)
648
+XYZ_CONSTS_FROM_CONFIG(float, base_home_pos,  HOME_POS)
649
+XYZ_CONSTS_FROM_CONFIG(float, max_length,     MAX_LENGTH)
650
+XYZ_CONSTS_FROM_CONFIG(float, home_bump_mm,   HOME_BUMP_MM)
651
+XYZ_CONSTS_FROM_CONFIG(signed char, home_dir, HOME_DIR)
652 652
 
653 653
 /**
654 654
  * ***************************************************************************
@@ -8542,7 +8542,7 @@ void ok_to_send() {
8542 8542
     cartes[X_AXIS] = delta_tower1_x + ex[0] * Xnew + ey[0] * Ynew - ez[0] * Znew;
8543 8543
     cartes[Y_AXIS] = delta_tower1_y + ex[1] * Xnew + ey[1] * Ynew - ez[1] * Znew;
8544 8544
     cartes[Z_AXIS] =             z1 + ex[2] * Xnew + ey[2] * Ynew - ez[2] * Znew;
8545
-  };
8545
+  }
8546 8546
 
8547 8547
   void forward_kinematics_DELTA(float point[ABC]) {
8548 8548
     forward_kinematics_DELTA(point[A_AXIS], point[B_AXIS], point[C_AXIS]);

+ 12
- 12
Marlin/ultralcd.cpp Целия файл

@@ -1642,14 +1642,14 @@ void kill_screen(const char* lcd_msg) {
1642 1642
       #define _PIDTEMP_FUNCTIONS(eindex) _PIDTEMP_BASE_FUNCTIONS(eindex)
1643 1643
     #endif
1644 1644
 
1645
-    _PIDTEMP_FUNCTIONS(0);
1645
+    _PIDTEMP_FUNCTIONS(0)
1646 1646
     #if ENABLED(PID_PARAMS_PER_HOTEND)
1647 1647
       #if HOTENDS > 1
1648
-        _PIDTEMP_FUNCTIONS(1);
1648
+        _PIDTEMP_FUNCTIONS(1)
1649 1649
         #if HOTENDS > 2
1650
-          _PIDTEMP_FUNCTIONS(2);
1650
+          _PIDTEMP_FUNCTIONS(2)
1651 1651
           #if HOTENDS > 3
1652
-            _PIDTEMP_FUNCTIONS(3);
1652
+            _PIDTEMP_FUNCTIONS(3)
1653 1653
           #endif //HOTENDS > 3
1654 1654
         #endif //HOTENDS > 2
1655 1655
       #endif //HOTENDS > 1
@@ -2368,14 +2368,14 @@ void kill_screen(const char* lcd_msg) {
2368 2368
       callbackFunc = callback; \
2369 2369
     }
2370 2370
 
2371
-  menu_edit_type(int, int3, itostr3, 1);
2372
-  menu_edit_type(float, float3, ftostr3, 1);
2373
-  menu_edit_type(float, float32, ftostr32, 100);
2374
-  menu_edit_type(float, float43, ftostr43sign, 1000);
2375
-  menu_edit_type(float, float5, ftostr5rj, 0.01);
2376
-  menu_edit_type(float, float51, ftostr51sign, 10);
2377
-  menu_edit_type(float, float52, ftostr52sign, 100);
2378
-  menu_edit_type(unsigned long, long5, ftostr5rj, 0.01);
2371
+  menu_edit_type(int, int3, itostr3, 1)
2372
+  menu_edit_type(float, float3, ftostr3, 1)
2373
+  menu_edit_type(float, float32, ftostr32, 100)
2374
+  menu_edit_type(float, float43, ftostr43sign, 1000)
2375
+  menu_edit_type(float, float5, ftostr5rj, 0.01)
2376
+  menu_edit_type(float, float51, ftostr51sign, 10)
2377
+  menu_edit_type(float, float52, ftostr52sign, 100)
2378
+  menu_edit_type(unsigned long, long5, ftostr5rj, 0.01)
2379 2379
 
2380 2380
   /**
2381 2381
    *

Loading…
Отказ
Запис