Scott Lahteine 4 лет назад
Родитель
Сommit
d029a09810
2 измененных файлов: 3 добавлений и 8 удалений
  1. 1
    1
      Marlin/src/HAL/LPC1768/main.cpp
  2. 2
    7
      Marlin/src/HAL/STM32/SoftwareSerial.h

+ 1
- 1
Marlin/src/HAL/LPC1768/main.cpp Просмотреть файл

@@ -90,7 +90,7 @@ void HAL_init() {
90 90
 
91 91
   //debug_frmwrk_init();
92 92
   //_DBG("\n\nDebug running\n");
93
-  // Initialise the SD card chip select pins as soon as possible
93
+  // Initialize the SD card chip select pins as soon as possible
94 94
   #if PIN_EXISTS(SS)
95 95
     OUT_WRITE(SS_PIN, HIGH);
96 96
   #endif

+ 2
- 7
Marlin/src/HAL/STM32/SoftwareSerial.h Просмотреть файл

@@ -29,9 +29,7 @@
29 29
  * The latest version of this library can always be found at
30 30
  * http://arduiniana.org.
31 31
  */
32
-
33
-#ifndef SOFTWARESERIAL_H
34
-#define SOFTWARESERIAL_H
32
+#pragma once
35 33
 
36 34
 #include <Arduino.h>
37 35
 
@@ -64,7 +62,6 @@ class SoftwareSerial : public Stream {
64 62
     uint32_t delta_start = 0;
65 63
 
66 64
     // static data
67
-    static bool initialised;
68 65
     static HardwareTimer timer;
69 66
     static const IRQn_Type timer_interrupt_number;
70 67
     static uint32_t timer_interrupt_priority;
@@ -91,7 +88,7 @@ class SoftwareSerial : public Stream {
91 88
   public:
92 89
     // public methods
93 90
 
94
-    SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool inverse_logic = false);
91
+    SoftwareSerial(uint16_t receivePin, uint16_t transmitPin, bool inverse_logic=false);
95 92
     virtual ~SoftwareSerial();
96 93
     void begin(long speed);
97 94
     bool listen();
@@ -115,5 +112,3 @@ class SoftwareSerial : public Stream {
115 112
 
116 113
     using Print::write;
117 114
 };
118
-
119
-#endif // SOFTWARESERIAL_H

Загрузка…
Отмена
Сохранить