Browse Source

🐛 Fix missing ADC method

Scott Lahteine 3 years ago
parent
commit
57315f02cb

+ 0
- 2
Marlin/src/HAL/DUE/HAL.h View File

@@ -131,8 +131,6 @@ typedef Servo hal_servo_t;
131 131
   #define analogInputToDigitalPin(p) ((p < 12U) ? (p) + 54U : -1)
132 132
 #endif
133 133
 
134
-#define HAL_ANALOG_SELECT(ch)
135
-
136 134
 //
137 135
 // Pin Mapping for M42, M43, M226
138 136
 //

+ 0
- 3
Marlin/src/HAL/ESP32/HAL.h View File

@@ -85,9 +85,6 @@ void noTone(const pin_t _pin);
85 85
 
86 86
 void analogWrite(pin_t pin, int value);
87 87
 
88
-// ADC
89
-#define HAL_ANALOG_SELECT(pin)
90
-
91 88
 //
92 89
 // Pin Mapping for M42, M43, M226
93 90
 //

+ 0
- 1
Marlin/src/HAL/LINUX/HAL.h View File

@@ -82,7 +82,6 @@ extern MSerialT usb_serial;
82 82
 // ADC
83 83
 #define HAL_ADC_VREF           5.0
84 84
 #define HAL_ADC_RESOLUTION    10
85
-#define HAL_ANALOG_SELECT(ch) hal.adc_enable(ch)
86 85
 
87 86
 // ------------------------
88 87
 // Class Utilities

+ 0
- 2
Marlin/src/HAL/LPC1768/HAL.h View File

@@ -133,8 +133,6 @@ extern DefaultSerial1 USBSerial;
133 133
 #define HAL_ADC_RESOLUTION     12   // 15 bit maximum, raw temperature is stored as int16_t
134 134
 #define HAL_ADC_FILTERED            // Disable oversampling done in Marlin as ADC values already filtered in HAL
135 135
 
136
-#define HAL_ANALOG_SELECT(pin) hal.adc_enable(pin)
137
-
138 136
 //
139 137
 // Pin Mapping for M42, M43, M226
140 138
 //

+ 0
- 1
Marlin/src/HAL/NATIVE_SIM/HAL.h View File

@@ -117,7 +117,6 @@ extern MSerialT serial_stream_3;
117 117
 
118 118
 #define HAL_ADC_VREF           5.0
119 119
 #define HAL_ADC_RESOLUTION    10
120
-#define HAL_ANALOG_SELECT(ch) hal.adc_enable(ch)
121 120
 
122 121
 /* ---------------- Delay in cycles */
123 122
 

+ 0
- 2
Marlin/src/HAL/SAMD51/HAL.h View File

@@ -106,8 +106,6 @@ typedef Servo hal_servo_t;
106 106
 // ADC
107 107
 //
108 108
 
109
-#define HAL_ANALOG_SELECT(pin)
110
-
111 109
 //#define HAL_ADC_FILTERED          // Disable Marlin's oversampling. The HAL filters ADC values.
112 110
 #define HAL_ADC_VREF         3.3
113 111
 #define HAL_ADC_RESOLUTION  10      // ... 12

+ 1
- 3
Marlin/src/HAL/STM32/HAL.h View File

@@ -142,8 +142,6 @@ typedef libServo hal_servo_t;
142 142
 // ADC
143 143
 // ------------------------
144 144
 
145
-#define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT)
146
-
147 145
 #ifdef ADC_RESOLUTION
148 146
   #define HAL_ADC_RESOLUTION ADC_RESOLUTION
149 147
 #else
@@ -240,7 +238,7 @@ public:
240 238
   }
241 239
 
242 240
   // Called by Temperature::init for each sensor at startup
243
-  static void adc_enable(const pin_t pin);
241
+  static inline void adc_enable(const pin_t pin) { pinMode(pin, INPUT); }
244 242
 
245 243
   // Begin ADC sampling on the given channel
246 244
   static void adc_start(const pin_t pin) { adc_result = analogRead(pin); }

+ 0
- 2
Marlin/src/HAL/STM32F1/HAL.h View File

@@ -188,8 +188,6 @@ extern uint16_t HAL_adc_result;
188 188
 // ADC
189 189
 // ------------------------
190 190
 
191
-#define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT_ANALOG);
192
-
193 191
 #ifdef ADC_RESOLUTION
194 192
   #define HAL_ADC_RESOLUTION ADC_RESOLUTION
195 193
 #else

+ 0
- 2
Marlin/src/HAL/TEENSY31_32/HAL.h View File

@@ -105,8 +105,6 @@ uint32_t __get_PRIMASK(void); // CMSIS
105 105
 #define HAL_ADC_VREF         3.3
106 106
 #define HAL_ADC_RESOLUTION  10
107 107
 
108
-#define HAL_ANALOG_SELECT(pin)
109
-
110 108
 //
111 109
 // Pin Mapping for M42, M43, M226
112 110
 //

+ 0
- 2
Marlin/src/HAL/TEENSY35_36/HAL.h View File

@@ -110,8 +110,6 @@ typedef int8_t pin_t;
110 110
 #define HAL_ADC_VREF         3.3
111 111
 #define HAL_ADC_RESOLUTION  10
112 112
 
113
-#define HAL_ANALOG_SELECT(pin)
114
-
115 113
 //
116 114
 // Pin Mapping for M42, M43, M226
117 115
 //

+ 0
- 2
Marlin/src/HAL/TEENSY40_41/HAL.h View File

@@ -129,8 +129,6 @@ typedef int8_t pin_t;
129 129
 #define HAL_ADC_RESOLUTION  10
130 130
 #define HAL_ADC_FILTERED      // turn off ADC oversampling
131 131
 
132
-#define HAL_ANALOG_SELECT(pin)
133
-
134 132
 //
135 133
 // Pin Mapping for M42, M43, M226
136 134
 //

Loading…
Cancel
Save