tweak formatting

MarlinFirmware · Feb 20, 2023 · ae0e415 · ae0e415
1 parent 5334ced
commit ae0e415
Show file tree

Hide file tree

Showing 10 changed files with 2,276 additions and 2,312 deletions.
diff --git a/Marlin/src/HAL/ESP32/HAL_SPI_HW.cpp b/Marlin/src/HAL/ESP32/HAL_SPI_HW.cpp
@@ -42,7 +42,7 @@
 
 #include "../shared/HAL_SPI.h"
 
-#if !ENABLED(SOFTWARE_SPI) && !ENABLED(HALSPI_HW_GENERIC)
+#if DISABLED(SOFTWARE_SPI) && DISABLED(HALSPI_HW_GENERIC)
 
 #include "sdk/BitManage.h"
 

diff --git a/Marlin/src/HAL/ESP32/HAL_SPI_HWgen.cpp b/Marlin/src/HAL/ESP32/HAL_SPI_HWgen.cpp
@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -26,57 +26,57 @@
 
 #include "../shared/HAL_SPI.h"
 
-#if !ENABLED(SOFTWARE_SPI) && ENABLED(HALSPI_HW_GENERIC)
+#if DISABLED(SOFTWARE_SPI) && ENABLED(HALSPI_HW_GENERIC)
 
 // ------------------------
 // Hardware SPI
 // ------------------------
 
 static void _spi_on_error() {
   for (;;) {
-#if defined(HALSPI_DO_ERRORBEEPS) && PIN_EXISTS(BEEPER)
-    OUT_WRITE(BEEPER_PIN, HIGH);
-    delay(500);
-    OUT_WRITE(BEEPER_PIN, LOW);
-    delay(500);
-    OUT_WRITE(BEEPER_PIN, HIGH);
-    delay(500);
-    OUT_WRITE(BEEPER_PIN, LOW);
-    delay(500);
-    OUT_WRITE(BEEPER_PIN, HIGH);
-    delay(150);
-    OUT_WRITE(BEEPER_PIN, LOW);
-    delay(150);
-    OUT_WRITE(BEEPER_PIN, HIGH);
-    delay(150);
-    OUT_WRITE(BEEPER_PIN, LOW);
-    delay(150);
-    OUT_WRITE(BEEPER_PIN, HIGH);
-    delay(150);
-    OUT_WRITE(BEEPER_PIN, LOW);
-    delay(3000);
-#endif
+    #if defined(HALSPI_DO_ERRORBEEPS) && PIN_EXISTS(BEEPER)
+      OUT_WRITE(BEEPER_PIN, HIGH);
+      delay(500);
+      OUT_WRITE(BEEPER_PIN, LOW);
+      delay(500);
+      OUT_WRITE(BEEPER_PIN, HIGH);
+      delay(500);
+      OUT_WRITE(BEEPER_PIN, LOW);
+      delay(500);
+      OUT_WRITE(BEEPER_PIN, HIGH);
+      delay(150);
+      OUT_WRITE(BEEPER_PIN, LOW);
+      delay(150);
+      OUT_WRITE(BEEPER_PIN, HIGH);
+      delay(150);
+      OUT_WRITE(BEEPER_PIN, LOW);
+      delay(150);
+      OUT_WRITE(BEEPER_PIN, HIGH);
+      delay(150);
+      OUT_WRITE(BEEPER_PIN, LOW);
+      delay(3000);
+    #endif
   }
 }
 
 static void __attribute__((unused)) _spi_infobeep(uint32_t code) {
-#if PIN_EXISTS(BEEPER)
-  OUT_WRITE(BEEPER_PIN, HIGH);
-  delay(500);
-  OUT_WRITE(BEEPER_PIN, LOW);
-  delay(500);
-  for (uint32_t n = 0; n < code; n++) {
+  #if PIN_EXISTS(BEEPER)
     OUT_WRITE(BEEPER_PIN, HIGH);
-    delay(200);
+    delay(500);
     OUT_WRITE(BEEPER_PIN, LOW);
-    delay(200);
-  }
-  delay(300);
-  OUT_WRITE(BEEPER_PIN, HIGH);
-  delay(400);
-  OUT_WRITE(BEEPER_PIN, LOW);
-  delay(1000);
-#endif
+    delay(500);
+    for (uint32_t n = 0; n < code; n++) {
+      OUT_WRITE(BEEPER_PIN, HIGH);
+      delay(200);
+      OUT_WRITE(BEEPER_PIN, LOW);
+      delay(200);
+    }
+    delay(300);
+    OUT_WRITE(BEEPER_PIN, HIGH);
+    delay(400);
+    OUT_WRITE(BEEPER_PIN, LOW);
+    delay(1000);
+  #endif
 }
 
 #include <pins_arduino.h>
@@ -102,21 +102,12 @@ void spiSetupChipSelect(int pin) {
 }
 
 void spiInitEx(uint32_t maxClockFreq, int hint_sck, int hint_miso, int hint_mosi, int hint_cs) {
-  if (hint_sck != -1) {
-    SET_OUTPUT(hint_sck);
-  }
-  if (hint_miso != -1) {
-    SET_INPUT(hint_miso);
-  }
-  if (hint_mosi != -1) {
-    SET_OUTPUT(hint_mosi);
-  }
-  if (hint_cs != -1) {
-    SET_OUTPUT(hint_cs);
-  }
+  if (hint_sck != -1)  SET_OUTPUT(hint_sck);
+  if (hint_miso != -1) SET_INPUT(hint_miso);
+  if (hint_mosi != -1) SET_OUTPUT(hint_mosi);
+  if (hint_cs != -1)   SET_OUTPUT(hint_cs);
 
-  if (_spi_initialized)
-    _spi_on_error();
+  if (_spi_initialized) _spi_on_error();
 
   _spi_clock = maxClockFreq;
   _spi_bitOrder = MSBFIRST;
@@ -134,13 +125,13 @@ void spiInit(uint8_t spiRate, int hint_sck, int hint_miso, int hint_mosi, int hi
 
   switch (spiRate) {
     case SPI_FULL_SPEED:      clock = 16000000; break;
-    case SPI_HALF_SPEED:      clock = 8000000;  break;
-    case SPI_QUARTER_SPEED:   clock = 4000000;  break;
-    case SPI_EIGHTH_SPEED:    clock = 2000000;  break;
-    case SPI_SIXTEENTH_SPEED: clock = 1000000;  break;
-    case SPI_SPEED_5:         clock = 500000;   break;
-    case SPI_SPEED_6:         clock = 250000;   break;
-    default:                  clock = 1000000; // Default from the SPI library
+    case SPI_HALF_SPEED:      clock =  8000000; break;
+    case SPI_QUARTER_SPEED:   clock =  4000000; break;
+    case SPI_EIGHTH_SPEED:    clock =  2000000; break;
+    case SPI_SIXTEENTH_SPEED: clock =  1000000; break;
+    case SPI_SPEED_5:         clock =   500000; break;
+    case SPI_SPEED_6:         clock =   250000; break;
+    default:                  clock =  1000000; // Default from the SPI library
   }
   spiInitEx(clock, hint_sck, hint_miso, hint_mosi, hint_cs);
 }
@@ -280,6 +271,6 @@ void spiWriteRepeat16(uint16_t val, uint16_t repcnt) {
   }
 }
 
-#endif
+#endif // !SOFTWARE_SPI && HALSPI_HW_GENERIC
 
-#endif
+#endif // ARDUINO_ARCH_ESP32
diff --git a/Marlin/src/HAL/ESP32/HAL_SPI_SW.cpp b/Marlin/src/HAL/ESP32/HAL_SPI_SW.cpp
@@ -1,10 +1,9 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
- * Copyright (c) 2017 Victor Perez
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,4 +34,4 @@
 
 #endif
 
-#endif
+#endif // ARDUINO_ARCH_ESP32
diff --git a/Marlin/src/HAL/LINUX/spi_pins.h b/Marlin/src/HAL/LINUX/spi_pins.h
@@ -25,7 +25,7 @@
 #include "../../inc/MarlinConfigPre.h"
 
 #if BOTH(HAS_MARLINUI_U8GLIB, SDSUPPORT) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
-  #define SOFTWARE_SPI  // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
+  #define SOFTWARE_SPI      // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
                             // needed due to the speed and mode required for communicating with each device being different.
                             // This requirement can be removed if the SPI access to these devices is updated to use
                             // spiBeginTransaction.