Skip to content

Commit c6e7e3b

Browse files
committed
Changes needed due to ESP_IDF update fixes #305
1 parent 9ab7c9e commit c6e7e3b

4 files changed

Lines changed: 4 additions & 3 deletions

File tree

platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ lib_deps =
5555
adafruit/Adafruit BMP280 Library@^2.6.2
5656
pololu/VL53L0X@^1.3.1
5757
; https://github.com/fhessel/esp32_https_server
58-
https://github.com/fhessel/esp32_https_server.git#feature/subjectAltName
58+
https://github.com/amandel/esp32_https_server.git#hotfix/openbikesensor
5959
; esp32_https_server@
6060
build_flags =
6161
-DCORE_DEBUG_LEVEL=3

src/VoltageMeter.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class VoltageMeter {
3131
public:
3232
explicit VoltageMeter(
3333
uint8_t batteryPin = 34,
34-
adc1_channel_t channel = ADC1_GPIO34_CHANNEL);
34+
adc1_channel_t channel = ADC1_CHANNEL_6);
3535
/* Returns the (smoothed) value in Volts. */
3636
double read();
3737
int8_t readPercentage();

src/configServer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1031,7 +1031,7 @@ static void handleAbout(HTTPRequest *req, HTTPResponse * res) {
10311031

10321032
page += "<h3>Display / Button</h3>";
10331033
page += keyValue("Button State", digitalRead(PUSHBUTTON_PIN));
1034-
page += keyValue("Display i2c last error", Wire.lastError());
1034+
page += keyValue("Display i2c last error", Wire.getWriteError());
10351035
page += keyValue("Display i2c speed", Wire.getClock() / 1000, "KHz");
10361036
page += keyValue("Display i2c timeout", Wire.getTimeOut(), "ms");
10371037

src/utils/streams.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <Stream.h>
2828
#include <vector>
2929
#include <FS.h>
30+
#include <functional>
3031

3132

3233
class StringStream : public Stream {

0 commit comments

Comments
 (0)