Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qthing
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Jens Nolte
qthing
Commits
4131a295
Commit
4131a295
authored
6 years ago
by
fxk8y
Browse files
Options
Downloads
Patches
Plain Diff
prohibit backends from changing our data
parent
1a58692a
No related branches found
No related tags found
2 merge requests
!8
Updating bme280-qthing
,
!5
Measured: A measuring daemon
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
main/measured.cpp
+3
-3
3 additions, 3 deletions
main/measured.cpp
main/measured.h
+2
-2
2 additions, 2 deletions
main/measured.h
with
5 additions
and
5 deletions
main/measured.cpp
+
3
−
3
View file @
4131a295
...
...
@@ -19,7 +19,7 @@ typedef struct {
}
sensor_config_t
;
static
std
::
vector
<
sensor_config_t
>
sensors
;
static
qthing
::
measured
::
backend_t
sens_backend
=
[](
std
::
vector
<
qthing
::
measured
::
sensor_data_t
>&
data
)
{
static
qthing
::
measured
::
backend_t
sens_backend
=
[](
const
std
::
vector
<
qthing
::
measured
::
sensor_data_t
>&
data
)
{
for
(
auto
const
&
d
:
data
)
{
ESP_LOGI
(
"measured"
,
"name=%s type=%s unit=%s value=%f"
,
d
.
name
->
c_str
(),
d
.
type
->
c_str
(),
d
.
unit
->
c_str
(),
d
.
value
);
}
...
...
@@ -77,7 +77,7 @@ void qthing::measured::registerSensor(std::string name, std::string type, std::s
void
qthing
::
measured
::
registerBackend
(
qthing
::
measured
::
backend_t
new_backend
)
{
qthing
::
measured
::
backend_t
old_backend
=
sens_backend
;
sens_backend
=
[
old_backend
,
new_backend
](
std
::
vector
<
qthing
::
measured
::
sensor_data_t
>&
data
)
{
sens_backend
=
[
old_backend
,
new_backend
](
const
std
::
vector
<
qthing
::
measured
::
sensor_data_t
>&
data
)
{
old_backend
(
data
);
new_backend
(
data
);
};
...
...
@@ -85,7 +85,7 @@ void qthing::measured::registerBackend(qthing::measured::backend_t new_backend)
start_measured
();
}
void
qthing
::
measured
::
backend
::
mqtt
(
std
::
vector
<
qthing
::
measured
::
sensor_data_t
>&
data
)
{
void
qthing
::
measured
::
backend
::
mqtt
(
const
std
::
vector
<
qthing
::
measured
::
sensor_data_t
>&
data
)
{
if
(
is_mqtt_connected
())
{
for
(
auto
const
&
d
:
data
)
{
char
message
[
16
];
...
...
This diff is collapsed.
Click to expand it.
main/measured.h
+
2
−
2
View file @
4131a295
...
...
@@ -23,13 +23,13 @@ namespace qthing {
}
sensor_data_t
;
typedef
std
::
function
<
float
()
>
sensor_t
;
typedef
std
::
function
<
void
(
std
::
vector
<
sensor_data_t
>&
)
>
backend_t
;
typedef
std
::
function
<
void
(
const
std
::
vector
<
sensor_data_t
>&
)
>
backend_t
;
void
registerBackend
(
backend_t
new_backend
);
void
registerSensor
(
std
::
string
name
,
std
::
string
type
,
std
::
string
unit
,
sensor_t
sensor
);
namespace
backend
{
void
mqtt
(
std
::
vector
<
qthing
::
measured
::
sensor_data_t
>&
data
);
void
mqtt
(
const
std
::
vector
<
qthing
::
measured
::
sensor_data_t
>&
data
);
}
}
}
\ No newline at end of file
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