Skip to content

rename getTemperature to getInternalTemp #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cores/arduino/ard_sup/analog/ap3_analog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion cores/arduino/ard_sup/ap3_analog.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: ");
Expand Down