OSDN Git Service

thermometer: Change string properties to lower-case
authorAndrzej Kaczmarek <andrzej.kaczmarek@tieto.com>
Tue, 9 Oct 2012 11:19:51 +0000 (13:19 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Tue, 9 Oct 2012 15:56:09 +0000 (17:56 +0200)
doc/thermometer-api.txt
profiles/thermometer/thermometer.c

index a1da2e6..5bbd4bf 100644 (file)
@@ -125,7 +125,7 @@ Methods             void MeasurementReceived(dict measurement)
 
                                string Unit:
 
-                                       Possible values: "Celsius" or "Fahrenheit"
+                                       Possible values: "celsius" or "fahrenheit"
 
                                uint64 Time (optional):
 
@@ -136,10 +136,10 @@ Methods           void MeasurementReceived(dict measurement)
 
                                        Only present if measurement type is known.
 
-                                       Possible values: "Armpit", "Body", "Ear",
-                                               "Finger", "Intestines", "Mouth",
-                                               "Rectum", "Toe", "Tympanum"
+                                       Possible values: "armpit", "body", "ear",
+                                               "finger", "intestines", "mouth",
+                                               "rectum", "toe", "tympanum"
 
                                string Measurement:
 
-                                       Possible values: "Final" or "Intermediate"
+                                       Possible values: "final" or "intermediate"
index 98735d8..c2c7dfe 100644 (file)
@@ -120,15 +120,15 @@ static GSList *thermometer_adapters = NULL;
 
 const char *temp_type[] = {
        "<reserved>",
-       "Armpit",
-       "Body",
-       "Ear",
-       "Finger",
-       "Intestines",
-       "Mouth",
-       "Rectum",
-       "Toe",
-       "Tympanum"
+       "armpit",
+       "body",
+       "ear",
+       "finger",
+       "intestines",
+       "mouth",
+       "rectum",
+       "toe",
+       "tympanum"
 };
 
 static const gchar *temptype2str(uint8_t value)
@@ -1070,7 +1070,7 @@ static void recv_measurement(struct thermometer *t, struct measurement *m)
 
        m->t = t;
 
-       if (g_strcmp0(m->value, "Intermediate") == 0)
+       if (g_strcmp0(m->value, "intermediate") == 0)
                wlist = t->tadapter->iwatchers;
        else
                wlist = t->tadapter->fwatchers;
@@ -1093,9 +1093,9 @@ static void proc_measurement(struct thermometer *t, const uint8_t *pdu,
 
        flags = pdu[3];
        if (flags & TEMP_UNITS)
-               m.unit = "Fahrenheit";
+               m.unit = "fahrenheit";
        else
-               m.unit = "Celsius";
+               m.unit = "celsius";
 
        if (len < 8) {
                DBG("Temperature measurement value is not provided");
@@ -1153,7 +1153,7 @@ static void proc_measurement(struct thermometer *t, const uint8_t *pdu,
                type = NULL;
 
        m.type = type ? g_strdup(type) : NULL;
-       m.value = final ? "Final" : "Intermediate";
+       m.value = final ? "final" : "intermediate";
 
        recv_measurement(t, &m);
        g_free(m.type);