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
30e6eb2e
Verified
Commit
30e6eb2e
authored
2 years ago
by
Zoe Michaela Dietmar Pfister
Browse files
Options
Downloads
Patches
Plain Diff
Fix build of client satellite
parent
33e0483b
No related branches found
No related tags found
2 merge requests
!39
Merge Develop into Main
,
!30
Renamed Sentec Sensors, made RS485 serial connection a singleton shared...
Pipeline
#102072
passed
2 years ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
client/client_satellite/src/main.cpp
+5
-5
5 additions, 5 deletions
client/client_satellite/src/main.cpp
with
5 additions
and
5 deletions
client/client_satellite/src/main.cpp
+
5
−
5
View file @
30e6eb2e
...
...
@@ -37,7 +37,7 @@ LC709203F battery_monitor;
#define POWER_SWITCH_PIN_12V 12
#define POWER_SWITCH_PIN_5V 13
Forte
_
RS485
rs485
;
ForteRS485
rs485
;
SEM404
rainGaugeSensor
{
2
,
RE_DE_PIN
};
ForteDR26
dr26_channel0
;
...
...
@@ -87,9 +87,9 @@ void setup() {
// auto messages2 = dr26_channel2.buildMessages();
// auto messages3 = dr26_channel3.buildMessages();
// auto messages4 = battery_monitor.buildMessages();
Forte
_
RS485
::
powerOnRS485Sensors
();
ForteRS485
::
powerOnRS485Sensors
();
auto
soilMessage
=
rainGaugeSensor
.
buildMessages
();
Forte
_
RS485
::
powerOffRS485Sensors
();
ForteRS485
::
powerOffRS485Sensors
();
// roughly takes 500ms, ~120ms for each adc channel, barely anything for battery monitor
ESP_LOGD
(
TAG
,
"Reading data and building messages took %ld ms"
,
millis
()
-
ts
);
gpio_set_level
(
GPIO_NUM_32
,
0
);
...
...
@@ -105,7 +105,7 @@ void setup() {
ESP_LOGD
(
TAG
,
"EPSNow setup took %ld ms"
,
millis
()
-
ts
);
if
(
messages
.
back
().
getClientDataPackage
().
getMeasurementData
().
getValue
()
>
20
)
{
Forte
_
RS485
::
powerOnRS485Sensors
();
ForteRS485
::
powerOnRS485Sensors
();
if
(
rainGaugeSensor
.
resetPrecipitation
()
==
ErrorType
::
SEM404_COULD_NOT_RESET_PRECIPITATION
)
{
ESP_LOGE
(
TAG
,
"Could not reset precipitation"
);
auto
precipitationErrorMessage
=
Message
(
...
...
@@ -117,7 +117,7 @@ void setup() {
Message
::
nullMessage
(),
Message
::
nullMessage
()};
Message
::
sendMessages
(
messages_error
);
}
Forte
_
RS485
::
powerOffRS485Sensors
();
ForteRS485
::
powerOffRS485Sensors
();
}
ts
=
millis
();
...
...
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