Misc. cleanup

Marlin/Configuration.h

@@ -2739,7 +2739,7 @@
 
 //
 // ReprapWorld Graphical LCD
-// https://reprapworld.com/?products_details&products_id/1218
+// https://reprapworld.com/electronics/3d-printer-modules/autonomous-printing/graphical-lcd-screen-v1-0/
 //
 //#define REPRAPWORLD_GRAPHICAL_LCD
 

Marlin/src/HAL/NATIVE_SIM/u8g/u8g_com_st7920_sw_spi.cpp

@@ -168,4 +168,4 @@ uint8_t u8g_com_ST7920_sw_spi_fn(u8g_t *u8g, uint8_t msg, uint8_t arg_val, void
 #endif
 
 #endif // IS_U8GLIB_ST7920
-#endif // TARGET_LPC1768
+#endif // __PLAT_NATIVE_SIM__

Marlin/src/HAL/SAMD21/HAL.cpp

@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,39 +21,35 @@
  */
 
 /**
- * SAMD21 HAL developed by Bart Meijer (brupje) 
- * Based on the work of Giuliano Zaro (AKA GMagician)
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
  */
 #ifdef __SAMD21__
 
 #include "../../inc/MarlinConfig.h"
 
 #include <wiring_private.h>
 
-
- #if USING_HW_SERIALUSB
-    DefaultSerial1 MSerialUSB(false, SerialUSB);
-  #endif
-  #if USING_HW_SERIAL0
-    DefaultSerial2 MSerial1(false, Serial1);
-  #endif
-  #if USING_HW_SERIAL1
-    DefaultSerial3 MSerial2(false, Serial2);
-  #endif
-  #if USING_HW_SERIAL2
-    DefaultSerial4 MSerial3(false, Serial3);
-  #endif
-  #if USING_HW_SERIAL3
-    DefaultSerial5 MSerial4(false, Serial4);
-  #endif
+#if USING_HW_SERIALUSB
+  DefaultSerial1 MSerialUSB(false, SerialUSB);
+#endif
+#if USING_HW_SERIAL0
+  DefaultSerial2 MSerial1(false, Serial1);
+#endif
+#if USING_HW_SERIAL1
+  DefaultSerial3 MSerial2(false, Serial2);
+#endif
+#if USING_HW_SERIAL2
+  DefaultSerial4 MSerial3(false, Serial3);
+#endif
+#if USING_HW_SERIAL3
+  DefaultSerial5 MSerial4(false, Serial4);
+#endif
 
 #define WDT_CONFIG_PER_7_Val 0x9u
 #define WDT_CONFIG_PER_Pos 0
 #define WDT_CONFIG_PER_7 (WDT_CONFIG_PER_7_Val << WDT_CONFIG_PER_Pos)
 
-
-
-
 #if ENABLED(USE_WATCHDOG)
 
   #define WDT_TIMEOUT_REG TERN(WATCHDOG_DURATION_8S, WDT_CONFIG_PER_CYC8192, WDT_CONFIG_PER_CYC4096) // 4 or 8 second timeout
@@ -68,7 +64,7 @@
                         GCLK_GENCTRL_IDC |            // Set the duty cycle to 50/50 HIGH/LOW
                         GCLK_GENCTRL_GENEN |          // Enable GCLK2
                         GCLK_GENCTRL_SRC_OSCULP32K |  // Set the clock source to the ultra low power oscillator (OSCULP32K)
-                        GCLK_GENCTRL_ID(2);           // Select GCLK2         
+                        GCLK_GENCTRL_ID(2);           // Select GCLK2
     while (GCLK->STATUS.bit.SYNCBUSY);                // Wait for synchronization
 
     // Feed GCLK2 to WDT (Watchdog Timer)
@@ -86,7 +82,7 @@
   // Reset watchdog. MUST be called at least every 4 seconds after the
   // first watchdog_init or SAMD will go into emergency procedures.
   void MarlinHAL::watchdog_refresh() {
-    WDT->CLEAR.reg = WDT_CLEAR_CLEAR_KEY; 
+    WDT->CLEAR.reg = WDT_CLEAR_CLEAR_KEY;
     while (WDT->STATUS.bit.SYNCBUSY);
   }
 
@@ -96,8 +92,6 @@
 // Types
 // ------------------------
 
-
-
 // ------------------------
 // Private Variables
 // ------------------------
@@ -106,28 +100,21 @@
 // Private functions
 // ------------------------
 
-void MarlinHAL::dma_init() {
-
-}
+void MarlinHAL::dma_init() {}
 
 // ------------------------
 // Public functions
 // ------------------------
 
 // HAL initialization task
 void MarlinHAL::init() {
-
-
-
   TERN_(DMA_IS_REQUIRED, dma_init());
   #if ENABLED(SDSUPPORT)
     #if HAS_SD_DETECT && SD_CONNECTION_IS(ONBOARD)
       SET_INPUT_PULLUP(SD_DETECT_PIN);
     #endif
     OUT_WRITE(SDSS, HIGH);  // Try to set SDSS inactive before any other SPI users start up
   #endif
-
-
 }
 
 #pragma push_macro("WDT")
@@ -142,7 +129,6 @@ void MarlinHAL::reboot() { NVIC_SystemReset(); }
 
 extern "C" {
   void * _sbrk(int incr);
-
   extern unsigned int __bss_end__; // end of bss section
 }
 
@@ -159,91 +145,71 @@ int freeMemory() {
 uint16_t MarlinHAL::adc_result;
 
 void MarlinHAL::adc_init() {
-  //#if ADC_IS_REQUIRED
+  /* thanks to https://www.eevblog.com/forum/microcontrollers/samd21g18-adc-with-resrdy-interrupts-only-reads-once-or-twice/ */
 
-    /* thanks to https://www.eevblog.com/forum/microcontrollers/samd21g18-adc-with-resrdy-interrupts-only-reads-once-or-twice/ */
+  ADC->CTRLA.bit.ENABLE = false;
+  while(ADC->STATUS.bit.SYNCBUSY);
 
-    ADC->CTRLA.bit.ENABLE = false;
-    while(ADC->STATUS.bit.SYNCBUSY); 
+  // load chip corrections
+  uint32_t bias = (*((uint32_t *) ADC_FUSES_BIASCAL_ADDR) & ADC_FUSES_BIASCAL_Msk) >> ADC_FUSES_BIASCAL_Pos;
+  uint32_t linearity = (*((uint32_t *) ADC_FUSES_LINEARITY_0_ADDR) & ADC_FUSES_LINEARITY_0_Msk) >> ADC_FUSES_LINEARITY_0_Pos;
+  linearity |= ((*((uint32_t *) ADC_FUSES_LINEARITY_1_ADDR) & ADC_FUSES_LINEARITY_1_Msk) >> ADC_FUSES_LINEARITY_1_Pos) << 5;
 
+  /* Wait for bus synchronization. */
+  while (ADC->STATUS.bit.SYNCBUSY) {};
 
-    // load chip corrections
-    uint32_t bias = (*((uint32_t *) ADC_FUSES_BIASCAL_ADDR) & ADC_FUSES_BIASCAL_Msk) >> ADC_FUSES_BIASCAL_Pos;
-    uint32_t linearity = (*((uint32_t *) ADC_FUSES_LINEARITY_0_ADDR) & ADC_FUSES_LINEARITY_0_Msk) >> ADC_FUSES_LINEARITY_0_Pos;
-    linearity |= ((*((uint32_t *) ADC_FUSES_LINEARITY_1_ADDR) & ADC_FUSES_LINEARITY_1_Msk) >> ADC_FUSES_LINEARITY_1_Pos) << 5;
-
-    /* Wait for bus synchronization. */
-    while (ADC->STATUS.bit.SYNCBUSY) {};
+  ADC->CALIB.reg = ADC_CALIB_BIAS_CAL(bias) | ADC_CALIB_LINEARITY_CAL(linearity);
 
-    ADC->CALIB.reg = ADC_CALIB_BIAS_CAL(bias) | ADC_CALIB_LINEARITY_CAL(linearity);
-
-    /* Wait for bus synchronization. */
-    while (ADC->STATUS.bit.SYNCBUSY) {};
-
-
-    ADC->CTRLA.bit.SWRST = true;
-    while(ADC->STATUS.bit.SYNCBUSY); 
+  /* Wait for bus synchronization. */
+  while (ADC->STATUS.bit.SYNCBUSY) {};
 
-    ADC->REFCTRL.reg = ADC_REFCTRL_REFSEL_INTVCC1;
-    ADC->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_32| ADC_AVGCTRL_ADJRES(4);;
-
-
-    ADC->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV128 |
-                   ADC_CTRLB_RESSEL_16BIT | 
-                   ADC_CTRLB_FREERUN;
-    while(ADC->STATUS.bit.SYNCBUSY); 
+  ADC->CTRLA.bit.SWRST = true;
+  while(ADC->STATUS.bit.SYNCBUSY);
 
-    ADC->SAMPCTRL.bit.SAMPLEN = 0x00;
-    while(ADC->STATUS.bit.SYNCBUSY); 
+  ADC->REFCTRL.reg = ADC_REFCTRL_REFSEL_INTVCC1;
+  ADC->AVGCTRL.reg = ADC_AVGCTRL_SAMPLENUM_32| ADC_AVGCTRL_ADJRES(4);;
 
 
+  ADC->CTRLB.reg = ADC_CTRLB_PRESCALER_DIV128 |
+                 ADC_CTRLB_RESSEL_16BIT |
+                 ADC_CTRLB_FREERUN;
+  while(ADC->STATUS.bit.SYNCBUSY);
 
-    ADC->INPUTCTRL.reg =  ADC_INPUTCTRL_INPUTSCAN(HAL_ADC_AIN_LEN) // scan  (INPUTSCAN + NUM_EXTUDERS - 1) pins
-    | ADC_INPUTCTRL_GAIN_DIV2  |ADC_INPUTCTRL_MUXNEG_GND| HAL_ADC_AIN_START ;  /* set to first AIN */
+  ADC->SAMPCTRL.bit.SAMPLEN = 0x00;
+  while(ADC->STATUS.bit.SYNCBUSY);
 
-    while(ADC->STATUS.bit.SYNCBUSY);
+  ADC->INPUTCTRL.reg =  ADC_INPUTCTRL_INPUTSCAN(HAL_ADC_AIN_LEN) // scan  (INPUTSCAN + NUM_EXTUDERS - 1) pins
+  | ADC_INPUTCTRL_GAIN_DIV2  |ADC_INPUTCTRL_MUXNEG_GND| HAL_ADC_AIN_START ;  /* set to first AIN */
 
+  while(ADC->STATUS.bit.SYNCBUSY);
 
-    ADC->INTENSET.reg |= ADC_INTENSET_RESRDY; // enable Result Ready ADC interrupts
-    while (ADC->STATUS.bit.SYNCBUSY);
+  ADC->INTENSET.reg |= ADC_INTENSET_RESRDY; // enable Result Ready ADC interrupts
+  while (ADC->STATUS.bit.SYNCBUSY);
 
-    NVIC_EnableIRQ(ADC_IRQn); // enable ADC interrupts
+  NVIC_EnableIRQ(ADC_IRQn); // enable ADC interrupts
 
-    NVIC_SetPriority(ADC_IRQn, 3);
-
-    ADC->CTRLA.bit.ENABLE = true;
+  NVIC_SetPriority(ADC_IRQn, 3);
 
-
-  //#endif // ADC_IS_REQUIRED
+  ADC->CTRLA.bit.ENABLE = true;
 }
 
 volatile uint32_t adc_results[HAL_ADC_AIN_NUM_SENSORS];
 
-
-
 void ADC_Handler() {
-
   while(ADC->STATUS.bit.SYNCBUSY == 1);
   int pos = ADC->INPUTCTRL.bit.INPUTOFFSET;
 
   adc_results[pos] = ADC->RESULT.reg; /* Read the value. */
   ADC->INTFLAG.reg = ADC_INTENSET_RESRDY; /* Clear the data ready flag. */
 }
 
-
-
-void MarlinHAL::adc_start(const pin_t pin) { 
-
+void MarlinHAL::adc_start(const pin_t pin) {
   /* due to the way INPUTOFFSET works, the last sensor is the first position in the array
     and we want the ADC_handler interrupt to be as simple possible, so we do the calculation here.
   */
   unsigned int pos = PIN_TO_INPUTCTRL(pin) - HAL_ADC_AIN_START + 1;
-  if (pos == HAL_ADC_AIN_NUM_SENSORS)
-    pos = 0;
- // #if ADC_IS_REQUIRED
-    adc_result = adc_results[pos];//16 bit resolution
-  //#endif
-
+  if (pos == HAL_ADC_AIN_NUM_SENSORS) pos = 0;
+  adc_result = adc_results[pos]; // 16-bit resolution
   //adc_result = 0xFFFF;
 }
 

Marlin/src/HAL/SAMD21/HAL.h

@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -19,12 +19,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  *
  */
+#pragma once
 
 /**
- * SAMD21 HAL developed by Bart Meijer (brupje) 
- * Based on the work of Giuliano Zaro (AKA GMagician)
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
  */
-#pragma once
 
 #define CPU_32_BIT
 
@@ -35,12 +35,12 @@
 
 
 #ifdef __SAMD21__
-  
+
   // ------------------------
   // Serial ports
   // ------------------------
  // #ifdef USBCON
-  
+
     #include "../../core/serial_hook.h"
     typedef ForwardSerial1Class< decltype(SerialUSB) > DefaultSerial1;
     extern DefaultSerial1 MSerialUSB;

Marlin/src/HAL/SAMD21/HAL_SPI.cpp

@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,8 +21,8 @@
  */
 
 /**
- * SAMD21 HAL developed by Bart Meijer (brupje) 
- * Based on the work of Giuliano Zaro (AKA GMagician)
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
  */
 
 /**
@@ -55,7 +55,7 @@
 #else // !SOFTWARE_SPI
 
     #define sdSPI SPI
- 
+
 
   static SPISettings spiConfig;
 
@@ -110,14 +110,14 @@
    * @return Nothing
    */
   void spiRead(uint8_t *buf, uint16_t nbyte) {
-    
+
     if (nbyte == 0) return;
     memset(buf, 0xFF, nbyte);
-   
+
     sdSPI.beginTransaction(spiConfig);
     sdSPI.transfer(buf, nbyte);
     sdSPI.endTransaction();
-    
+
   }
 
   /**

Marlin/src/HAL/SAMD21/MarlinSPI.h

@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,8 +21,8 @@
  */
 
 /**
- * SAMD21 HAL developed by Bart Meijer (brupje) 
- * Based on the work of Giuliano Zaro (AKA GMagician)
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
  */
 #pragma once
 

Marlin/src/HAL/SAMD21/QSPIFlash.cpp

@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
- * Copyright (c) 2020 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (c) 2022 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
@@ -21,8 +21,8 @@
  */
 
 /**
- * SAMD21 HAL developed by Bart Meijer (brupje) 
- * Based on the work of Giuliano Zaro (AKA GMagician)
+ * SAMD21 HAL developed by Bart Meijer (brupje)
+ * Based on SAMD51 HAL by Giuliano Zaro (AKA GMagician)
  */
 #include "../../inc/MarlinConfig.h"