Browse Source

Comment, spacing cleanup

Scott Lahteine 4 years ago
parent
commit
1f6612dfc4

+ 1
- 1
Marlin/src/HAL/STM32/eeprom_flash.cpp View File

113
       // This must be the first time since power on that we have accessed the storage, or someone
113
       // This must be the first time since power on that we have accessed the storage, or someone
114
       // loaded and called write_data and never called access_finish.
114
       // loaded and called write_data and never called access_finish.
115
       // Lets go looking for the slot that holds our configuration.
115
       // Lets go looking for the slot that holds our configuration.
116
-      if (eeprom_data_written) DEBUG_ECHOLN("Dangling EEPROM write_data");
116
+      if (eeprom_data_written) DEBUG_ECHOLNPGM("Dangling EEPROM write_data");
117
       uint32_t address = FLASH_ADDRESS_START;
117
       uint32_t address = FLASH_ADDRESS_START;
118
       while (address <= FLASH_ADDRESS_END) {
118
       while (address <= FLASH_ADDRESS_END) {
119
         uint32_t address_value = (*(__IO uint32_t*)address);
119
         uint32_t address_value = (*(__IO uint32_t*)address);

+ 1
- 1
Marlin/src/HAL/STM32/fast_pwm.cpp View File

32
 
32
 
33
   PinName pin_name = digitalPinToPinName(pin);
33
   PinName pin_name = digitalPinToPinName(pin);
34
   TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
34
   TIM_TypeDef *Instance = (TIM_TypeDef *)pinmap_peripheral(pin_name, PinMap_PWM); // Get HAL timer instance
35
-  
35
+
36
   LOOP_S_L_N(i, 0, NUM_HARDWARE_TIMERS) // Protect used timers
36
   LOOP_S_L_N(i, 0, NUM_HARDWARE_TIMERS) // Protect used timers
37
     if (timer_instance[i] && timer_instance[i]->getHandle()->Instance == Instance)
37
     if (timer_instance[i] && timer_instance[i]->getHandle()->Instance == Instance)
38
       return;
38
       return;

+ 2
- 4
Marlin/src/HAL/STM32F1/watchdog.cpp View File

34
 #include "watchdog.h"
34
 #include "watchdog.h"
35
 
35
 
36
 /**
36
 /**
37
- *  The watchdog clock is 40Khz. We need a 4 seconds interval, so use a /256 preescaler and
38
- *  625 reload value (counts down to 0)
39
- *  use 1250 for 8 seconds
37
+ *  The watchdog clock is 40Khz. So for a 4s or 8s interval use a /256 preescaler and 625 or 1250 reload value (counts down to 0).
40
  */
38
  */
41
 #define STM32F1_WD_RELOAD TERN(WATCHDOG_DURATION_8S, 1250, 625) // 4 or 8 second timeout
39
 #define STM32F1_WD_RELOAD TERN(WATCHDOG_DURATION_8S, 1250, 625) // 4 or 8 second timeout
42
 
40
 
56
  *
54
  *
57
  * @return No return
55
  * @return No return
58
  *
56
  *
59
- * @details The watchdog clock is 40Khz. We need a 4 seconds interval, so use a /256 preescaler and 625 reload value (counts down to 0)
57
+ * @details The watchdog clock is 40Khz. So for a 4s or 8s interval use a /256 preescaler and 625 or 1250 reload value (counts down to 0).
60
  */
58
  */
61
 void watchdog_init() {
59
 void watchdog_init() {
62
   #if DISABLED(DISABLE_WATCHDOG_INIT)
60
   #if DISABLED(DISABLE_WATCHDOG_INIT)

+ 3
- 5
Marlin/src/HAL/STM32F1/watchdog.h View File

27
 
27
 
28
 #include <libmaple/iwdg.h>
28
 #include <libmaple/iwdg.h>
29
 
29
 
30
-// Arduino STM32F1 core now has watchdog support
31
-
32
-// Initialize watchdog with a 4 second countdown time
30
+// Initialize watchdog with a 4 or 8 second countdown time
33
 void watchdog_init();
31
 void watchdog_init();
34
 
32
 
35
-// Reset watchdog. MUST be called at least every 4 seconds after the
36
-// first watchdog_init or STM32F1 will reset.
33
+// Reset watchdog. MUST be called every 4 or 8 seconds after the
34
+// first watchdog_init or the STM32F1 will reset.
37
 void HAL_watchdog_refresh();
35
 void HAL_watchdog_refresh();

+ 1
- 1
Marlin/src/gcode/control/M3-M5.cpp View File

113
     else
113
     else
114
       cutter.set_power(cutter.upower_to_ocr(get_s_power()));
114
       cutter.set_power(cutter.upower_to_ocr(get_s_power()));
115
   #elif ENABLED(SPINDLE_SERVO)
115
   #elif ENABLED(SPINDLE_SERVO)
116
-    cutter.set_power(get_s_power()); 
116
+    cutter.set_power(get_s_power());
117
   #else
117
   #else
118
     cutter.set_enabled(true);
118
     cutter.set_enabled(true);
119
   #endif
119
   #endif

+ 5
- 0
Marlin/src/inc/Conditionals_LCD.h View File

675
   #define HAS_BED_PROBE 1
675
   #define HAS_BED_PROBE 1
676
 #endif
676
 #endif
677
 
677
 
678
+#if EITHER(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
679
+  #undef PROBE_MANUALLY
680
+#endif
681
+
678
 #if ANY(HAS_BED_PROBE, PROBE_MANUALLY, MESH_BED_LEVELING)
682
 #if ANY(HAS_BED_PROBE, PROBE_MANUALLY, MESH_BED_LEVELING)
679
   #define PROBE_SELECTED 1
683
   #define PROBE_SELECTED 1
680
 #endif
684
 #endif
747
   #define HAS_PROBING_PROCEDURE 1
751
   #define HAS_PROBING_PROCEDURE 1
748
 #endif
752
 #endif
749
 #if !HAS_LEVELING
753
 #if !HAS_LEVELING
754
+  #undef PROBE_MANUALLY
750
   #undef RESTORE_LEVELING_AFTER_G28
755
   #undef RESTORE_LEVELING_AFTER_G28
751
 #endif
756
 #endif
752
 
757
 

+ 1
- 10
Marlin/src/inc/SanityCheck.h View File

1382
    * Unified Bed Leveling
1382
    * Unified Bed Leveling
1383
    */
1383
    */
1384
 
1384
 
1385
-  // Hide PROBE_MANUALLY from the rest of the code
1386
-  #undef PROBE_MANUALLY
1387
-
1388
   #if IS_SCARA
1385
   #if IS_SCARA
1389
     #error "AUTO_BED_LEVELING_UBL does not yet support SCARA printers."
1386
     #error "AUTO_BED_LEVELING_UBL does not yet support SCARA printers."
1390
   #elif DISABLED(EEPROM_SETTINGS)
1387
   #elif DISABLED(EEPROM_SETTINGS)
1410
 
1407
 
1411
 #elif ENABLED(MESH_BED_LEVELING)
1408
 #elif ENABLED(MESH_BED_LEVELING)
1412
 
1409
 
1413
-  // Hide PROBE_MANUALLY from the rest of the code
1414
-  #undef PROBE_MANUALLY
1415
-
1416
-  /**
1417
-   * Mesh Bed Leveling
1418
-   */
1419
-
1410
+  // Mesh Bed Leveling
1420
   #if ENABLED(DELTA)
1411
   #if ENABLED(DELTA)
1421
     #error "MESH_BED_LEVELING is not compatible with DELTA printers."
1412
     #error "MESH_BED_LEVELING is not compatible with DELTA printers."
1422
   #elif GRID_MAX_POINTS_X > 9 || GRID_MAX_POINTS_Y > 9
1413
   #elif GRID_MAX_POINTS_X > 9 || GRID_MAX_POINTS_Y > 9

+ 1
- 1
Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.cpp View File

26
 
26
 
27
 #if ENABLED(DGUS_LCD_UI_FYSETC)
27
 #if ENABLED(DGUS_LCD_UI_FYSETC)
28
 
28
 
29
-#include "../DGUSDisplayDef.h"
29
+#include "DGUSDisplayDef.h"
30
 #include "../DGUSDisplay.h"
30
 #include "../DGUSDisplay.h"
31
 #include "../DGUSScreenHandler.h"
31
 #include "../DGUSScreenHandler.h"
32
 
32
 

+ 2
- 0
Marlin/src/lcd/extui/lib/dgus/fysetc/DGUSDisplayDef.h View File

21
  */
21
  */
22
 #pragma once
22
 #pragma once
23
 
23
 
24
+#include "../DGUSDisplayDef.h"
25
+
24
 enum DGUSLCD_Screens : uint8_t {
26
 enum DGUSLCD_Screens : uint8_t {
25
   DGUSLCD_SCREEN_BOOT                =   0,
27
   DGUSLCD_SCREEN_BOOT                =   0,
26
   DGUSLCD_SCREEN_MAIN                =   1,
28
   DGUSLCD_SCREEN_MAIN                =   1,

+ 1
- 1
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h View File

256
     *                  -----                           -----
256
     *                  -----                           -----
257
     *                   LCD                             LCD
257
     *                   LCD                             LCD
258
     */
258
     */
259
-    
259
+
260
     #define LCD_PINS_RS                    P1_23
260
     #define LCD_PINS_RS                    P1_23
261
 
261
 
262
     #define BTN_EN1                        P1_20
262
     #define BTN_EN1                        P1_20

+ 3
- 3
buildroot/share/PlatformIO/scripts/common-cxxflags.py View File

13
 
13
 
14
 # Useful for JTAG debugging
14
 # Useful for JTAG debugging
15
 #
15
 #
16
-# It will separe release and debug build folders. 
17
-# It useful when we need keep two live versions: one debug, for debugging, 
16
+# It will separe release and debug build folders.
17
+# It useful when we need keep two live versions: one debug, for debugging,
18
 # other release, for flashing.
18
 # other release, for flashing.
19
 # Without this, PIO will recompile everything twice for any small change.
19
 # Without this, PIO will recompile everything twice for any small change.
20
-# 
20
+#
21
 if env.GetBuildType() == "debug":
21
 if env.GetBuildType() == "debug":
22
 	env['BUILD_DIR'] = '$PROJECT_BUILD_DIR/$PIOENV/debug'
22
 	env['BUILD_DIR'] = '$PROJECT_BUILD_DIR/$PIOENV/debug'

Loading…
Cancel
Save