diff options
| author | Manuel Coenen <manuel@duet3d.com> | 2021-01-15 17:52:02 +0300 |
|---|---|---|
| committer | Manuel Coenen <manuel@duet3d.com> | 2021-01-19 13:22:32 +0300 |
| commit | e48e001033e373a8c59cf7892d7a4b8a5a7c9283 (patch) | |
| tree | 478ddabd2e224e73d0b17a822c05d92fe2b0919a /src/Heating | |
| parent | ed1f834bc57412ab58f3a9abb647e13f11e4b809 (diff) | |
Fix all compiler bugs (linker still unhappy)
Diffstat (limited to 'src/Heating')
| -rw-r--r-- | src/Heating/Sensors/LinearAnalogSensor.cpp | 6 | ||||
| -rw-r--r-- | src/Heating/Sensors/Thermistor.cpp | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/Heating/Sensors/LinearAnalogSensor.cpp b/src/Heating/Sensors/LinearAnalogSensor.cpp index 43d23d9d..ee047188 100644 --- a/src/Heating/Sensors/LinearAnalogSensor.cpp +++ b/src/Heating/Sensors/LinearAnalogSensor.cpp @@ -11,9 +11,13 @@ #include "RepRap.h" #include "Platform.h" -#if SAME5x // if using CoreN2G +#if SAME5x || SAME70 // if using CoreN2G # include <AnalogIn.h> +# if SAME5x using AnalogIn::AdcBits; +# elif SAME70 +using LegacyAnalogIn::AdcBits; +# endif #endif // ADC resolution diff --git a/src/Heating/Sensors/Thermistor.cpp b/src/Heating/Sensors/Thermistor.cpp index 709cee0a..4e23458c 100644 --- a/src/Heating/Sensors/Thermistor.cpp +++ b/src/Heating/Sensors/Thermistor.cpp @@ -20,9 +20,13 @@ # include <CanMessageGenericParser.h> #endif -#if SAME5x // if using CoreN2G +#if SAME5x || SAME70 // if using CoreN2G # include <AnalogIn.h> +# if SAME5x using AnalogIn::AdcBits; +# elif SAME70 +using LegacyAnalogIn::AdcBits; +# endif #endif // For the theory behind ADC oversampling, see http://www.atmel.com/Images/doc8003.pdf |