Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Sensor System
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Institut für Informatik
QE Research Group
FORTE
Sensor System
Commits
20ebf25a
Unverified
Commit
20ebf25a
authored
2 years ago
by
Zoe Pfister
Browse files
Options
Downloads
Patches
Plain Diff
fix compilation issues
parent
8b325c3d
No related branches found
No related tags found
4 merge requests
!39
Merge Develop into Main
,
!19
development into master
,
!17
Inital Host, initial Client
,
!10
merge serial comm and sd write into espnow
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
client/client/lib/espnow/src/ESPNow.cpp
+4
-3
4 additions, 3 deletions
client/client/lib/espnow/src/ESPNow.cpp
client/client/lib/espnow/src/ESPNow.hpp
+1
-1
1 addition, 1 deletion
client/client/lib/espnow/src/ESPNow.hpp
client/client/platformio.ini
+0
-3
0 additions, 3 deletions
client/client/platformio.ini
with
5 additions
and
7 deletions
client/client/lib/espnow/src/ESPNow.cpp
+
4
−
3
View file @
20ebf25a
...
...
@@ -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
espt
ime
::
rtc
.
setTime
(
T
ime
::
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
);
...
...
This diff is collapsed.
Click to expand it.
client/client/lib/espnow/src/ESPNow.hpp
+
1
−
1
View file @
20ebf25a
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
client/client/platformio.ini
+
0
−
3
View file @
20ebf25a
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment