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
80a43faf
Commit
80a43faf
authored
6 years ago
by
fxk8y
Browse files
Options
Downloads
Patches
Plain Diff
comply to qthings code style
parent
65ff0453
No related branches found
Branches containing commit
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
+7
-7
7 additions, 7 deletions
main/measured.cpp
main/measured.h
+4
-4
4 additions, 4 deletions
main/measured.h
with
11 additions
and
11 deletions
main/measured.cpp
+
7
−
7
View file @
80a43faf
...
...
@@ -38,7 +38,7 @@ static void measured_wrapper(void *parameter) {
qthing
::
measured
::
Measured
::
Measured
()
{
this
->
backend
=
esp_log_backend
;
this
->
register
B
ackend
(
qthing
::
measured
::
backend
::
mqtt
);
// TODO: move somewhere else!
this
->
register
_b
ackend
(
qthing
::
measured
::
backend
::
mqtt
);
// TODO: move somewhere else!
char
task_name
[
16
];
sprintf
(
task_name
,
"measured[%d]"
,
next_daemon
++
);
// TODO: increment thread-safe!
...
...
@@ -71,7 +71,7 @@ void qthing::measured::Measured::measured() {
}
}
void
qthing
::
measured
::
Measured
::
register
S
ensor
(
std
::
string
name
,
std
::
string
type
,
std
::
string
unit
,
qthing
::
measured
::
sensor_t
sensor
)
{
void
qthing
::
measured
::
Measured
::
register
_s
ensor
(
std
::
string
name
,
std
::
string
type
,
std
::
string
unit
,
qthing
::
measured
::
sensor_t
sensor
)
{
sensor_config_t
cfg
=
{
.
name
=
name
,
.
type
=
type
,
...
...
@@ -83,7 +83,7 @@ void qthing::measured::Measured::registerSensor(std::string name, std::string ty
}
void
qthing
::
measured
::
Measured
::
register
B
ackend
(
qthing
::
measured
::
backend_t
new_backend
)
{
void
qthing
::
measured
::
Measured
::
register
_b
ackend
(
qthing
::
measured
::
backend_t
new_backend
)
{
qthing
::
measured
::
backend_t
old_backend
=
this
->
backend
;
this
->
backend
=
[
old_backend
,
new_backend
](
const
std
::
vector
<
qthing
::
measured
::
sensor_data_t
>&
data
)
{
...
...
@@ -109,14 +109,14 @@ static void start_measured() {
}
}
void
qthing
::
measured
::
register
S
ensor
(
std
::
string
name
,
std
::
string
type
,
std
::
string
unit
,
qthing
::
measured
::
sensor_t
sensor
)
{
void
qthing
::
measured
::
register
_s
ensor
(
std
::
string
name
,
std
::
string
type
,
std
::
string
unit
,
qthing
::
measured
::
sensor_t
sensor
)
{
start_measured
();
md
->
register
S
ensor
(
name
,
type
,
unit
,
sensor
);
md
->
register
_s
ensor
(
name
,
type
,
unit
,
sensor
);
}
void
qthing
::
measured
::
register
B
ackend
(
qthing
::
measured
::
backend_t
new_backend
)
{
void
qthing
::
measured
::
register
_b
ackend
(
qthing
::
measured
::
backend_t
new_backend
)
{
start_measured
();
md
->
register
B
ackend
(
new_backend
);
md
->
register
_b
ackend
(
new_backend
);
}
void
qthing
::
measured
::
set_measure_period
(
uint16_t
period
)
{
...
...
This diff is collapsed.
Click to expand it.
main/measured.h
+
4
−
4
View file @
80a43faf
...
...
@@ -25,8 +25,8 @@ namespace qthing {
typedef
std
::
function
<
float
()
>
sensor_t
;
typedef
std
::
function
<
void
(
const
std
::
vector
<
sensor_data_t
>&
)
>
backend_t
;
void
register
B
ackend
(
backend_t
new_backend
);
void
register
S
ensor
(
std
::
string
name
,
std
::
string
type
,
std
::
string
unit
,
sensor_t
sensor
);
void
register
_b
ackend
(
backend_t
new_backend
);
void
register
_s
ensor
(
std
::
string
name
,
std
::
string
type
,
std
::
string
unit
,
sensor_t
sensor
);
void
set_measure_period
(
uint16_t
period
);
class
Measured
{
...
...
@@ -40,8 +40,8 @@ namespace qthing {
public
:
Measured
();
void
register
B
ackend
(
backend_t
new_backend
);
void
register
S
ensor
(
std
::
string
name
,
std
::
string
type
,
std
::
string
unit
,
sensor_t
sensor
);
void
register
_b
ackend
(
backend_t
new_backend
);
void
register
_s
ensor
(
std
::
string
name
,
std
::
string
type
,
std
::
string
unit
,
sensor_t
sensor
);
void
set_measure_period
(
uint16_t
period
);
private
:
...
...
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