🎨 Update MKSPWC, some other pins (MarlinFirmware#22557)

ptoal · Dec 16, 2021 · 5c50c51 · 5c50c51
1 parent 70090cb
commit 5c50c51
Show file tree

Hide file tree

Showing 41 changed files with 279 additions and 321 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -369,6 +369,7 @@
 //#define PSU_NAME "Power Supply"
 
 #if ENABLED(PSU_CONTROL)
+  //#define MKS_PWC                 // Using the MKS PWC add-on
   //#define PS_OFF_CONFIRM          // Confirm dialog when power off
   //#define PS_OFF_SOUND            // Beep 1s when power off
   #define PSU_ACTIVE_STATE LOW      // Set 'LOW' for ATX, 'HIGH' for X-Box

diff --git a/Marlin/src/HAL/DUE/HAL_SPI.cpp b/Marlin/src/HAL/DUE/HAL_SPI.cpp
@@ -594,18 +594,14 @@
       SPI_Configure(SPI0, ID_SPI0, SPI_MR_MSTR | SPI_MR_MODFDIS | SPI_MR_PS);
       SPI_Enable(SPI0);
 
-      SET_OUTPUT(DAC0_SYNC);
+      SET_OUTPUT(DAC0_SYNC_PIN);
       #if HAS_MULTI_EXTRUDER
-        SET_OUTPUT(DAC1_SYNC);
-        WRITE(DAC1_SYNC, HIGH);
+        OUT_WRITE(DAC1_SYNC_PIN, HIGH);
       #endif
-      SET_OUTPUT(SPI_EEPROM1_CS);
-      SET_OUTPUT(SPI_EEPROM2_CS);
-      SET_OUTPUT(SPI_FLASH_CS);
-      WRITE(DAC0_SYNC, HIGH);
-      WRITE(SPI_EEPROM1_CS, HIGH);
-      WRITE(SPI_EEPROM2_CS, HIGH);
-      WRITE(SPI_FLASH_CS, HIGH);
+      WRITE(DAC0_SYNC_PIN, HIGH);
+      OUT_WRITE(SPI_EEPROM1_CS_PIN, HIGH);
+      OUT_WRITE(SPI_EEPROM2_CS_PIN, HIGH);
+      OUT_WRITE(SPI_FLASH_CS_PIN, HIGH);
       WRITE(SD_SS_PIN, HIGH);
 
       OUT_WRITE(SDSS, LOW);

diff --git a/Marlin/src/HAL/STM32F1/eeprom_wired.cpp b/Marlin/src/HAL/STM32F1/eeprom_wired.cpp
@@ -44,7 +44,7 @@ bool PersistentStore::access_start() {
       SET_OUTPUT(BOARD_SPI1_SCK_PIN);
       SET_OUTPUT(BOARD_SPI1_MOSI_PIN);
       SET_INPUT(BOARD_SPI1_MISO_PIN);
-      SET_OUTPUT(SPI_EEPROM1_CS);
+      SET_OUTPUT(SPI_EEPROM1_CS_PIN);
     #endif
     spiInit(0);
   #endif

diff --git a/Marlin/src/HAL/shared/eeprom_if_spi.cpp b/Marlin/src/HAL/shared/eeprom_if_spi.cpp
@@ -49,8 +49,8 @@ static void _eeprom_begin(uint8_t * const pos, const uint8_t cmd) {
     (unsigned(pos) >> 8) & 0xFF,  // Address High
      unsigned(pos)       & 0xFF   // Address Low
   };
-  WRITE(SPI_EEPROM1_CS, HIGH);    // Usually free already
-  WRITE(SPI_EEPROM1_CS, LOW);     // Activate the Bus
+  WRITE(SPI_EEPROM1_CS_PIN, HIGH);    // Usually free already
+  WRITE(SPI_EEPROM1_CS_PIN, LOW);     // Activate the Bus
   spiSend(SPI_CHAN_EEPROM1, eeprom_temp, 3);
                                   // Leave the Bus in-use
 }
@@ -60,23 +60,23 @@ uint8_t eeprom_read_byte(uint8_t *pos) {
 
   const uint8_t v = spiRec(SPI_CHAN_EEPROM1); // After READ a value sits on the Bus
 
-  WRITE(SPI_EEPROM1_CS, HIGH);    // Done with device
+  WRITE(SPI_EEPROM1_CS_PIN, HIGH);    // Done with device
 
   return v;
 }
 
 void eeprom_write_byte(uint8_t *pos, uint8_t value) {
   const uint8_t eeprom_temp = CMD_WREN;
-  WRITE(SPI_EEPROM1_CS, LOW);
+  WRITE(SPI_EEPROM1_CS_PIN, LOW);
   spiSend(SPI_CHAN_EEPROM1, &eeprom_temp, 1); // Write Enable
 
-  WRITE(SPI_EEPROM1_CS, HIGH);      // Done with the Bus
+  WRITE(SPI_EEPROM1_CS_PIN, HIGH);      // Done with the Bus
   delay(1);                         // For a small amount of time
 
   _eeprom_begin(pos, CMD_WRITE);    // Set write address and begin transmission
 
   spiSend(SPI_CHAN_EEPROM1, value); // Send the value to be written
-  WRITE(SPI_EEPROM1_CS, HIGH);      // Done with the Bus
+  WRITE(SPI_EEPROM1_CS_PIN, HIGH);      // Done with the Bus
   delay(EEPROM_WRITE_DELAY);        // Give page write time to complete
 }
 

diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
@@ -1192,7 +1192,7 @@ void setup() {
 
   #if HAS_SUICIDE
     SETUP_LOG("SUICIDE_PIN");
-    OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
+    OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_STATE);
   #endif
 
   #ifdef JTAGSWD_RESET

diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h
@@ -84,7 +84,7 @@ extern bool wait_for_heatup;
 bool pin_is_protected(const pin_t pin);
 
 #if HAS_SUICIDE
-  inline void suicide() { OUT_WRITE(SUICIDE_PIN, SUICIDE_PIN_INVERTING); }
+  inline void suicide() { OUT_WRITE(SUICIDE_PIN, SUICIDE_PIN_STATE); }
 #endif
 
 #if HAS_KILL

diff --git a/Marlin/src/feature/dac/dac_dac084s085.cpp b/Marlin/src/feature/dac/dac_dac084s085.cpp
@@ -20,35 +20,35 @@ void dac084s085::begin() {
   uint8_t externalDac_buf[] = { 0x20, 0x00 }; // all off
 
   // All SPI chip-select HIGH
-  SET_OUTPUT(DAC0_SYNC);
+  SET_OUTPUT(DAC0_SYNC_PIN);
   #if HAS_MULTI_EXTRUDER
-    SET_OUTPUT(DAC1_SYNC);
+    SET_OUTPUT(DAC1_SYNC_PIN);
   #endif
   cshigh();
   spiBegin();
 
   //init onboard DAC
   DELAY_US(2);
-  WRITE(DAC0_SYNC, LOW);
+  WRITE(DAC0_SYNC_PIN, LOW);
   DELAY_US(2);
-  WRITE(DAC0_SYNC, HIGH);
+  WRITE(DAC0_SYNC_PIN, HIGH);
   DELAY_US(2);
-  WRITE(DAC0_SYNC, LOW);
+  WRITE(DAC0_SYNC_PIN, LOW);
 
   spiSend(SPI_CHAN_DAC, externalDac_buf, COUNT(externalDac_buf));
-  WRITE(DAC0_SYNC, HIGH);
+  WRITE(DAC0_SYNC_PIN, HIGH);
 
   #if HAS_MULTI_EXTRUDER
     //init Piggy DAC
     DELAY_US(2);
-    WRITE(DAC1_SYNC, LOW);
+    WRITE(DAC1_SYNC_PIN, LOW);
     DELAY_US(2);
-    WRITE(DAC1_SYNC, HIGH);
+    WRITE(DAC1_SYNC_PIN, HIGH);
     DELAY_US(2);
-    WRITE(DAC1_SYNC, LOW);
+    WRITE(DAC1_SYNC_PIN, LOW);
 
     spiSend(SPI_CHAN_DAC, externalDac_buf, COUNT(externalDac_buf));
-    WRITE(DAC1_SYNC, HIGH);
+    WRITE(DAC1_SYNC_PIN, HIGH);
   #endif
 
   return;
@@ -66,32 +66,32 @@ void dac084s085::setValue(const uint8_t channel, const uint8_t value) {
   cshigh();
 
   if (channel > 3) {        // DAC Piggy E1,E2,E3
-    WRITE(DAC1_SYNC, LOW);
+    WRITE(DAC1_SYNC_PIN, LOW);
     DELAY_US(2);
-    WRITE(DAC1_SYNC, HIGH);
+    WRITE(DAC1_SYNC_PIN, HIGH);
     DELAY_US(2);
-    WRITE(DAC1_SYNC, LOW);
+    WRITE(DAC1_SYNC_PIN, LOW);
   }
   else {                    // DAC onboard X,Y,Z,E0
-    WRITE(DAC0_SYNC, LOW);
+    WRITE(DAC0_SYNC_PIN, LOW);
     DELAY_US(2);
-    WRITE(DAC0_SYNC, HIGH);
+    WRITE(DAC0_SYNC_PIN, HIGH);
     DELAY_US(2);
-    WRITE(DAC0_SYNC, LOW);
+    WRITE(DAC0_SYNC_PIN, LOW);
   }
 
   DELAY_US(2);
   spiSend(SPI_CHAN_DAC, externalDac_buf, COUNT(externalDac_buf));
 }
 
 void dac084s085::cshigh() {
-  WRITE(DAC0_SYNC, HIGH);
+  WRITE(DAC0_SYNC_PIN, HIGH);
   #if HAS_MULTI_EXTRUDER
-    WRITE(DAC1_SYNC, HIGH);
+    WRITE(DAC1_SYNC_PIN, HIGH);
   #endif
-  WRITE(SPI_EEPROM1_CS, HIGH);
-  WRITE(SPI_EEPROM2_CS, HIGH);
-  WRITE(SPI_FLASH_CS, HIGH);
+  WRITE(SPI_EEPROM1_CS_PIN, HIGH);
+  WRITE(SPI_EEPROM2_CS_PIN, HIGH);
+  WRITE(SPI_FLASH_CS_PIN, HIGH);
   WRITE(SD_SS_PIN, HIGH);
 }
 

diff --git a/Marlin/src/gcode/control/M80_M81.cpp b/Marlin/src/gcode/control/M80_M81.cpp
@@ -60,7 +60,7 @@
      * a print without suicide...
      */
     #if HAS_SUICIDE
-      OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
+      OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_STATE);
     #endif
 
     TERN_(HAS_LCD_MENU, ui.reset_status());

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
@@ -3473,6 +3473,13 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
   #endif
 #endif
 
+/**
+ * Validate MKS_PWC
+ */
+#if ENABLED(MKS_PWC) && PSU_ACTIVE_STATE != HIGH
+  #error "MKS_PWC requires PSU_ACTIVE_STATE to be set HIGH."
+#endif
+
 /**
  * Ensure this option is set intentionally
  */

diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h b/Marlin/src/lcd/extui/dgus/mks/DGUSDisplayDef.h
@@ -28,9 +28,9 @@
 #define LOGO_TIME_DELAY TERN(USE_MKS_GREEN_UI, 8000, 1500)
 
 #if ENABLED(DGUS_MKS_RUNOUT_SENSOR)
-  #define MT_DET_1_PIN         1
-  #define MT_DET_2_PIN         2
-  #define MT_DET_PIN_INVERTING false
+  #define MT_DET_1_PIN     1
+  #define MT_DET_2_PIN     2
+  #define MT_DET_PIN_STATE LOW
 #endif
 
 #define MKS_FINSH

diff --git a/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus/mks/DGUSScreenHandler.cpp
@@ -1495,17 +1495,17 @@ void DGUSScreenHandler::DGUS_Runout_Idle(void) {
         break;
 
       case UNRUNOUT_STATUS:
-        if (READ(MT_DET_1_PIN) == LOW)
+        if (READ(MT_DET_1_PIN) == MT_DET_PIN_STATE)
           runout_mks.runout_status = RUNOUT_STATUS;
         break;
 
       case RUNOUT_BEGIN_STATUS:
-        if (READ(MT_DET_1_PIN) == HIGH)
+        if (READ(MT_DET_1_PIN) != MT_DET_PIN_STATE)
           runout_mks.runout_status = RUNOUT_WAITTING_STATUS;
         break;
 
       case RUNOUT_WAITTING_STATUS:
-        if (READ(MT_DET_1_PIN) == LOW)
+        if (READ(MT_DET_1_PIN) == MT_DET_PIN_STATE)
           runout_mks.runout_status = RUNOUT_BEGIN_STATUS;
         break;
 

diff --git a/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp b/Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
@@ -163,23 +163,23 @@ void filament_check() {
   #endif
   #if PIN_EXISTS(MT_DET_1)
     static int fil_det_count_1 = 0;
-    if (READ(MT_DET_1_PIN) == MT_DET_PIN_INVERTING)
+    if (READ(MT_DET_1_PIN) == MT_DET_PIN_STATE)
       fil_det_count_1++;
     else if (fil_det_count_1 > 0)
       fil_det_count_1--;
   #endif
 
   #if PIN_EXISTS(MT_DET_2)
     static int fil_det_count_2 = 0;
-    if (READ(MT_DET_2_PIN) == MT_DET_PIN_INVERTING)
+    if (READ(MT_DET_2_PIN) == MT_DET_PIN_STATE)
       fil_det_count_2++;
     else if (fil_det_count_2 > 0)
       fil_det_count_2--;
   #endif
 
   #if PIN_EXISTS(MT_DET_3)
     static int fil_det_count_3 = 0;
-    if (READ(MT_DET_3_PIN) == MT_DET_PIN_INVERTING)
+    if (READ(MT_DET_3_PIN) == MT_DET_PIN_STATE)
       fil_det_count_3++;
     else if (fil_det_count_3 > 0)
       fil_det_count_3--;