1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-27 18:02:17 +03:00

Merge branch 'master' into stdnothrow

This commit is contained in:
Earle F. Philhower, III
2020-08-30 12:39:55 -07:00
committed by GitHub
14 changed files with 121 additions and 65 deletions

View File

@ -127,10 +127,7 @@ class EspClass {
return esp_get_cpu_freq_mhz();
}
#else
uint8_t getCpuFreqMHz() const
{
return esp_get_cpu_freq_mhz();
}
uint8_t getCpuFreqMHz() const;
#endif
uint32_t getFlashChipId();

View File

@ -173,7 +173,7 @@ float Stream::parseFloat(char skipChar) {
boolean isFraction = false;
long value = 0;
int c;
float fraction = 1.0;
float fraction = 1.0f;
c = peekNextDigit();
// ignore non numeric leading characters
@ -190,7 +190,7 @@ float Stream::parseFloat(char skipChar) {
else if(c >= '0' && c <= '9') { // is c a digit?
value = value * 10 + c - '0';
if(isFraction)
fraction *= 0.1;
fraction *= 0.1f;
}
read(); // consume the character we got with peek
c = timedPeek();