From d029a098107334aec718c62adf82817b34950f3f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 29 Mar 2020 17:14:06 -0500 Subject: [PATCH] Minor HAL cleanup --- Marlin/src/HAL/LPC1768/main.cpp | 2 +- Marlin/src/HAL/STM32/SoftwareSerial.h | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Marlin/src/HAL/LPC1768/main.cpp b/Marlin/src/HAL/LPC1768/main.cpp index fb7394344e..d7b05dce9d 100644 --- a/Marlin/src/HAL/LPC1768/main.cpp +++ b/Marlin/src/HAL/LPC1768/main.cpp @@ -90,7 +90,7 @@ void HAL_init() { //debug_frmwrk_init(); //_DBG("\n\nDebug running\n"); - // Initialise the SD card chip select pins as soon as possible + // Initialize the SD card chip select pins as soon as possible #if PIN_EXISTS(SS) OUT_WRITE(SS_PIN, HIGH); #endif diff --git a/Marlin/src/HAL/STM32/SoftwareSerial.h b/Marlin/src/HAL/STM32/SoftwareSerial.h index 3799701cfe..504bd6979b 100644 --- a/Marlin/src/HAL/STM32/SoftwareSerial.h +++ b/Marlin/src/HAL/STM32/SoftwareSerial.h @@ -29,9 +29,7 @@ * The latest version of this library can always be found at * http://arduiniana.org. */ - -#ifndef SOFTWARESERIAL_H -#define SOFTWARESERIAL_H +#pragma once #include @@ -64,7 +62,6 @@ class SoftwareSerial : public Stream { uint32_t delta_start = 0; // static data - static bool initialised; static HardwareTimer timer; static const IRQn_Type timer_interrupt_number; static uint32_t timer_interrupt_priority; @@ -91,7 +88,7 @@ class SoftwareSerial : public Stream { public: // public methods - SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool inverse_logic = false); + SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool inverse_logic=false); virtual ~SoftwareSerial(); void begin(long speed); bool listen(); @@ -115,5 +112,3 @@ class SoftwareSerial : public Stream { using Print::write; }; - -#endif // SOFTWARESERIAL_H