Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RIOT
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
Service Desk
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
cm-projects
RIOT
Commits
6698bfd3
Unverified
Commit
6698bfd3
authored
7 years ago
by
Koen Zandberg
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #8595 from bergzand/pr/saul-ppm
SAUL/phydat: parts per million support
parents
74fb26ad
327de914
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
drivers/include/saul.h
+1
-0
1 addition, 0 deletions
drivers/include/saul.h
drivers/saul/saul_str.c
+1
-0
1 addition, 0 deletions
drivers/saul/saul_str.c
sys/phydat/phydat_str.c
+1
-0
1 addition, 0 deletions
sys/phydat/phydat_str.c
with
3 additions
and
0 deletions
drivers/include/saul.h
+
1
−
0
View file @
6698bfd3
...
...
@@ -94,6 +94,7 @@ enum {
SAUL_SENSE_OBJTEMP
=
0x8c
,
/**< sensor: object temperature */
SAUL_SENSE_COUNT
=
0x8d
,
/**< sensor: pulse counter */
SAUL_SENSE_DISTANCE
=
0x8e
,
/**< sensor: distance */
SAUL_SENSE_CO2
=
0x8f
,
/**< sensor: CO2 Gas */
SAUL_CLASS_ANY
=
0xff
/**< any device - wildcard */
/* extend this list as needed... */
};
...
...
This diff is collapsed.
Click to expand it.
drivers/saul/saul_str.c
+
1
−
0
View file @
6698bfd3
...
...
@@ -51,6 +51,7 @@ const char *saul_class_to_str(const uint8_t class_id)
case
SAUL_SENSE_OBJTEMP
:
return
"SENSE_OBJTEMP"
;
case
SAUL_SENSE_COUNT
:
return
"SENSE_PULSE_COUNT"
;
case
SAUL_SENSE_DISTANCE
:
return
"SENSE_DISTANCE"
;
case
SAUL_SENSE_CO2
:
return
"SENSE_CO2"
;
case
SAUL_CLASS_ANY
:
return
"CLASS_ANY"
;
default:
return
"CLASS_UNKNOWN"
;
}
...
...
This diff is collapsed.
Click to expand it.
sys/phydat/phydat_str.c
+
1
−
0
View file @
6698bfd3
...
...
@@ -89,6 +89,7 @@ const char *phydat_unit_to_str(uint8_t unit)
case
UNIT_GS
:
return
"Gs"
;
case
UNIT_BAR
:
return
"Bar"
;
case
UNIT_PA
:
return
"Pa"
;
case
UNIT_PPM
:
return
"ppm"
;
case
UNIT_CD
:
return
"cd"
;
case
UNIT_PERCENT
:
return
"%"
;
default:
return
""
;
...
...
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