Browse Source

General cleanups for HAL

Scott Lahteine 6 years ago
parent
commit
2c18faf3e4

+ 11
- 11
Marlin/src/HAL/HAL_TEENSY35_36/HAL_Servo_Teensy.h View File

@@ -1,18 +1,18 @@
1
-#ifndef HAL_Servo_Teensy_h
2
-#define HAL_Servo_Teensy_h
1
+#ifndef _HAL_SERVO_TEENSY_H_
2
+#define _HAL_SERVO_TEENSY_H_
3 3
 
4 4
 #include <Servo.h>
5 5
 
6 6
 // Inherit and expand on the official library
7 7
 class libServo : public Servo {
8
-	public:
9
-		int8_t attach(const int pin);
10
-		int8_t attach(const int pin, const int min, const int max);
11
-		void move(const int value);
12
-	private:
13
-	   uint16_t min_ticks;
14
-	   uint16_t max_ticks;
15
-	   uint8_t servoIndex;               // index into the channel data for this servo
8
+  public:
9
+    int8_t attach(const int pin);
10
+    int8_t attach(const int pin, const int min, const int max);
11
+    void move(const int value);
12
+  private:
13
+     uint16_t min_ticks;
14
+     uint16_t max_ticks;
15
+     uint8_t servoIndex;               // index into the channel data for this servo
16 16
 };
17 17
 
18
-#endif // HAL_Servo_Teensy_h
18
+#endif // _HAL_SERVO_TEENSY_H_

+ 1
- 1
Marlin/src/HAL/HAL_endstop_interrupts.h View File

@@ -45,7 +45,7 @@ void endstop_ISR(void) { endstop_ISR_worker(); }
45 45
 #elif IS_32BIT_TEENSY
46 46
 
47 47
   #include "HAL_TEENSY35_36/endstop_interrupts.h"
48
-  
48
+
49 49
 #elif defined(STM32F7)
50 50
 
51 51
   #include "HAL_STM32F7/endstop_interrupts.h"

+ 9
- 9
Marlin/src/core/serial.h View File

@@ -97,13 +97,13 @@ extern const char errormagic[] PROGMEM;
97 97
   #endif
98 98
 
99 99
   #define SERIAL_EOL_P(p) SERIAL_CHAR_P(p,'\n')
100
-  
100
+
101 101
   #define SERIAL_PROTOCOLCHAR_P(p,x)              SERIAL_CHAR_P(p,x)
102 102
   #define SERIAL_PROTOCOLPGM_P(p,x)               (serialprintPGM_P(p,PSTR(x)))
103 103
   #define SERIAL_PROTOCOLLNPGM_P(p,x)             (serialprintPGM_P(p,PSTR(x "\n")))
104 104
   #define SERIAL_PROTOCOLPAIR_P(p, pre, value)    (serial_echopair_PGM_P(p,PSTR(pre),(value)))
105 105
   #define SERIAL_PROTOCOLLNPAIR_P(p, pre, value)  do { SERIAL_PROTOCOLPAIR_P(p, pre, value); SERIAL_EOL_P(p); } while(0)
106
-  
106
+
107 107
   #define SERIAL_ECHO_START_P(p)             (serialprintPGM_P(p,echomagic))
108 108
   #define SERIAL_ECHO_P(p,x)                 SERIAL_PROTOCOL_P(p,x)
109 109
   #define SERIAL_ECHOPGM_P(p,x)              SERIAL_PROTOCOLPGM_P(p,x)
@@ -112,13 +112,13 @@ extern const char errormagic[] PROGMEM;
112 112
   #define SERIAL_ECHOPAIR_P(p,pre,value)     SERIAL_PROTOCOLPAIR_P(p, pre, value)
113 113
   #define SERIAL_ECHOLNPAIR_P(p,pre, value)  SERIAL_PROTOCOLLNPAIR_P(p, pre, value)
114 114
   #define SERIAL_ECHO_F_P(p,x,y)             SERIAL_PROTOCOL_F_P(p,x,y)
115
-  
115
+
116 116
   #define SERIAL_ERROR_START_P(p)            (serialprintPGM_P(p,errormagic))
117 117
   #define SERIAL_ERROR_P(p,x)                SERIAL_PROTOCOL_P(p,x)
118 118
   #define SERIAL_ERRORPGM_P(p,x)             SERIAL_PROTOCOLPGM_P(p,x)
119 119
   #define SERIAL_ERRORLN_P(p,x)              SERIAL_PROTOCOLLN_P(p,x)
120 120
   #define SERIAL_ERRORLNPGM_P(p,x)           SERIAL_PROTOCOLLNPGM_P(p,x)
121
-  
121
+
122 122
   // These macros compensate for float imprecision
123 123
   #define SERIAL_PROTOCOLPAIR_F_P(p, pre, value)    SERIAL_PROTOCOLPAIR_P(p, pre, FIXFLOAT(value))
124 124
   #define SERIAL_PROTOCOLLNPAIR_F_P(p, pre, value)  SERIAL_PROTOCOLLNPAIR_P(p, pre, FIXFLOAT(value))
@@ -149,7 +149,7 @@ extern const char errormagic[] PROGMEM;
149 149
   #define SERIAL_PROTOCOL_F_P(p,x,y)  SERIAL_PROTOCOL_F(x,y)
150 150
   #define SERIAL_PROTOCOLLN_P(p,x)    SERIAL_PROTOCOLLN(x)
151 151
   #define SERIAL_PRINT_P(p,x,b)       SERIAL_PRINT(x,b)
152
-  #define SERIAL_PRINTLN_P(p,x,b)     SERIAL_PRINTLN(x,b) 
152
+  #define SERIAL_PRINTLN_P(p,x,b)     SERIAL_PRINTLN(x,b)
153 153
   #define SERIAL_PRINTF_P(p,args...)  SERIAL_PRINTF(args)
154 154
 
155 155
   #define SERIAL_CHAR(x)              MYSERIAL0.write(x)
@@ -168,13 +168,13 @@ extern const char errormagic[] PROGMEM;
168 168
   #endif
169 169
 
170 170
   #define SERIAL_EOL_P(p) SERIAL_EOL()
171
-  
171
+
172 172
   #define SERIAL_PROTOCOLCHAR_P(p,x)              SERIAL_PROTOCOLCHAR(x)
173 173
   #define SERIAL_PROTOCOLPGM_P(p,x)               SERIAL_PROTOCOLPGM(x)
174 174
   #define SERIAL_PROTOCOLLNPGM_P(p,x)             SERIAL_PROTOCOLLNPGM(x)
175 175
   #define SERIAL_PROTOCOLPAIR_P(p, pre, value)    SERIAL_PROTOCOLPAIR(pre, value)
176 176
   #define SERIAL_PROTOCOLLNPAIR_P(p, pre, value)  SERIAL_PROTOCOLLNPAIR(pre, value)
177
-  
177
+
178 178
   #define SERIAL_ECHO_START_P(p)             SERIAL_ECHO_START()
179 179
   #define SERIAL_ECHO_P(p,x)                 SERIAL_ECHO(x)
180 180
   #define SERIAL_ECHOPGM_P(p,x)              SERIAL_ECHOPGM(x)
@@ -183,13 +183,13 @@ extern const char errormagic[] PROGMEM;
183 183
   #define SERIAL_ECHOPAIR_P(p,pre,value)     SERIAL_ECHOPAIR(pre, value)
184 184
   #define SERIAL_ECHOLNPAIR_P(p,pre, value)  SERIAL_ECHOLNPAIR(pre, value)
185 185
   #define SERIAL_ECHO_F_P(p,x,y)             SERIAL_ECHO_F(x,y)
186
-  
186
+
187 187
   #define SERIAL_ERROR_START_P(p)            SERIAL_ERROR_START()
188 188
   #define SERIAL_ERROR_P(p,x)                SERIAL_ERROR(x)
189 189
   #define SERIAL_ERRORPGM_P(p,x)             SERIAL_ERRORPGM(x)
190 190
   #define SERIAL_ERRORLN_P(p,x)              SERIAL_ERRORLN(x)
191 191
   #define SERIAL_ERRORLNPGM_P(p,x)           SERIAL_ERRORLNPGM(x)
192
-  
192
+
193 193
   // These macros compensate for float imprecision
194 194
   #define SERIAL_PROTOCOLPAIR_F_P(p, pre, value)    SERIAL_PROTOCOLPAIR_F(pre, value)
195 195
   #define SERIAL_PROTOCOLLNPAIR_F_P(p, pre, value)  SERIAL_PROTOCOLLNPAIR_F(pre, value)

+ 1
- 1
Marlin/src/gcode/feature/trinamic/M122.cpp View File

@@ -31,7 +31,7 @@
31 31
  * M122: Debug TMC drivers
32 32
  */
33 33
 void GcodeSuite::M122() {
34
-  if (parser.seen('S')) 
34
+  if (parser.seen('S'))
35 35
     tmc_set_report_status(parser.value_bool());
36 36
   else
37 37
     tmc_report_all();

+ 1
- 1
Marlin/src/gcode/queue.cpp View File

@@ -254,7 +254,7 @@ static bool serial_data_available() {
254 254
 static int read_serial(const int index) {
255 255
   switch (index) {
256 256
     case 0: return MYSERIAL0.read();
257
-    #if NUM_SERIAL > 1 
257
+    #if NUM_SERIAL > 1
258 258
       case 1: return MYSERIAL1.read();
259 259
     #endif
260 260
     default: return -1;

+ 1
- 1
Marlin/src/gcode/sdcard/M20-M30_M32-M34_M928.cpp View File

@@ -109,7 +109,7 @@ void GcodeSuite::M26() {
109 109
 /**
110 110
  * M27: Get SD Card status
111 111
  */
112
-void GcodeSuite::M27() { 
112
+void GcodeSuite::M27() {
113 113
   card.getStatus(
114 114
     #if NUM_SERIAL > 1
115 115
       command_queue_port[cmd_queue_index_r]

+ 46
- 46
Marlin/src/pins/pins_THE_BORG.h View File

@@ -73,7 +73,7 @@
73 73
 
74 74
 #define STEPPER_ENABLE_PIN _STM32_PIN(PORTE, 0)
75 75
 
76
-#define X_STEP_PIN         _STM32_PIN(PORTC, 6)	//96, 39 in arduino
76
+#define X_STEP_PIN         _STM32_PIN(PORTC, 6) //96, 39 in arduino
77 77
 #define X_DIR_PIN          _STM32_PIN(PORTC, 7)
78 78
 #define X_ENABLE_PIN       _STM32_PIN(PORTC, 8)
79 79
 
@@ -111,17 +111,17 @@
111 111
 
112 112
 
113 113
 
114
-#define SCK_PIN				_STM32_PIN(PORTA, 5)
115
-#define MISO_PIN			_STM32_PIN(PORTA, 6)
116
-#define MOSI_PIN			_STM32_PIN(PORTA, 7)
114
+#define SCK_PIN            _STM32_PIN(PORTA, 5)
115
+#define MISO_PIN           _STM32_PIN(PORTA, 6)
116
+#define MOSI_PIN           _STM32_PIN(PORTA, 7)
117 117
 
118
-#define SPI1_SCK_PIN		_STM32_PIN(PORTA, 5)
119
-#define SPI1_MISO_PIN      	_STM32_PIN(PORTA, 6)
120
-#define SPI1_MOSI_PIN      	_STM32_PIN(PORTA, 7)
118
+#define SPI1_SCK_PIN       _STM32_PIN(PORTA, 5)
119
+#define SPI1_MISO_PIN      _STM32_PIN(PORTA, 6)
120
+#define SPI1_MOSI_PIN      _STM32_PIN(PORTA, 7)
121 121
 
122
-#define SPI6_SCK_PIN       	_STM32_PIN(PORTG, 13)
123
-#define SPI6_MISO_PIN      	_STM32_PIN(PORTG, 12)
124
-#define SPI6_MOSI_PIN      	_STM32_PIN(PORTG, 14)
122
+#define SPI6_SCK_PIN       _STM32_PIN(PORTG, 13)
123
+#define SPI6_MISO_PIN      _STM32_PIN(PORTG, 12)
124
+#define SPI6_MOSI_PIN      _STM32_PIN(PORTG, 14)
125 125
 
126 126
 
127 127
 
@@ -130,36 +130,36 @@
130 130
 // Temperature Sensors
131 131
 //
132 132
 
133
-#define TEMP_0_PIN       	_STM32_PIN(PORTC, 3)   // Analog Input
134
-#define TEMP_1_PIN       	_STM32_PIN(PORTC, 2)   // Analog Input
135
-#define TEMP_2_PIN       	_STM32_PIN(PORTC, 1)   // Analog Input
136
-#define TEMP_3_PIN       	_STM32_PIN(PORTC, 0)   // Analog Input
133
+#define TEMP_0_PIN         _STM32_PIN(PORTC, 3)   // Analog Input
134
+#define TEMP_1_PIN         _STM32_PIN(PORTC, 2)   // Analog Input
135
+#define TEMP_2_PIN         _STM32_PIN(PORTC, 1)   // Analog Input
136
+#define TEMP_3_PIN         _STM32_PIN(PORTC, 0)   // Analog Input
137 137
 
138
-#define TEMP_BED_PIN     	_STM32_PIN(PORTF, 10)  // Analog Input
138
+#define TEMP_BED_PIN       _STM32_PIN(PORTF, 10)  // Analog Input
139 139
 
140
-#define TEMP_5_PIN       	_STM32_PIN(PORTE, 12)  // Analog Input, Probe temp
140
+#define TEMP_5_PIN         _STM32_PIN(PORTE, 12)  // Analog Input, Probe temp
141 141
 
142 142
 
143 143
 //
144 144
 // Heaters / Fans
145 145
 //
146
-#define HEATER_0_PIN        _STM32_PIN(PORTD, 15)
147
-#define HEATER_1_PIN        _STM32_PIN(PORTD, 14)
148
-#define HEATER_BED_PIN      _STM32_PIN(PORTF,  6)
146
+#define HEATER_0_PIN       _STM32_PIN(PORTD, 15)
147
+#define HEATER_1_PIN       _STM32_PIN(PORTD, 14)
148
+#define HEATER_BED_PIN     _STM32_PIN(PORTF,  6)
149 149
 
150
-#define FAN_PIN             _STM32_PIN(PORTD, 13)
151
-#define FAN1_PIN            _STM32_PIN(PORTA, 0)
152
-#define FAN2_PIN            _STM32_PIN(PORTA, 1)
150
+#define FAN_PIN            _STM32_PIN(PORTD, 13)
151
+#define FAN1_PIN           _STM32_PIN(PORTA, 0)
152
+#define FAN2_PIN           _STM32_PIN(PORTA, 1)
153 153
 
154
-//#define E0_AUTO_FAN_PIN 	_STM32_PIN(PORTA, 1)
154
+//#define E0_AUTO_FAN_PIN  _STM32_PIN(PORTA, 1)
155 155
 
156 156
 //
157 157
 // Misc. Functions
158 158
 //
159 159
 
160
-//#define CASE_LIGHT_PIN_CI   _STM32_PIN(PORTF, 13)  //
161
-//#define CASE_LIGHT_PIN_DO   _STM32_PIN(PORTF, 14)  //
162
-//#define NEOPIXEL_PIN		_STM32_PIN(PORTF, 13)
160
+//#define CASE_LIGHT_PIN_CI _STM32_PIN(PORTF, 13)  //
161
+//#define CASE_LIGHT_PIN_DO _STM32_PIN(PORTF, 14)  //
162
+//#define NEOPIXEL_PIN     _STM32_PIN(PORTF, 13)
163 163
 
164 164
 //
165 165
 // Prusa i3 MK2 Multi Material Multiplexer Support
@@ -172,37 +172,37 @@
172 172
 // Servos
173 173
 //
174 174
 
175
-#define SERVO0_PIN 		   _STM32_PIN(PORTE, 13)  
176
-#define SERVO1_PIN 		   _STM32_PIN(PORTE, 14)  
175
+#define SERVO0_PIN         _STM32_PIN(PORTE, 13)  
176
+#define SERVO1_PIN         _STM32_PIN(PORTE, 14)  
177 177
 
178 178
 
179 179
 #define SDSS               _STM32_PIN(PORTA, 8)
180
-#define SS_PIN			   _STM32_PIN(PORTA, 8)
181
-#define LED_PIN            _STM32_PIN(PORTA, 2)			//Alive
180
+#define SS_PIN             _STM32_PIN(PORTA, 8)
181
+#define LED_PIN            _STM32_PIN(PORTA, 2)         //Alive
182 182
 #define PS_ON_PIN          _STM32_PIN(PORTA, 3)
183
-#define KILL_PIN           -1//_STM32_PIN(PORTD, 5)		//EXP2-10
184
-#define PWR_LOSS		   _STM32_PIN(PORTG, 5)			//Power loss / nAC_FAULT
183
+#define KILL_PIN           -1//_STM32_PIN(PORTD, 5)     //EXP2-10
184
+#define PWR_LOSS           _STM32_PIN(PORTG, 5)         //Power loss / nAC_FAULT
185 185
 
186 186
 //
187 187
 //MAX7219_DEBUG
188 188
 //
189
-#define MAX7219_CLK_PIN   _STM32_PIN(PORTG, 10)		//EXP1-1
190
-#define MAX7219_DIN_PIN   _STM32_PIN(PORTD, 7)		//EXP1-3
191
-#define MAX7219_LOAD_PIN   _STM32_PIN(PORTD, 1)		//EXP1-5
189
+#define MAX7219_CLK_PIN    _STM32_PIN(PORTG, 10)     //EXP1-1
190
+#define MAX7219_DIN_PIN    _STM32_PIN(PORTD, 7)      //EXP1-3
191
+#define MAX7219_LOAD_PIN   _STM32_PIN(PORTD, 1)     //EXP1-5
192 192
 
193 193
 //#define NEOPIXEL_PIN    4
194 194
   
195 195
 //
196 196
 // LCD / Controller
197 197
 //
198
-//#define SD_DETECT_PIN      -1 //_STM32_PIN(PORTB, 6))		//EXP2-4
199
-#define BEEPER_PIN         _STM32_PIN(PORTG, 10)		//EXP1-1
200
-#define LCD_PINS_RS        _STM32_PIN(PORTG, 9)			//EXP1-4
201
-#define LCD_PINS_ENABLE    _STM32_PIN(PORTD, 7)			//EXP1-3
202
-#define LCD_PINS_D4        _STM32_PIN(PORTD, 1)			//EXP1-5
203
-#define LCD_PINS_D5        _STM32_PIN(PORTF, 0)			//EXP1-6
204
-#define LCD_PINS_D6        _STM32_PIN(PORTD, 3)			//EXP1-7
205
-#define LCD_PINS_D7        _STM32_PIN(PORTD, 4)			//EXP1-8
206
-#define BTN_EN1            _STM32_PIN(PORTD, 6)			//EXP2-5
207
-#define BTN_EN2            _STM32_PIN(PORTD, 0)			//EXP2-3
208
-#define BTN_ENC            _STM32_PIN(PORTG, 11)		//EXP1-2
198
+//#define SD_DETECT_PIN      -1 //_STM32_PIN(PORTB, 6))     //EXP2-4
199
+#define BEEPER_PIN         _STM32_PIN(PORTG, 10)        //EXP1-1
200
+#define LCD_PINS_RS        _STM32_PIN(PORTG, 9)         //EXP1-4
201
+#define LCD_PINS_ENABLE    _STM32_PIN(PORTD, 7)         //EXP1-3
202
+#define LCD_PINS_D4        _STM32_PIN(PORTD, 1)         //EXP1-5
203
+#define LCD_PINS_D5        _STM32_PIN(PORTF, 0)         //EXP1-6
204
+#define LCD_PINS_D6        _STM32_PIN(PORTD, 3)         //EXP1-7
205
+#define LCD_PINS_D7        _STM32_PIN(PORTD, 4)         //EXP1-8
206
+#define BTN_EN1            _STM32_PIN(PORTD, 6)         //EXP2-5
207
+#define BTN_EN2            _STM32_PIN(PORTD, 0)         //EXP2-3
208
+#define BTN_ENC            _STM32_PIN(PORTG, 11)        //EXP1-2

Loading…
Cancel
Save