Преглед на файлове

Misc formatting, cleanup

Scott Lahteine преди 3 години
родител
ревизия
0ddef5544a
променени са 3 файла, в които са добавени 24 реда и са изтрити 25 реда
  1. 1
    1
      Marlin/src/feature/tmc_util.h
  2. 19
    20
      Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp
  3. 4
    4
      Marlin/src/lcd/ultralcd.cpp

+ 1
- 1
Marlin/src/feature/tmc_util.h Целия файл

@@ -35,7 +35,7 @@
35 35
 #define CHOPPER_DEFAULT_36V  { 5,  2, 4 }
36 36
 #define CHOPPER_PRUSAMK3_24V { 3, -2, 6 }
37 37
 #define CHOPPER_MARLIN_119   { 5,  2, 3 }
38
-#define CHOPPER_09STEP_24V   { 3, -1, 5 } 
38
+#define CHOPPER_09STEP_24V   { 3, -1, 5 }
39 39
 
40 40
 #if ENABLED(MONITOR_DRIVER_STATUS) && !defined(MONITOR_DRIVER_STATUS_INTERVAL_MS)
41 41
   #define MONITOR_DRIVER_STATUS_INTERVAL_MS 500u

+ 19
- 20
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/stress_test_screen.cpp Целия файл

@@ -87,9 +87,8 @@ void StressTestScreen::runTestOnBootup(bool enable) {
87 87
 }
88 88
 
89 89
 void StressTestScreen::startupCheck() {
90
-  if (LockScreen::get_hash() == 0xDEAD) {
90
+  if (LockScreen::get_hash() == 0xDEAD)
91 91
     GOTO_SCREEN(StressTestScreen);
92
-  }
93 92
 }
94 93
 
95 94
 void StressTestScreen::onEntry() {
@@ -120,20 +119,20 @@ void StressTestScreen::onIdle() {
120 119
   reset_menu_timeout();
121 120
 
122 121
   if (!commandsInQueue()) {
123
-      if (!isPositionKnown()) {
124
-        extern const char G28_STR[];
125
-        injectCommands_P(G28_STR);
126
-      }
127
-      else {
128
-        injectCommands_P(PSTR(
129
-          "G0 X100 Y100 Z100 F6000\n"
130
-          "T0\nG4 S1"
131
-          #if EXTRUDERS > 1
132
-            "\nT1\nG4 S1"
133
-          #endif
134
-          "\nG0 X150 Y150 Z150"
135
-        ));
136
-      }
122
+    if (!isPositionKnown()) {
123
+      extern const char G28_STR[];
124
+      injectCommands_P(G28_STR);
125
+    }
126
+    else {
127
+      injectCommands_P(PSTR(
128
+        "G0 X100 Y100 Z100 F6000\n"
129
+        "T0\nG4 S1"
130
+        #if EXTRUDERS > 1
131
+          "\nT1\nG4 S1"
132
+        #endif
133
+        "\nG0 X150 Y150 Z150"
134
+      ));
135
+    }
137 136
   }
138 137
 
139 138
   if (refresh_timer.elapsed(STRESS_TEST_CHANGE_INTERVAL)) {
@@ -141,10 +140,10 @@ void StressTestScreen::onIdle() {
141 140
   }
142 141
 
143 142
   if (watchDogTestNow()) {
144
-      if (random(2) % 2)
145
-        iterativeLockup();
146
-      else
147
-        recursiveLockup();
143
+    if (random(2) % 2)
144
+      iterativeLockup();
145
+    else
146
+      recursiveLockup();
148 147
   }
149 148
 
150 149
   BaseScreen::onIdle();

+ 4
- 4
Marlin/src/lcd/ultralcd.cpp Целия файл

@@ -1524,17 +1524,17 @@ void MarlinUI::update() {
1524 1524
       const int8_t xdir = col < (LCD_WIDTH ) / 2 ? -1 : 1,
1525 1525
                    ydir = row < (LCD_HEIGHT) / 2 ? -1 : 1;
1526 1526
       if (on_edit_screen)
1527
-        encoderDiff = ENCODER_PULSES_PER_STEP * ydir;
1527
+        encoderDiff = (ENCODER_PULSES_PER_STEP) * ydir;
1528 1528
       else if (screen_items > 0) {
1529 1529
         // Last 3 cols act as a scroll :-)
1530 1530
         if (col > (LCD_WIDTH) - 5)
1531 1531
           // 2 * LCD_HEIGHT to scroll to bottom of next page. (LCD_HEIGHT would only go 1 item down.)
1532
-          encoderDiff = ENCODER_PULSES_PER_STEP * (encoderLine - encoderTopLine + 2 * (LCD_HEIGHT)) * ydir;
1532
+          encoderDiff = (ENCODER_PULSES_PER_STEP) * (encoderLine - encoderTopLine + 2 * (LCD_HEIGHT)) * ydir;
1533 1533
         else
1534
-          encoderDiff = ENCODER_PULSES_PER_STEP * (row - encoderPosition + encoderTopLine);
1534
+          encoderDiff = (ENCODER_PULSES_PER_STEP) * (row - encoderPosition + encoderTopLine);
1535 1535
       }
1536 1536
       else if (!on_status_screen())
1537
-        encoderDiff = ENCODER_PULSES_PER_STEP * xdir;
1537
+        encoderDiff = (ENCODER_PULSES_PER_STEP) * xdir;
1538 1538
     }
1539 1539
 
1540 1540
   #endif

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