Vincent Wochnik / Mbed 2 deprecated MbedSmartRestMain

SmartREST client reference implementation for the u-blox C027 mbed compatible device.

Dependencies:   C027 C027_Support mbed mbed-rtos MbedSmartRest LM75B MMA7660 C12832

Fork of MbedSmartRestTest by Vincent Wochnik

program.cpp@13:4045b6ac448d, 2014-02-16 (annotated)

Committer:
vwochnik
Date:
Sun Feb 16 17:44:15 2014 +0000
Revision:
13:4045b6ac448d
Parent:
12:beb64aa0da86
Child:
15:0ccf0f530a05
fix

Who changed what in which revision?

UserRevisionLine numberNew contents of line
vwochnik 6:642e7c233e83 1 #include "common.h"
vwochnik 12:beb64aa0da86 2 #include "io.h"
vwochnik 6:642e7c233e83 3 #include "StaticData.h"
vwochnik 6:642e7c233e83 4 #include "ComposedRecord.h"
vwochnik 6:642e7c233e83 5 #include "CharValue.h"
vwochnik 6:642e7c233e83 6 #include "IntegerValue.h"
vwochnik 6:642e7c233e83 7 #include "FloatValue.h"
vwochnik 13:4045b6ac448d 8 #include "Aggregator.h"
vwochnik 6:642e7c233e83 9
vwochnik 8:940c782eec5e 10 long existing();
vwochnik 8:940c782eec5e 11 long create();
vwochnik 8:940c782eec5e 12 bool identify(long deviceId);
vwochnik 8:940c782eec5e 13 bool update(long deviceId);
vwochnik 8:940c782eec5e 14 void loop(long deviceId);
vwochnik 13:4045b6ac448d 15 void signalMeasurement(long deviceId, Aggregator& aggr);
vwochnik 13:4045b6ac448d 16 void temperatureMeasurement(long deviceId, Aggregator& aggr);
vwochnik 13:4045b6ac448d 17 void countMeasurement(long deviceId, Aggregator& aggr);
vwochnik 13:4045b6ac448d 18 void motionMeasurement(long deviceId, Aggregator& aggr);
vwochnik 8:940c782eec5e 19
vwochnik 6:642e7c233e83 20 StaticData srtpl(
vwochnik 6:642e7c233e83 21 // get device by identity
vwochnik 6:642e7c233e83 22 // Usage: 100,<SERIAL/NR>
vwochnik 6:642e7c233e83 23 "10,100,GET,/identity/externalIds/c8y_Serial/%%,,application/vnd.com.nsn.cumulocity.externalId+json,%%,STRING,\r\n"
vwochnik 6:642e7c233e83 24 // get device id from identity
vwochnik 6:642e7c233e83 25 // Response: 200,<DEVICE/ID>
vwochnik 6:642e7c233e83 26 "11,200,\"$.managedObject\",,\"$.id\"\r\n"
vwochnik 6:642e7c233e83 27 // Create device
vwochnik 6:642e7c233e83 28 // Usage: 101,<SERIAL/NR>
vwochnik 13:4045b6ac448d 29 "10,101,POST,/inventory/managedObjects,application/vnd.com.nsn.cumulocity.managedObject+json,application/vnd.com.nsn.cumulocity.managedObject+json,%%,STRING,\"{\"\"name\"\":\"\"Mbed Test Device\"\",\"\"type\"\":\"\"com_ublox_C027_REV-A\"\",\"\"c8y_Hardware\"\":{\"\"revision\"\":\"\"1\"\",\"\"model\"\":\"\"Ublox C027\"\",\"\"serialNumber\"\":\"\"%%\"\"},\"\"c8y_SupportedMeasurements\"\":[\"\"c8y_SignalStrength\"\",\"\"c8y_TemperatureMeasurement\"\",\"\"c8y_CountMeasurement\"\",\"\"c8y_MotionMeasurement\"\"],\"\"c8y_RequiredAvailability\"\":{ \"\"responseInterval\"\":15},\"\"c8y_IsDevice\"\":{}}\"\r\n"
vwochnik 6:642e7c233e83 30 // Get device id
vwochnik 6:642e7c233e83 31 // Response: 201,<DEVICE/ID>
vwochnik 6:642e7c233e83 32 "11,201,,\"$.c8y_IsDevice\",\"$.id\"\r\n"
vwochnik 6:642e7c233e83 33 // Insert global ID
vwochnik 6:642e7c233e83 34 // Usage: 102,<DEVICE/ID>,<SERIAL/NR>
vwochnik 6:642e7c233e83 35 "10,102,POST,/identity/globalIds/%%/externalIds,application/vnd.com.nsn.cumulocity.externalId+json,application/vnd.com.nsn.cumulocity.externalId+json,%%,UNSIGNED STRING,\"{\"\"type\"\":\"\"c8y_Serial\"\",\"\"externalId\"\":\"\"%%\"\"}\"\r\n"
vwochnik 7:f77afd49c35d 36 // Update IMEI, CellId and iccid
vwochnik 7:f77afd49c35d 37 // Usage: 103,<DEVICE/ID>,<IMEI>,<CELL/ID>,<ICCID>
vwochnik 7:f77afd49c35d 38 "10,103,PUT,/inventory/managedObjects/%%,application/vnd.com.nsn.cumulocity.managedObject+json,application/vnd.com.nsn.cumulocity.managedObject+json,%%,UNSIGNED STRING STRING STRING,\"{\"\"c8y_Mobile\"\":{\"\"imei\"\":\"\"%%\"\",\"\"cellId\"\":\"\"%%\"\",\"\"iccid\"\":\"\"%%\"\"}}\"\r\n"
vwochnik 6:642e7c233e83 39 // Insert measurement
vwochnik 7:f77afd49c35d 40 // USAGE: 104,<DEVICE/ID>,<RSSI>,<BER>
vwochnik 7:f77afd49c35d 41 "10,104,POST,/measurement/measurements,application/vnd.com.nsn.cumulocity.measurement+json,application/vnd.com.nsn.cumulocity.measurement+json,%%,NOW UNSIGNED NUMBER UNSIGNED,\"{\"\"time\"\":\"\"%%\"\",\"\"source\"\":{\"\"id\"\":\"\"%%\"\"},\"\"type\"\":\"\"c8y_SignalStrength\"\",\"\"c8y_SignalStrength\"\":{\"\"rssi\"\":{\"\"value\"\":%%,\"\"unit\"\":\"\"dBm\"\"},\"\"ber\"\":{\"\"value\"\":%%,\"\"unit\"\":\"\"%\"\"}}}\"\r\n"
vwochnik 13:4045b6ac448d 42 // Insert measurement
vwochnik 13:4045b6ac448d 43 // USAGE: 105,<DEVICE/ID>,<TEMPERATURE>
vwochnik 13:4045b6ac448d 44 "10,105,POST,/measurement/measurements,application/vnd.com.nsn.cumulocity.measurement+json,application/vnd.com.nsn.cumulocity.measurement+json,%%,NOW UNSIGNED NUMBER,\"{\"\"time\"\":\"\"%%\"\",\"\"source\"\":{\"\"id\"\":\"\"%%\"\"},\"\"type\"\":\"\"c8y_TemperatureMeasurement\"\",\"\"c8y_TemperatureMeasurement\"\":{\"\"T\"\":{\"\"value\"\":%%,\"\"unit\"\":\"\"C\"\"}}}\"\r\n"
vwochnik 13:4045b6ac448d 45 // Insert measurement
vwochnik 13:4045b6ac448d 46 // USAGE: 105,<DEVICE/ID>,<COUNTER>
vwochnik 13:4045b6ac448d 47 "10,106,POST,/measurement/measurements,application/vnd.com.nsn.cumulocity.measurement+json,application/vnd.com.nsn.cumulocity.measurement+json,%%,NOW UNSIGNED UNSIGNED,\"{\"\"time\"\":\"\"%%\"\",\"\"source\"\":{\"\"id\"\":\"\"%%\"\"},\"\"type\"\":\"\"c8y_CountMeasurement\"\",\"c8y_CountMeasurement\":{\"n\":{\"value\":%%,\"unit\":\"\"}}}\"\r\n"
vwochnik 13:4045b6ac448d 48 // Insert measurement
vwochnik 13:4045b6ac448d 49 // USAGE: 105,<DEVICE/ID>,<X>,<Y>,<Z>
vwochnik 13:4045b6ac448d 50 "10,107,POST,/measurement/measurements,application/vnd.com.nsn.cumulocity.measurement+json,application/vnd.com.nsn.cumulocity.measurement+json,%%,NOW UNSIGNED NUMBER NUMBER NUMBER,\"{\"\"time\"\":\"\"%%\"\",\"\"source\"\":{\"\"id\"\":\"\"%%\"\"},\"\"type\"\":\"\"c8y_MotionMeasurement\"\",\"\"c8y_MotionMeasurement\"\":{\"\"x\"\":{\"\"value\"\":%%,\"\"unit\"\":\"\"m^2/s\"\"},\"\"y\"\":{\"\"value\"\":%%,\"\"unit\"\":\"\"m^2/s\"\"},\"\"z\"\":{\"\"value\"\":%%,\"\"unit\"\":\"\"m^2/s\"\"}}}\"\r\n"
vwochnik 6:642e7c233e83 51 );
vwochnik 6:642e7c233e83 52
vwochnik 8:940c782eec5e 53 float interval = 120.0; // send measurements every two minutes
vwochnik 13:4045b6ac448d 54 MbedSmartRest client("http://developer.cumulocity.com/s", "vaillant/admin", "klanpi", "com_u-blox_C027_REV-A_0.8");
vwochnik 6:642e7c233e83 55
vwochnik 6:642e7c233e83 56 int program(void)
vwochnik 6:642e7c233e83 57 {
vwochnik 8:940c782eec5e 58 long deviceId; Timer timer;
vwochnik 8:940c782eec5e 59
vwochnik 6:642e7c233e83 60 puts("Hello!");
vwochnik 6:642e7c233e83 61
vwochnik 6:642e7c233e83 62 puts("Bootstrapping");
vwochnik 6:642e7c233e83 63 if (client.bootstrap(srtpl) != SMARTREST_SUCCESS) {
vwochnik 6:642e7c233e83 64 puts("Bootstrapping failed.");
vwochnik 6:642e7c233e83 65 return 2;
vwochnik 6:642e7c233e83 66 }
vwochnik 6:642e7c233e83 67
vwochnik 6:642e7c233e83 68 puts("Starting action...");
vwochnik 6:642e7c233e83 69
vwochnik 6:642e7c233e83 70 if ((deviceId = existing()) == 0) {
vwochnik 6:642e7c233e83 71 deviceId = create();
vwochnik 7:f77afd49c35d 72 if (deviceId == 0)
vwochnik 7:f77afd49c35d 73 return 1;
vwochnik 7:f77afd49c35d 74 if (!identify(deviceId))
vwochnik 7:f77afd49c35d 75 return 2;
vwochnik 6:642e7c233e83 76 }
vwochnik 7:f77afd49c35d 77 if (!update(deviceId))
vwochnik 7:f77afd49c35d 78 return 3;
vwochnik 6:642e7c233e83 79
vwochnik 6:642e7c233e83 80 printf("Device ID: %ld\r\n", deviceId);
vwochnik 8:940c782eec5e 81
vwochnik 8:940c782eec5e 82 timer.start();
vwochnik 7:f77afd49c35d 83 while (true) {
vwochnik 8:940c782eec5e 84 timer.reset();
vwochnik 8:940c782eec5e 85 loop(deviceId);
vwochnik 8:940c782eec5e 86
vwochnik 8:940c782eec5e 87 // block remaining number of seconds
vwochnik 8:940c782eec5e 88 while (timer.read() < interval);
vwochnik 6:642e7c233e83 89 }
vwochnik 6:642e7c233e83 90 }
vwochnik 6:642e7c233e83 91
vwochnik 6:642e7c233e83 92 long existing()
vwochnik 6:642e7c233e83 93 {
vwochnik 6:642e7c233e83 94 ComposedRecord newMoRec(true); // set copy=true b/c tmp objects
vwochnik 6:642e7c233e83 95 ParsedRecord received;
vwochnik 6:642e7c233e83 96
vwochnik 6:642e7c233e83 97 puts("Checking for device existance...");
vwochnik 6:642e7c233e83 98
vwochnik 12:beb64aa0da86 99 newMoRec.add(IntegerValue(100)).add(CharValue(imei()));
vwochnik 6:642e7c233e83 100
vwochnik 6:642e7c233e83 101 if (client.send(newMoRec) != SMARTREST_SUCCESS) {
vwochnik 6:642e7c233e83 102 puts("Send failed.");
vwochnik 10:d5cd4a7ada7b 103 client.stop();
vwochnik 6:642e7c233e83 104 return 0;
vwochnik 6:642e7c233e83 105 }
vwochnik 6:642e7c233e83 106
vwochnik 6:642e7c233e83 107 if (client.receive(received) != SMARTREST_SUCCESS) {
vwochnik 6:642e7c233e83 108 puts("No device found.");
vwochnik 10:d5cd4a7ada7b 109 client.stop();
vwochnik 6:642e7c233e83 110 return 0;
vwochnik 6:642e7c233e83 111 }
vwochnik 6:642e7c233e83 112
vwochnik 6:642e7c233e83 113 if (received.values() == 0) {
vwochnik 6:642e7c233e83 114 puts("Received no values.");
vwochnik 10:d5cd4a7ada7b 115 client.stop();
vwochnik 6:642e7c233e83 116 return 0;
vwochnik 6:642e7c233e83 117 }
vwochnik 10:d5cd4a7ada7b 118
vwochnik 6:642e7c233e83 119 if (received.value(0).integerValue() == 50) {
vwochnik 6:642e7c233e83 120 client.stop();
vwochnik 6:642e7c233e83 121 return 0;
vwochnik 6:642e7c233e83 122 }
vwochnik 6:642e7c233e83 123
vwochnik 6:642e7c233e83 124 if (received.value(0).integerValue() != 200) {
vwochnik 6:642e7c233e83 125 puts("Bad response.");
vwochnik 10:d5cd4a7ada7b 126 client.stop();
vwochnik 6:642e7c233e83 127 return 0;
vwochnik 6:642e7c233e83 128 }
vwochnik 6:642e7c233e83 129
vwochnik 6:642e7c233e83 130 client.stop();
vwochnik 6:642e7c233e83 131 return received.value(2).integerValue();
vwochnik 6:642e7c233e83 132 }
vwochnik 6:642e7c233e83 133
vwochnik 6:642e7c233e83 134 long create()
vwochnik 6:642e7c233e83 135 {
vwochnik 6:642e7c233e83 136 ComposedRecord newMoRec(true); // set copy=true b/c tmp objects
vwochnik 6:642e7c233e83 137 ParsedRecord received;
vwochnik 6:642e7c233e83 138
vwochnik 6:642e7c233e83 139 puts("Creating device...");
vwochnik 6:642e7c233e83 140
vwochnik 12:beb64aa0da86 141 newMoRec.add(IntegerValue(101)).add(CharValue(imei()));
vwochnik 6:642e7c233e83 142
vwochnik 6:642e7c233e83 143 if (client.send(newMoRec) != SMARTREST_SUCCESS) {
vwochnik 6:642e7c233e83 144 puts("Send failed.");
vwochnik 10:d5cd4a7ada7b 145 client.stop();
vwochnik 6:642e7c233e83 146 return 0;
vwochnik 6:642e7c233e83 147 }
vwochnik 6:642e7c233e83 148
vwochnik 6:642e7c233e83 149 if (client.receive(received) != SMARTREST_SUCCESS) {
vwochnik 6:642e7c233e83 150 puts("No device found.");
vwochnik 10:d5cd4a7ada7b 151 client.stop();
vwochnik 6:642e7c233e83 152 return 0;
vwochnik 6:642e7c233e83 153 }
vwochnik 6:642e7c233e83 154
vwochnik 6:642e7c233e83 155 if (received.values() != 3) {
vwochnik 6:642e7c233e83 156 puts("Bad received data.");
vwochnik 10:d5cd4a7ada7b 157 client.stop();
vwochnik 6:642e7c233e83 158 return 0;
vwochnik 6:642e7c233e83 159 }
vwochnik 6:642e7c233e83 160
vwochnik 6:642e7c233e83 161 if (received.value(0).integerValue() != 201) {
vwochnik 6:642e7c233e83 162 puts("Bad received data.");
vwochnik 10:d5cd4a7ada7b 163 client.stop();
vwochnik 6:642e7c233e83 164 return 0;
vwochnik 6:642e7c233e83 165 }
vwochnik 6:642e7c233e83 166
vwochnik 6:642e7c233e83 167 client.stop();
vwochnik 6:642e7c233e83 168 return received.value(2).integerValue();
vwochnik 6:642e7c233e83 169 }
vwochnik 6:642e7c233e83 170
vwochnik 6:642e7c233e83 171 bool identify(long deviceId)
vwochnik 6:642e7c233e83 172 {
vwochnik 6:642e7c233e83 173 ComposedRecord newMoRec(true); // set copy=true b/c tmp objects
vwochnik 6:642e7c233e83 174 ParsedRecord received;
vwochnik 6:642e7c233e83 175
vwochnik 6:642e7c233e83 176 puts("Adding global identifier...");
vwochnik 6:642e7c233e83 177
vwochnik 12:beb64aa0da86 178 newMoRec.add(IntegerValue(102)).add(IntegerValue(deviceId)).add(CharValue(imei()));
vwochnik 6:642e7c233e83 179
vwochnik 6:642e7c233e83 180 if (client.send(newMoRec) != SMARTREST_SUCCESS) {
vwochnik 6:642e7c233e83 181 puts("Sending failed.");
vwochnik 10:d5cd4a7ada7b 182 client.stop();
vwochnik 6:642e7c233e83 183 return false;
vwochnik 6:642e7c233e83 184 }
vwochnik 6:642e7c233e83 185
vwochnik 6:642e7c233e83 186 if (client.receive(received) != SMARTREST_SUCCESS) {
vwochnik 6:642e7c233e83 187 puts("Failed.");
vwochnik 10:d5cd4a7ada7b 188 client.stop();
vwochnik 6:642e7c233e83 189 return false;
vwochnik 6:642e7c233e83 190 }
vwochnik 6:642e7c233e83 191
vwochnik 6:642e7c233e83 192 if (received.values() != 3) {
vwochnik 6:642e7c233e83 193 puts("Received bad data.");
vwochnik 10:d5cd4a7ada7b 194 client.stop();
vwochnik 6:642e7c233e83 195 return false;
vwochnik 6:642e7c233e83 196 }
vwochnik 6:642e7c233e83 197
vwochnik 6:642e7c233e83 198 if (received.value(0).integerValue() != 200) {
vwochnik 6:642e7c233e83 199 puts("Received bad data.");
vwochnik 10:d5cd4a7ada7b 200 client.stop();
vwochnik 6:642e7c233e83 201 return false;
vwochnik 6:642e7c233e83 202 }
vwochnik 6:642e7c233e83 203
vwochnik 6:642e7c233e83 204 client.stop();
vwochnik 6:642e7c233e83 205 return true;
vwochnik 6:642e7c233e83 206 }
vwochnik 6:642e7c233e83 207
vwochnik 7:f77afd49c35d 208 bool update(long deviceId)
vwochnik 7:f77afd49c35d 209 {
vwochnik 7:f77afd49c35d 210 ComposedRecord newMoRec(true); // set copy=true b/c tmp objects
vwochnik 7:f77afd49c35d 211 ParsedRecord received;
vwochnik 7:f77afd49c35d 212
vwochnik 7:f77afd49c35d 213 puts("Updating device data...");
vwochnik 7:f77afd49c35d 214
vwochnik 7:f77afd49c35d 215 newMoRec.add(IntegerValue(103)).add(IntegerValue(deviceId)).add(CharValue(imei())).add(CharValue(cellId())).add(CharValue(iccid()));
vwochnik 7:f77afd49c35d 216
vwochnik 7:f77afd49c35d 217 if (client.send(newMoRec) != SMARTREST_SUCCESS) {
vwochnik 7:f77afd49c35d 218 puts("Send failed.");
vwochnik 10:d5cd4a7ada7b 219 client.stop();
vwochnik 7:f77afd49c35d 220 return false;
vwochnik 7:f77afd49c35d 221 }
vwochnik 7:f77afd49c35d 222
vwochnik 7:f77afd49c35d 223 if (client.receive(received) != SMARTREST_SUCCESS) {
vwochnik 7:f77afd49c35d 224 puts("Update failed.");
vwochnik 10:d5cd4a7ada7b 225 client.stop();
vwochnik 7:f77afd49c35d 226 return false;
vwochnik 7:f77afd49c35d 227 }
vwochnik 7:f77afd49c35d 228
vwochnik 7:f77afd49c35d 229 if (received.values() != 3) {
vwochnik 7:f77afd49c35d 230 puts("Bad received data.");
vwochnik 10:d5cd4a7ada7b 231 client.stop();
vwochnik 7:f77afd49c35d 232 return false;
vwochnik 7:f77afd49c35d 233 }
vwochnik 7:f77afd49c35d 234
vwochnik 7:f77afd49c35d 235 if (received.value(0).integerValue() != 201) {
vwochnik 7:f77afd49c35d 236 puts("Bad received data.");
vwochnik 10:d5cd4a7ada7b 237 client.stop();
vwochnik 7:f77afd49c35d 238 return false;
vwochnik 7:f77afd49c35d 239 }
vwochnik 7:f77afd49c35d 240
vwochnik 7:f77afd49c35d 241 client.stop();
vwochnik 7:f77afd49c35d 242
vwochnik 7:f77afd49c35d 243 return true;
vwochnik 7:f77afd49c35d 244 }
vwochnik 7:f77afd49c35d 245
vwochnik 8:940c782eec5e 246 void loop(long deviceId)
vwochnik 8:940c782eec5e 247 {
vwochnik 13:4045b6ac448d 248 Aggregator aggr(5, false, true);
vwochnik 8:940c782eec5e 249
vwochnik 13:4045b6ac448d 250 signalMeasurement(deviceId, aggr);
vwochnik 13:4045b6ac448d 251 temperatureMeasurement(deviceId, aggr);
vwochnik 13:4045b6ac448d 252 countMeasurement(deviceId, aggr);
vwochnik 13:4045b6ac448d 253 motionMeasurement(deviceId, aggr);
vwochnik 6:642e7c233e83 254
vwochnik 13:4045b6ac448d 255 if (client.send(aggr) != SMARTREST_SUCCESS) {
vwochnik 6:642e7c233e83 256 puts("Send failed.");
vwochnik 6:642e7c233e83 257 }
vwochnik 6:642e7c233e83 258
vwochnik 6:642e7c233e83 259 client.stop();
vwochnik 13:4045b6ac448d 260 }
vwochnik 13:4045b6ac448d 261
vwochnik 13:4045b6ac448d 262 void signalMeasurement(long deviceId, Aggregator& aggr)
vwochnik 13:4045b6ac448d 263 {
vwochnik 13:4045b6ac448d 264 sigq_t *sq = signalQuality();
vwochnik 13:4045b6ac448d 265
vwochnik 13:4045b6ac448d 266 if ((sq->rssi == 0) || (sq->ber == 0))
vwochnik 13:4045b6ac448d 267 return;
vwochnik 13:4045b6ac448d 268
vwochnik 13:4045b6ac448d 269 ComposedRecord measurement;
vwochnik 13:4045b6ac448d 270 IntegerValue msgId(104);
vwochnik 13:4045b6ac448d 271 IntegerValue devId(deviceId);
vwochnik 13:4045b6ac448d 272 FloatValue rssi(sq->rssi, 0);
vwochnik 13:4045b6ac448d 273 IntegerValue ber(sq->ber);
vwochnik 13:4045b6ac448d 274 measurement.add(msgId).add(devId).add(rssi).add(ber);
vwochnik 13:4045b6ac448d 275 aggr.add(measurement);
vwochnik 10:d5cd4a7ada7b 276 }
vwochnik 13:4045b6ac448d 277
vwochnik 13:4045b6ac448d 278 void temperatureMeasurement(long deviceId, Aggregator& aggr)
vwochnik 13:4045b6ac448d 279 {
vwochnik 13:4045b6ac448d 280 ComposedRecord measurement;
vwochnik 13:4045b6ac448d 281 IntegerValue msgId(105);
vwochnik 13:4045b6ac448d 282 IntegerValue devId(deviceId);
vwochnik 13:4045b6ac448d 283 FloatValue temp(temperature(), 1);
vwochnik 13:4045b6ac448d 284 measurement.add(msgId).add(devId).add(temp);
vwochnik 13:4045b6ac448d 285 aggr.add(measurement);
vwochnik 13:4045b6ac448d 286 }
vwochnik 13:4045b6ac448d 287
vwochnik 13:4045b6ac448d 288 void countMeasurement(long deviceId, Aggregator& aggr)
vwochnik 13:4045b6ac448d 289 {
vwochnik 13:4045b6ac448d 290 ComposedRecord measurement;
vwochnik 13:4045b6ac448d 291 IntegerValue msgId(106);
vwochnik 13:4045b6ac448d 292 IntegerValue devId(deviceId);
vwochnik 13:4045b6ac448d 293 IntegerValue n(counter());
vwochnik 13:4045b6ac448d 294 measurement.add(msgId).add(devId).add(n);
vwochnik 13:4045b6ac448d 295 aggr.add(measurement);
vwochnik 13:4045b6ac448d 296 }
vwochnik 13:4045b6ac448d 297
vwochnik 13:4045b6ac448d 298 void motionMeasurement(long deviceId, Aggregator& aggr)
vwochnik 13:4045b6ac448d 299 {
vwochnik 13:4045b6ac448d 300 acceleration_t acc = acceleration();
vwochnik 13:4045b6ac448d 301 ComposedRecord measurement;
vwochnik 13:4045b6ac448d 302 IntegerValue msgId(107);
vwochnik 13:4045b6ac448d 303 IntegerValue devId(deviceId);
vwochnik 13:4045b6ac448d 304 FloatValue x(acc.x, 2);
vwochnik 13:4045b6ac448d 305 FloatValue y(acc.y, 2);
vwochnik 13:4045b6ac448d 306 FloatValue z(acc.z, 2);
vwochnik 13:4045b6ac448d 307 measurement.add(msgId).add(devId).add(x).add(y).add(z);
vwochnik 13:4045b6ac448d 308 aggr.add(measurement);
vwochnik 13:4045b6ac448d 309 }
vwochnik 13:4045b6ac448d 310