Clean up some HAL code

Marlin/src/HAL/HAL_AVR/watchdog_AVR.cpp

@@ -22,12 +22,14 @@
 
 #ifdef ARDUINO_ARCH_AVR
 
-#include "../../../Marlin.h"
+#include "../../../MarlinConfig.h"
 
 #if ENABLED(USE_WATCHDOG)
 
 #include "watchdog_AVR.h"
 
+#include "../../../Marlin.h"
+
 // Initialize watchdog with a 4 sec interrupt time
 void watchdog_init() {
   #if ENABLED(WATCHDOG_RESET_MANUAL)

Marlin/src/HAL/HAL_AVR/watchdog_AVR.h

@@ -23,8 +23,6 @@
 #ifndef WATCHDOG_AVR_H
 #define WATCHDOG_AVR_H
 
-//#include "../../../Marlin.h"
-
 #include <avr/wdt.h>
 
 // Initialize watchdog with a 4 second interrupt time
@@ -34,4 +32,4 @@ void watchdog_init();
 // first watchdog_init or AVR will go into emergency procedures.
 inline void watchdog_reset() { wdt_reset(); }
 
-#endif
+#endif // WATCHDOG_AVR_H

Marlin/src/HAL/HAL_DUE/HAL_timers_Due.cpp

@@ -91,7 +91,6 @@ const tTimerConfig TimerConfig [NUM_HARDWARE_TIMERS] = {
   Timer_clock4: Prescaler 128 -> 656.25kHz
 */
 
-
 void HAL_timer_start(const uint8_t timer_num, const uint32_t frequency) {
   Tc *tc = TimerConfig[timer_num].pTimerRegs;
   IRQn_Type irq = TimerConfig[timer_num].IRQ_Id;

Marlin/src/HAL/HAL_DUE/fastio_Due.h

@@ -431,5 +431,4 @@ pins
 #define DIO100_PIN 11
 #define DIO100_WPORT PIOC
 
-
 #endif // _FASTIO_DUE_H

Marlin/src/HAL/HAL_LPC1768/LPC1768_PWM.h

@@ -21,7 +21,7 @@
  */
 
 /**
- * The class Servo uses the PWM class to implement it's functions
+ * The class Servo uses the PWM class to implement its functions
  *
  * All PWMs use the same repetition rate - 20mS because that's the normal servo rate
 */
@@ -489,7 +489,7 @@ return;
  *          writes to the LER register
  *          sets the PWM_table_swap flag active
  *          re-enables the ISR
- *     7) On the next interrupt the ISR changes it's pointer to the work table which is now the old, 
+ *     7) On the next interrupt the ISR changes its pointer to the work table which is now the old, 
  *        unmodified, active table.
  *     8) On the next MR0 interrupt the ISR:
  *          switches over to the active table

Marlin/src/HAL/HAL_LPC1768/LPC1768_Servo.cpp

@@ -1,6 +1,6 @@
 /**
  * Marlin 3D Printer Firmware
-  * Copyright (C) 2016, 2017 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
  *
  * Based on Sprinter and grbl.
  * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
@@ -58,28 +58,22 @@
  *
  * The PWM output is inactive until the first WRITE.  After that it stays active
  * unless DEACTIVATE_SERVOS_AFTER_MOVE is enabled and a MOVE command was issued.
- *
  */
 
-#ifdef TARGET_LPC1768
-
-#if HAS_SERVOS
+#include "../../../MarlinConfig.h"
 
+#if HAS_SERVOS && defined(TARGET_LPC1768)
 
   #include "LPC1768_Servo.h"
   #include "servo_private.h"
 
-
   extern bool LPC1768_PWM_attach_pin(uint8_t, uint32_t, uint32_t, uint8_t);
   extern bool LPC1768_PWM_write(uint8_t, uint32_t);
   extern bool LPC1768_PWM_detach_pin(uint8_t);
 
-
-
   ServoInfo_t servo_info[MAX_SERVOS];                  // static array of servo info structures
   uint8_t ServoCount = 0;                              // the total number of attached servos
 
-
   #define US_TO_PULSE_WIDTH(p) p
   #define PULSE_WIDTH_TO_US(p) p
   #define TRIM_DURATION 0
@@ -107,7 +101,6 @@
                                                               // greater than zero. This way the init routine can
                                                               // assign the pin and the MOVE command only needs the value.
 
-
     this->min = MIN_PULSE_WIDTH; //resolution of min/max is 1 uS
     this->max = MAX_PULSE_WIDTH;
 
@@ -165,7 +158,4 @@
     }
   }
 
-#endif // HAS_SERVOS
-
-#endif // TARGET_LPC1768
-
+#endif // HAS_SERVOS && TARGET_LPC1768

Marlin/src/HAL/HAL_LPC1768/LPC1768_Servo.h

@@ -21,7 +21,7 @@
  */
 
 /**
- * The class Servo uses the PWM class to implement it's functions
+ * The class Servo uses the PWM class to implement its functions
  *
  * The PWM1 module is only used to generate interrups at specified times. It
  * is NOT used to directly toggle pins. The ISR writes to the pin assigned to
@@ -31,13 +31,11 @@
  *
  */
 
-#ifndef LPC1768_SERVO_h
-  #define LPC1768_SERVO_h
+#ifndef LPC1768_SERVO_H
+#define LPC1768_SERVO_H
 
-  #ifdef TARGET_LPC1768
 #include <inttypes.h>
 
-
 class Servo {
   public:
     Servo();
@@ -59,11 +57,6 @@
     int max;
 };
 
-
 #define HAL_SERVO_LIB Servo
 
-  #endif
-#endif
-
-
-
+#endif // LPC1768_SERVO_H

Marlin/src/HAL/HAL_pinsDebug.h

@@ -21,8 +21,8 @@
  */
 
 #ifndef HAL_PINSDEBUG_H
+#define HAL_PINSDEBUG_H
 
-#if defined(PINS_DEBUGGING)
 #ifdef ARDUINO_ARCH_AVR
   #include "HAL_AVR/pinsDebug_AVR_8_bit.h"
 #elif defined(ARDUINO_ARCH_SAM)
@@ -34,6 +34,5 @@
 #else
   #error Unsupported Platform!
 #endif
-#endif  
 
-#endif
+#endif // HAL_PINSDEBUG_H

Marlin/src/HAL/HAL_spi_pins.h

@@ -41,4 +41,4 @@
   #error "Unsupported Platform!"
 #endif
 
-#endif /* HAL_SPI_PINS_H_ */
+#endif // HAL_SPI_PINS_H_

Marlin/src/HAL/servo.h

@@ -66,17 +66,16 @@
                    With DEACTIVATE_SERVOS_AFTER_MOVE wait SERVO_DELAY and detach.
  */
 
-#ifndef servo_h
-#define servo_h
+#ifndef SERVO_H
+#define SERVO_H
 
 #if IS_32BIT_TEENSY
   #include "HAL_TEENSY35_36/HAL_Servo_Teensy.h" // Teensy HAL uses an inherited library
 
 #elif defined(TARGET_LPC1768)
-  #include "HAL_LPC1768/LPC1768_Servo.cpp"
+  #include "HAL_LPC1768/LPC1768_Servo.h"
 
 #else
-
   #include <inttypes.h>
 
   #if defined(ARDUINO_ARCH_AVR) || defined(ARDUINO_ARCH_SAM)
@@ -108,6 +107,6 @@ class Servo {
       int8_t max;                       // maximum is this value times 4 added to MAX_PULSE_WIDTH
   };
 
-#endif // !TEENSY
-
 #endif
+
+#endif // SERVO_H

Marlin/stepper.cpp

@@ -355,11 +355,8 @@ void Stepper::isr() {
       }
 
       _NEXT_ISR(ocr_val);
-      #ifdef CPU_32_BIT
-        //todo: HAL?
-      #else
+
       NOLESS(OCR1A, TCNT1 + 16);
-      #endif
 
       HAL_ENABLE_ISRs(); // re-enable ISRs
       return;