Merge pull request #10334 from maribu/saul_rssi

{drivers/saul,sys/phydat}: Added RSSI sensor and dBm unit
RIOT-OS · Nov 12, 2018 · 1f7ec9b · 1f7ec9b
2 parents 00b6e46 + 3cc6c7f
commit 1f7ec9b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/drivers/include/saul.h b/drivers/include/saul.h
@@ -98,6 +98,7 @@ enum {
     SAUL_SENSE_TVOC     = 0x90,     /**< sensor: TVOC Gas */
     SAUL_SENSE_OCCUP    = 0x91,     /**< sensor: occupancy */
     SAUL_SENSE_PROXIMITY= 0x92,     /**< sensor: proximity */
+    SAUL_SENSE_RSSI     = 0x93,     /**< sensor: RSSI */
     SAUL_CLASS_ANY      = 0xff      /**< any device - wildcard */
     /* extend this list as needed... */
 };

diff --git a/drivers/saul/saul_str.c b/drivers/saul/saul_str.c
@@ -54,6 +54,7 @@ const char *saul_class_to_str(const uint8_t class_id)
         case SAUL_SENSE_CO2:       return "SENSE_CO2";
         case SAUL_SENSE_TVOC:      return "SENSE_TVOC";
         case SAUL_SENSE_PROXIMITY: return "SENSE_PROXIMITY";
+        case SAUL_SENSE_RSSI:      return "SENSE_RSSI";
         case SAUL_CLASS_ANY:       return "CLASS_ANY";
         case SAUL_SENSE_OCCUP:     return "SENSE_OCCUP";
         default:                   return "CLASS_UNKNOWN";

diff --git a/sys/include/phydat.h b/sys/include/phydat.h
@@ -94,6 +94,7 @@ enum {
     UNIT_A,         /**< Ampere */
     UNIT_V,         /**< Volts */
     UNIT_GS,        /**< gauss */
+    UNIT_DBM,       /**< decibel-milliwatts */
     /* pressure */
     UNIT_BAR,       /**< Beer? */
     UNIT_PA,        /**< Pascal */

diff --git a/sys/phydat/phydat_str.c b/sys/phydat/phydat_str.c
@@ -42,6 +42,7 @@ void phydat_dump(phydat_t *data, uint8_t dim)
             case UNIT_PERCENT:
             case UNIT_TEMP_C:
             case UNIT_TEMP_F:
+            case UNIT_DBM:
                 /* no string conversion */
                 scale_prefix = '\0';
                 break;
@@ -91,6 +92,7 @@ const char *phydat_unit_to_str(uint8_t unit)
         case UNIT_GR:       return "G";
         case UNIT_A:        return "A";
         case UNIT_V:        return "V";
+        case UNIT_DBM:      return "dBm";
         case UNIT_GS:       return "Gs";
         case UNIT_BAR:      return "Bar";
         case UNIT_PA:       return "Pa";