Skip to content

Commit 35dc840

Browse files
author
Owen
authored
Merge pull request #160 from sparkfun/rename-get-temperature
2 parents de4e8f8 + 65d3c5c commit 35dc840

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

cores/arduino/ard_sup/analog/ap3_analog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ uint16_t analogRead(uint8_t pinNumber)
224224
}
225225

226226
//Returns the internal temperature of the Apollo3
227-
float getTemperature()
227+
float getInternalTemp()
228228
{
229229
const float fReferenceVoltage = 2.0;
230230
float fADCTempDegreesC = 0.0;

cores/arduino/ard_sup/ap3_analog.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ap3_err_t ap3_change_channel(ap3_gpio_pad_t padNumber);
4444
bool power_adc_disable();
4545
uint16_t analogRead(uint8_t pinNumber);
4646
ap3_err_t analogReadResolution(uint8_t bits);
47-
float getTemperature();
47+
float getInternalTemp();
4848

4949
ap3_err_t ap3_pwm_output(uint8_t pin, uint32_t th, uint32_t fw, uint32_t clk);
5050
ap3_err_t analogWriteResolution(uint8_t res);

libraries/Examples/examples/Example4_analogRead/Example4_analogRead.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void loop()
5353
Serial.print("V");
5454

5555
Serial.print("\tinternalTemp: ");
56-
Serial.print(getTemperature(), 2);
56+
Serial.print(getInternalTemp(), 2);
5757

5858
int vss = analogRead(ADC_INTERNAL_VSS); //Read internal VSS (should be 0)
5959
Serial.print("\tvss: ");

0 commit comments

Comments
 (0)