RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #8586 from gebart/pr/phydat-prefix

Browse Source 
sys/phydat: rename phydat_scale_to_str -> phydat_prefix_from_scale
This commit is contained in:
Joakim Nohlgård 2018-02-27 06:59:55 +01:00 committed by GitHub
commit 74fb26ad58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/include/phydat.h
View File

@ -36,7 +36,6 @@
#define PHYDAT_H
#include <stdint.h>
#include <errno.h>
#ifdef __cplusplus
extern "C" {
@ -157,15 +156,17 @@ void phydat_dump(phydat_t *data, uint8_t dim);
const char *phydat_unit_to_str(uint8_t unit);
/**
* @brief Convert the given scale factor to a NULL terminated string
* @brief Convert the given scale factor to an SI prefix
*
* The given scaling factor will be given as SI unit (e.g. M for Mega, u for
* micro, etc) for obvious cases or in scientific notation (e.g. 2E11, 1E-22,
* etc) otherwise.
* The given scaling factor is returned as a SI unit prefix (e.g. M for Mega, u
* for micro, etc), or `\0` otherwise.
*
* @param[in] scale scale factor to convert
*
* @return SI prefix if applicable
* @return `\0` if no SI prefix was found
*/
char phydat_scale_to_str(int8_t scale);
char phydat_prefix_from_scale(int8_t scale);
#ifdef __cplusplus
}

12
sys/phydat/phydat_str.c
View File

@ -32,7 +32,7 @@ void phydat_dump(phydat_t *data, uint8_t dim)
}
printf("Data:");
for (uint8_t i = 0; i < dim; i++) {
char scale_str;
char scale_prefix;
switch (data->unit) {
case UNIT_UNDEF:
@ -43,16 +43,16 @@ void phydat_dump(phydat_t *data, uint8_t dim)
case UNIT_TEMP_C:
case UNIT_TEMP_F:
/* no string conversion */
scale_str = '\0';
scale_prefix = '\0';
break;
default:
scale_str = phydat_scale_to_str(data->scale);
scale_prefix = phydat_prefix_from_scale(data->scale);
}
printf("\t[%i] ", (int)i);
if (scale_str) {
printf("%i%c", (int)data->val[i], scale_str);
if (scale_prefix) {
printf("%i%c", (int)data->val[i], scale_prefix);
}
else if (data->scale == 0) {
printf("%i", (int)data->val[i]);
@ -95,7 +95,7 @@ const char *phydat_unit_to_str(uint8_t unit)
}
}
char phydat_scale_to_str(int8_t scale)
char phydat_prefix_from_scale(int8_t scale)
{
switch (scale) {
case -3: return 'm';