From 65d3c5c28764b99031b78fd0235e76cd21272656 Mon Sep 17 00:00:00 2001 From: oclyke Date: Tue, 5 May 2020 14:59:23 -0600 Subject: [PATCH] rename getTemperature to getInternalTemp --- cores/arduino/ard_sup/analog/ap3_analog.cpp | 2 +- cores/arduino/ard_sup/ap3_analog.h | 2 +- .../examples/Example4_analogRead/Example4_analogRead.ino | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cores/arduino/ard_sup/analog/ap3_analog.cpp b/cores/arduino/ard_sup/analog/ap3_analog.cpp index cbb83ce..636116c 100644 --- a/cores/arduino/ard_sup/analog/ap3_analog.cpp +++ b/cores/arduino/ard_sup/analog/ap3_analog.cpp @@ -224,7 +224,7 @@ uint16_t analogRead(uint8_t pinNumber) } //Returns the internal temperature of the Apollo3 -float getTemperature() +float getInternalTemp() { const float fReferenceVoltage = 2.0; float fADCTempDegreesC = 0.0; diff --git a/cores/arduino/ard_sup/ap3_analog.h b/cores/arduino/ard_sup/ap3_analog.h index f46ed2a..c66a848 100644 --- a/cores/arduino/ard_sup/ap3_analog.h +++ b/cores/arduino/ard_sup/ap3_analog.h @@ -44,7 +44,7 @@ ap3_err_t ap3_change_channel(ap3_gpio_pad_t padNumber); bool power_adc_disable(); uint16_t analogRead(uint8_t pinNumber); ap3_err_t analogReadResolution(uint8_t bits); -float getTemperature(); +float getInternalTemp(); ap3_err_t ap3_pwm_output(uint8_t pin, uint32_t th, uint32_t fw, uint32_t clk); ap3_err_t analogWriteResolution(uint8_t res); diff --git a/libraries/Examples/examples/Example4_analogRead/Example4_analogRead.ino b/libraries/Examples/examples/Example4_analogRead/Example4_analogRead.ino index 8c4fdf2..82c2b7d 100644 --- a/libraries/Examples/examples/Example4_analogRead/Example4_analogRead.ino +++ b/libraries/Examples/examples/Example4_analogRead/Example4_analogRead.ino @@ -53,7 +53,7 @@ void loop() Serial.print("V"); Serial.print("\tinternalTemp: "); - Serial.print(getTemperature(), 2); + Serial.print(getInternalTemp(), 2); int vss = analogRead(ADC_INTERNAL_VSS); //Read internal VSS (should be 0) Serial.print("\tvss: ");