From bc34403d710a3757069bd248da432c35a34e284a Mon Sep 17 00:00:00 2001 From: root Date: Wed, 9 Jun 2021 10:46:14 -0500 Subject: [PATCH] Removed all references to MICROCONTROLLER_VOLTAGE_DISABLE --- ports/atmel-samd/common-hal/microcontroller/Processor.c | 4 ---- ports/atmel-samd/mpconfigport.h | 7 ------- 2 files changed, 11 deletions(-) diff --git a/ports/atmel-samd/common-hal/microcontroller/Processor.c b/ports/atmel-samd/common-hal/microcontroller/Processor.c index 0776ff65b1..e9831c953a 100644 --- a/ports/atmel-samd/common-hal/microcontroller/Processor.c +++ b/ports/atmel-samd/common-hal/microcontroller/Processor.c @@ -279,9 +279,6 @@ float common_hal_mcu_processor_get_temperature(void) { } float common_hal_mcu_processor_get_voltage(void) { - #if MICROCONTROLLER_VOLTAGE_DISABLE - return NAN; - #else struct adc_sync_descriptor adc; static Adc *adc_insts[] = ADC_INSTS; @@ -327,7 +324,6 @@ float common_hal_mcu_processor_get_voltage(void) { adc_sync_deinit(&adc); // Multiply by 4 to compensate for SCALEDIOVCC division by 4. return (reading / 4095.0f) * 4.0f; - #endif } uint32_t common_hal_mcu_processor_get_frequency(void) { diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h index 9025af9153..20f5e2bed0 100644 --- a/ports/atmel-samd/mpconfigport.h +++ b/ports/atmel-samd/mpconfigport.h @@ -73,9 +73,6 @@ #define MICROPY_PY_SYS_PLATFORM "MicroChip SAMD51" #elif defined(SAME54) #define MICROPY_PY_SYS_PLATFORM "MicroChip SAME54" -// #ifndef MICROCONTROLLER_VOLTAGE_DISABLE -// #define MICROCONTROLLER_VOLTAGE_DISABLE (1) -// #endif #endif #define SPI_FLASH_MAX_BAUDRATE 24000000 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED (1) @@ -243,8 +240,4 @@ CIRCUITPY_COMMON_ROOT_POINTERS \ mp_obj_t playing_audio[AUDIO_DMA_CHANNEL_COUNT]; -#ifndef MICROCONTROLLER_VOLTAGE_DISABLE -#define MICROCONTROLLER_VOLTAGE_DISABLE (0) -#endif - #endif // __INCLUDED_MPCONFIGPORT_H