Skip to content
Snippets Groups Projects
Unverified Commit 20ebf25a authored by Zoe Pfister's avatar Zoe Pfister :speech_balloon:
Browse files

fix compilation issues

parent 8b325c3d
No related branches found
No related tags found
4 merge requests!39Merge Develop into Main,!19development into master,!17Inital Host, initial Client,!10merge serial comm and sd write into espnow
......@@ -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);
......
......@@ -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);
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment