소스 검색

HIGH/LOW naming of pin state settings (#19089)

Giuliano Zaro 3 년 전
부모
커밋
8652a7bdd2
No account linked to committer's email address

+ 1
- 1
Marlin/Configuration.h 파일 보기

@@ -330,7 +330,7 @@
330 330
 //#define PSU_NAME "Power Supply"
331 331
 
332 332
 #if ENABLED(PSU_CONTROL)
333
-  #define PSU_ACTIVE_HIGH false     // Set 'false' for ATX, 'true' for X-Box
333
+  #define PSU_ACTIVE_STATE LOW      // Set 'LOW' for ATX, 'HIGH' for X-Box
334 334
 
335 335
   //#define PSU_DEFAULT_OFF         // Keep power off until enabled directly with M80
336 336
   //#define PSU_POWERUP_DELAY 250   // (ms) Delay for the PSU to warm up to full power

+ 1
- 1
Marlin/Configuration_adv.h 파일 보기

@@ -2851,7 +2851,7 @@
2851 2851
 //#define SPINDLE_FEATURE
2852 2852
 //#define LASER_FEATURE
2853 2853
 #if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
2854
-  #define SPINDLE_LASER_ACTIVE_HIGH     false  // Set to "true" if the on/off function is active HIGH
2854
+  #define SPINDLE_LASER_ACTIVE_STATE    LOW    // Set to "HIGH" if the on/off function is active HIGH
2855 2855
   #define SPINDLE_LASER_PWM             true   // Set to "true" if your controller supports setting the speed/power
2856 2856
   #define SPINDLE_LASER_PWM_INVERT      false  // Set to "true" if the speed/power goes up when you want it to go slower
2857 2857
 

+ 1
- 1
Marlin/src/HAL/DUE/usb/arduino_due_x.h 파일 보기

@@ -93,5 +93,5 @@
93 93
 #define USB_VBOF_GPIO               (PIO_PB10_IDX)
94 94
 #define USB_VBOF_FLAGS              (PIO_PERIPH_A | PIO_DEFAULT)
95 95
 /*! Active level of the USB_VBOF output pin. */
96
-#define USB_VBOF_ACTIVE_LEVEL       LOW
96
+#define USB_VBOF_ACTIVE_STATE       LOW
97 97
 /* ------------------------------------------------------------------------ */

+ 2
- 2
Marlin/src/MarlinCore.h 파일 보기

@@ -89,8 +89,8 @@ extern bool wait_for_heatup;
89 89
 
90 90
 #if ENABLED(PSU_CONTROL)
91 91
   extern bool powersupply_on;
92
-  #define PSU_PIN_ON()  do{ OUT_WRITE(PS_ON_PIN,  PSU_ACTIVE_HIGH); powersupply_on = true; }while(0)
93
-  #define PSU_PIN_OFF() do{ OUT_WRITE(PS_ON_PIN, !PSU_ACTIVE_HIGH); powersupply_on = false; }while(0)
92
+  #define PSU_PIN_ON()  do{ OUT_WRITE(PS_ON_PIN,  PSU_ACTIVE_STATE); powersupply_on = true;  }while(0)
93
+  #define PSU_PIN_OFF() do{ OUT_WRITE(PS_ON_PIN, !PSU_ACTIVE_STATE); powersupply_on = false; }while(0)
94 94
   #if ENABLED(AUTO_POWER_CONTROL)
95 95
     #define PSU_ON()  powerManager.power_on()
96 96
     #define PSU_OFF() powerManager.power_off()

+ 6
- 6
Marlin/src/feature/spindle_laser.cpp 파일 보기

@@ -37,7 +37,7 @@ cutter_power_t SpindleLaser::menuPower,                               // Power s
37 37
                SpindleLaser::unitPower;                               // LCD status power in PWM, PERCENT, or RPM
38 38
 
39 39
 #if ENABLED(MARLIN_DEV_MODE)
40
-  cutter_frequency_t SpindleLaser::frequency;                         // setting PWM frequency; range: 2K - 50K
40
+  cutter_frequency_t SpindleLaser::frequency;                         // PWM frequency setting; range: 2K - 50K
41 41
 #endif
42 42
 #define SPINDLE_LASER_PWM_OFF ((SPINDLE_LASER_PWM_INVERT) ? 255 : 0)
43 43
 
@@ -45,13 +45,13 @@ cutter_power_t SpindleLaser::menuPower,                               // Power s
45 45
 // Init the cutter to a safe OFF state
46 46
 //
47 47
 void SpindleLaser::init() {
48
-  OUT_WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_HIGH);       // Init spindle to off
48
+  OUT_WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE);      // Init spindle to off
49 49
   #if ENABLED(SPINDLE_CHANGE_DIR)
50 50
     OUT_WRITE(SPINDLE_DIR_PIN, SPINDLE_INVERT_DIR ? 255 : 0);         // Init rotation to clockwise (M3)
51 51
   #endif
52 52
   #if ENABLED(SPINDLE_LASER_PWM)
53 53
     SET_PWM(SPINDLE_LASER_PWM_PIN);
54
-    analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // set to lowest speed
54
+    analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Set to lowest speed
55 55
   #endif
56 56
   #if ENABLED(HAL_CAN_SET_PWM_FREQ) && defined(SPINDLE_LASER_FREQUENCY)
57 57
     set_pwm_frequency(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_FREQUENCY);
@@ -64,14 +64,14 @@ void SpindleLaser::init() {
64 64
    * Set the cutter PWM directly to the given ocr value
65 65
    */
66 66
   void SpindleLaser::set_ocr(const uint8_t ocr) {
67
-    WRITE(SPINDLE_LASER_ENA_PIN, SPINDLE_LASER_ACTIVE_HIGH);        // turn spindle on
67
+    WRITE(SPINDLE_LASER_ENA_PIN, SPINDLE_LASER_ACTIVE_STATE);         // Turn spindle on
68 68
     analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
69 69
     #if NEEDS_HARDWARE_PWM && SPINDLE_LASER_FREQUENCY
70 70
       set_pwm_duty(pin_t(SPINDLE_LASER_PWM_PIN), ocr ^ SPINDLE_LASER_PWM_OFF);
71 71
     #endif
72 72
   }
73 73
   void SpindleLaser::ocr_off() {
74
-    WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_HIGH);       // Turn spindle off
74
+    WRITE(SPINDLE_LASER_ENA_PIN, !SPINDLE_LASER_ACTIVE_STATE);        // Turn spindle off
75 75
     analogWrite(pin_t(SPINDLE_LASER_PWM_PIN), SPINDLE_LASER_PWM_OFF); // Only write low byte
76 76
   }
77 77
 #endif
@@ -98,7 +98,7 @@ void SpindleLaser::apply_power(const uint8_t opwr) {
98 98
       isReady = false;
99 99
     }
100 100
   #else
101
-    WRITE(SPINDLE_LASER_ENA_PIN, enabled() == SPINDLE_LASER_ACTIVE_HIGH);
101
+    WRITE(SPINDLE_LASER_ENA_PIN, enabled() ? SPINDLE_LASER_ACTIVE_STATE : !SPINDLE_LASER_ACTIVE_STATE);
102 102
     isReady = true;
103 103
   #endif
104 104
 }

+ 1
- 1
Marlin/src/inc/Conditionals_post.h 파일 보기

@@ -403,7 +403,7 @@
403 403
 #ifndef PSU_NAME
404 404
   #if DISABLED(PSU_CONTROL)
405 405
     #define PSU_NAME "Generic"  // No control
406
-  #elif PSU_ACTIVE_HIGH
406
+  #elif PSU_ACTIVE_STATE
407 407
     #define PSU_NAME "XBox"     // X-Box 360 (203W)
408 408
   #else
409 409
     #define PSU_NAME "ATX"      // ATX style

+ 9
- 5
Marlin/src/inc/SanityCheck.h 파일 보기

@@ -419,8 +419,10 @@
419 419
   #error "SPINDLE_DIR_CHANGE is now SPINDLE_CHANGE_DIR. Please update your Configuration_adv.h."
420 420
 #elif defined(SPINDLE_STOP_ON_DIR_CHANGE)
421 421
   #error "SPINDLE_STOP_ON_DIR_CHANGE is now SPINDLE_CHANGE_DIR_STOP. Please update your Configuration_adv.h."
422
+#elif defined(SPINDLE_LASER_ACTIVE_HIGH)
423
+  #error "SPINDLE_LASER_ACTIVE_HIGH is now SPINDLE_LASER_ACTIVE_STATE. Please update your Configuration_adv.h."
422 424
 #elif defined(SPINDLE_LASER_ENABLE_INVERT)
423
-  #error "SPINDLE_LASER_ENABLE_INVERT is now SPINDLE_LASER_ACTIVE_HIGH. Please update your Configuration_adv.h."
425
+  #error "SPINDLE_LASER_ENABLE_INVERT is now SPINDLE_LASER_ACTIVE_STATE. Please update your Configuration_adv.h."
424 426
 #elif defined(CUTTER_POWER_DISPLAY)
425 427
   #error "CUTTER_POWER_DISPLAY is now CUTTER_POWER_UNIT. Please update your Configuration_adv.h."
426 428
 #elif defined(CHAMBER_HEATER_PIN)
@@ -441,10 +443,12 @@
441 443
   #error "USB_SD_DISABLED is now NO_SD_HOST_DRIVE. Please update your Configuration_adv.h."
442 444
 #elif defined(USB_SD_ONBOARD)
443 445
   #error "USB_SD_ONBOARD is obsolete. Disable NO_SD_HOST_DRIVE instead."
446
+#elif defined(PSU_ACTIVE_HIGH)
447
+  #error "PSU_ACTIVE_HIGH is now PSU_ACTIVE_STATE. Please update your configuration."
444 448
 #elif POWER_SUPPLY == 1
445
-  #error "Replace POWER_SUPPLY 1 by enabling PSU_CONTROL and setting PSU_ACTIVE_HIGH to 'false'."
449
+  #error "Replace POWER_SUPPLY 1 by enabling PSU_CONTROL and setting PSU_ACTIVE_STATE to 'LOW'."
446 450
 #elif POWER_SUPPLY == 2
447
-  #error "Replace POWER_SUPPLY 2 by enabling PSU_CONTROL and setting PSU_ACTIVE_HIGH to 'true'."
451
+  #error "Replace POWER_SUPPLY 2 by enabling PSU_CONTROL and setting PSU_ACTIVE_STATE to 'HIGH'."
448 452
 #elif defined(POWER_SUPPLY)
449 453
   #error "POWER_SUPPLY is now obsolete. Please remove it from Configuration.h."
450 454
 #elif defined(MKS_ROBIN_TFT)
@@ -2923,8 +2927,8 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
2923 2927
  * Ensure this option is set intentionally
2924 2928
  */
2925 2929
 #if ENABLED(PSU_CONTROL)
2926
-  #ifndef PSU_ACTIVE_HIGH
2927
-    #error "PSU_CONTROL requires PSU_ACTIVE_HIGH to be defined as 'true' or 'false'."
2930
+  #ifndef PSU_ACTIVE_STATE
2931
+    #error "PSU_CONTROL requires PSU_ACTIVE_STATE to be defined as 'HIGH' or 'LOW'."
2928 2932
   #elif !PIN_EXISTS(PS_ON)
2929 2933
     #error "PSU_CONTROL requires PS_ON_PIN."
2930 2934
   #endif

Loading…
취소
저장