3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-28 14:24:34 +00:00
Code Issues Releases Wiki Activity

🐛 Fix missing ADC method

Browse Source
This commit is contained in:
Scott Lahteine 2021-12-25 21:25:47 -06:00
parent d7af619936
commit 57315f02cb
11 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/HAL/DUE/HAL.h
View File

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

3
Marlin/src/HAL/ESP32/HAL.h
View File

@ -85,9 +85,6 @@ void noTone(const pin_t _pin);
void analogWrite(pin_t pin, int value); void analogWrite(pin_t pin, int value);
// ADC
#define HAL_ANALOG_SELECT(pin)
// //
// Pin Mapping for M42, M43, M226 // Pin Mapping for M42, M43, M226
// //

1
Marlin/src/HAL/LINUX/HAL.h
View File

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

2
Marlin/src/HAL/LPC1768/HAL.h
View File

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

1
Marlin/src/HAL/NATIVE_SIM/HAL.h
View File

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

2
Marlin/src/HAL/SAMD51/HAL.h
View File

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

4
Marlin/src/HAL/STM32/HAL.h
View File

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

2
Marlin/src/HAL/STM32F1/HAL.h
View File

@ -188,8 +188,6 @@ extern uint16_t HAL_adc_result;
// ADC // ADC
// ------------------------ // ------------------------
#define HAL_ANALOG_SELECT(pin) pinMode(pin, INPUT_ANALOG);
#ifdef ADC_RESOLUTION #ifdef ADC_RESOLUTION
#define HAL_ADC_RESOLUTION ADC_RESOLUTION #define HAL_ADC_RESOLUTION ADC_RESOLUTION
#else #else

2
Marlin/src/HAL/TEENSY31_32/HAL.h
View File

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

2
Marlin/src/HAL/TEENSY35_36/HAL.h
View File

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

2
Marlin/src/HAL/TEENSY40_41/HAL.h
View File

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