diff --git a/client/client/lib/espnow/src/ESPNow.cpp b/client/client/lib/espnow/src/ESPNow.cpp index 890392ad22e6b2c7a596c12c5d7030085a76bcab..11dafda7be07016e2f8a3ab10f362105eebdf20c 100644 --- a/client/client/lib/espnow/src/ESPNow.cpp +++ b/client/client/lib/espnow/src/ESPNow.cpp @@ -36,7 +36,7 @@ void on_data_recv(const uint8_t *mac, const uint8_t *incomingData, int len) } // host change shouldn't be an issue preferences.end(); // sync time - esptime::rtc.setTime( + Time::getInstance().setTime( new_config.time_millis); // see https://www.esp32.com/viewtopic.php?t=9965, maybe this needs an offset } @@ -54,8 +54,9 @@ esp_err_t espnow_setup() hostInfo.channel = 0; - // TODO: PMK is used to encrypt LMK with the AES-128 algorithm. Call esp_now_set_pmk() to set PMK. If PMK is not set, a - // default PMK will be used. https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/network/esp_now.html + // TODO: PMK is used to encrypt LMK with the AES-128 algorithm. Call esp_now_set_pmk() to set PMK. If PMK is not + // set, a default PMK will be used. + // https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/network/esp_now.html hostInfo.encrypt = false; esp_now_add_peer(&hostInfo); diff --git a/client/client/lib/espnow/src/ESPNow.hpp b/client/client/lib/espnow/src/ESPNow.hpp index 797d1f3aef01bcb7726f0304f85f9c08c34aa333..c28cfe2ba1c2ee181c0950695381aa938000c13b 100644 --- a/client/client/lib/espnow/src/ESPNow.hpp +++ b/client/client/lib/espnow/src/ESPNow.hpp @@ -17,7 +17,7 @@ typedef struct config { } config; esp_err_t espnow_setup(); -esp_err_t espnow_send_message(const Message& message); +//esp_err_t espnow_send_message(const Message& message); bool is_host_defined(); void get_host_mac(uint8_t *destination); void on_data_sent(const uint8_t *mac_addr, esp_now_send_status_t status); diff --git a/client/client/platformio.ini b/client/client/platformio.ini index 435ae69baa774f3494c60228192f3fbfaec44f94..28cc58c3f73df2de36e934c0cb382f9978cf9125 100644 --- a/client/client/platformio.ini +++ b/client/client/platformio.ini @@ -20,9 +20,6 @@ build_flags = -DCORE_DEBUG_LEVEL=5 -std=gnu++17 build_unflags = -std=gnu++11 -; serial port -monitor_port = /dev/ttyUSB1 -upload_port = /dev/ttyUSB1 lib_deps = sparkfun/SparkFun SCD30 Arduino Library@^1.0.18 Wire