Skip to content

Commit

Permalink
app_sensors: use per-sensor functions and convert from JSON to CBOR
Browse files Browse the repository at this point in the history 
- Breakout each sensor reading into its own function
- Use CBOR to encode the data sent to Golioth
- Update Pipeline example to use CBOR

Signed-off-by: Mike Szczys <[email protected]>
  • Loading branch information
@szczys
szczys committed Dec 18, 2024
1 parent e2b0e7b commit 889e12f
Show file tree
Hide file tree
Showing 2 changed files with 168 additions and 39 deletions.
6 changes: 5 additions & 1 deletion pipelines/json-to-lightdb.yml → pipelines/cbor-to-lightdb-with-path.yml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
filter:
path: "*"
content_type: application/json
content_type: application/cbor
steps:
- name: step-0
transformer:
type: cbor-to-json
version: v1
- name: step-1
transformer:
type: inject-path
version: v1
Expand Down
201 changes: 163 additions & 38 deletions src/app_sensors.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,6 @@ void user_led_set(uint8_t state)
gpio_pin_set_dt(&user_led, pin_state);
}

/* Formatting string for sending sensor JSON to Golioth */
#define JSON_FMT "{\
\"weather\":{\"tem\":%d.%d,\"pre\":%d.%d,\"hum\":%d.%d,\"gas\":%d.%d},\
\"light\":{\"red\":%d,\"blue\":%d,\"green\":%d,\"ir\":%d},\
\"accel\":{\"x\":%d.%d,\"y\":%d.%d,\"z\":%d.%d}\
}"

/* Callback for LightDB Stream */
static void async_error_handler(struct golioth_client *client, enum golioth_status status,
const struct golioth_coap_rsp_code *coap_rsp_code, const char *path,
Expand All @@ -53,26 +46,13 @@ static void async_error_handler(struct golioth_client *client, enum golioth_stat
}
}

/* This will be called by the main() loop after delays or on button presses */
/* Do all of your work here! */
void app_sensors_read_and_stream(void)
static enum golioth_status read_light_sensor(zcbor_state_t *zse)
{
int err;
char json_buf[256];

/* Sensor value structs */

struct sensor_value BH1749_RED;
struct sensor_value BH1749_GREEN;
struct sensor_value BH1749_BLUE;
struct sensor_value BH1749_IR;
struct sensor_value temp;
struct sensor_value press;
struct sensor_value humidity;
struct sensor_value gas_res;
struct sensor_value accel_x;
struct sensor_value accel_y;
struct sensor_value accel_z;
bool ok;

/* Turn off LED so light sensor won't detect LED fade
* Also helps highlight that there is a reading being taken.
Expand All @@ -85,10 +65,13 @@ void app_sensors_read_and_stream(void)
/* Start taking readings */

/* BH1749 */
err = sensor_sample_fetch(light);
int err = sensor_sample_fetch(light);

all_leds_on();

if (err) {
LOG_ERR("Error fetching BH1749 sensor sample: %d", err);
return;
return GOLIOTH_ERR_FAIL;
}
sensor_channel_get(light, SENSOR_CHAN_RED, &BH1749_RED);
sensor_channel_get(light, SENSOR_CHAN_GREEN, &BH1749_GREEN);
Expand All @@ -97,11 +80,50 @@ void app_sensors_read_and_stream(void)
LOG_DBG("R: %d, G: %d, B: %d, IR: %d", BH1749_RED.val1, BH1749_GREEN.val1, BH1749_BLUE.val1,
BH1749_IR.val1);

ok = zcbor_tstr_put_lit(zse, "light") && zcbor_map_start_encode(zse, 4);
if (!ok)
{
LOG_ERR("ZCBOR unable to open light map");
return GOLIOTH_ERR_QUEUE_FULL;
}

ok = zcbor_tstr_put_lit(zse, "red") &&
zcbor_float64_put(zse, sensor_value_to_double(&BH1749_RED)) &&
zcbor_tstr_put_lit(zse, "green") &&
zcbor_float64_put(zse, sensor_value_to_double(&BH1749_GREEN)) &&
zcbor_tstr_put_lit(zse, "blue") &&
zcbor_float64_put(zse, sensor_value_to_double(&BH1749_BLUE)) &&
zcbor_tstr_put_lit(zse, "ir") &&
zcbor_float64_put(zse, sensor_value_to_double(&BH1749_IR));
if (!ok)
{
LOG_ERR("ZCBOR failed to encode light data");
return GOLIOTH_ERR_QUEUE_FULL;
}

ok = zcbor_map_end_encode(zse, 4);
if (!ok)
{
LOG_ERR("ZCBOR failed to close light map");
return GOLIOTH_ERR_QUEUE_FULL;
}

return GOLIOTH_OK;
}

static enum golioth_status read_weather_sensor(zcbor_state_t *zse)
{
struct sensor_value temp;
struct sensor_value press;
struct sensor_value humidity;
struct sensor_value gas_res;
bool ok;

/* BME680 */
err = sensor_sample_fetch(weather);
int err = sensor_sample_fetch(weather);
if (err) {
LOG_ERR("Error fetching BME680 sensor sample: %d", err);
return;
return GOLIOTH_ERR_FAIL;
}
sensor_channel_get(weather, SENSOR_CHAN_AMBIENT_TEMP, &temp);
sensor_channel_get(weather, SENSOR_CHAN_PRESS, &press);
Expand All @@ -110,33 +132,136 @@ void app_sensors_read_and_stream(void)
LOG_DBG("T: %d.%06d; P: %d.%06d; H: %d.%06d; G: %d.%06d", temp.val1, abs(temp.val2),
press.val1, press.val2, humidity.val1, humidity.val2, gas_res.val1, gas_res.val2);

ok = zcbor_tstr_put_lit(zse, "weather") && zcbor_map_start_encode(zse, 4);
if (!ok)
{
LOG_ERR("ZCBOR unable to open weather map");
return GOLIOTH_ERR_QUEUE_FULL;
}

ok = zcbor_tstr_put_lit(zse, "tem") &&
zcbor_float64_put(zse, sensor_value_to_double(&temp)) &&
zcbor_tstr_put_lit(zse, "pre") &&
zcbor_float64_put(zse, sensor_value_to_double(&press)) &&
zcbor_tstr_put_lit(zse, "hum") &&
zcbor_float64_put(zse, sensor_value_to_double(&humidity)) &&
zcbor_tstr_put_lit(zse, "gas") &&
zcbor_float64_put(zse, sensor_value_to_double(&gas_res));
if (!ok)
{
LOG_ERR("ZCBOR failed to encode weather data");
return GOLIOTH_ERR_QUEUE_FULL;
}

ok = zcbor_map_end_encode(zse, 4);
if (!ok)
{
LOG_ERR("ZCBOR failed to close weather map");
return GOLIOTH_ERR_QUEUE_FULL;
}

return GOLIOTH_OK;
}

static enum golioth_status read_accel_sensor(zcbor_state_t *zse)
{
struct sensor_value accel_x;
struct sensor_value accel_y;
struct sensor_value accel_z;
bool ok;

/* ADXL362 */
err = sensor_sample_fetch(accel);
int err = sensor_sample_fetch(accel);
if (err) {
LOG_ERR("Error fetching ADXL362 sensor sample: %d", err);
return;
return GOLIOTH_ERR_FAIL;
}
sensor_channel_get(accel, SENSOR_CHAN_ACCEL_X, &accel_x);
sensor_channel_get(accel, SENSOR_CHAN_ACCEL_Y, &accel_y);
sensor_channel_get(accel, SENSOR_CHAN_ACCEL_Z, &accel_z);
LOG_DBG("X: %d.%06d; Y: %d.%06d; Z: %d.%06d", accel_x.val1, abs(accel_x.val2), accel_y.val1,
abs(accel_y.val2), accel_z.val1, abs(accel_z.val2));

/* Format data for LightDB Stream */
snprintk(json_buf, sizeof(json_buf), JSON_FMT, temp.val1, abs(temp.val2), press.val1,
press.val2, humidity.val1, humidity.val2, gas_res.val1, gas_res.val2,
BH1749_RED.val1, BH1749_GREEN.val1, BH1749_BLUE.val1, BH1749_IR.val1, accel_x.val1,
abs(accel_x.val2), accel_y.val1, abs(accel_y.val2), accel_z.val1,
abs(accel_z.val2));
ok = zcbor_tstr_put_lit(zse, "accel") && zcbor_map_start_encode(zse, 3);
if (!ok)
{
LOG_ERR("ZCBOR unable to open accel map");
return GOLIOTH_ERR_QUEUE_FULL;
}

ok = zcbor_tstr_put_lit(zse, "x") &&
zcbor_float64_put(zse, sensor_value_to_double(&accel_x)) &&
zcbor_tstr_put_lit(zse, "y") &&
zcbor_float64_put(zse, sensor_value_to_double(&accel_y)) &&
zcbor_tstr_put_lit(zse, "z") &&
zcbor_float64_put(zse, sensor_value_to_double(&accel_z));
if (!ok)
{
LOG_ERR("ZCBOR failed to encode accel data");
return GOLIOTH_ERR_QUEUE_FULL;
}

ok = zcbor_map_end_encode(zse, 3);
if (!ok)
{
LOG_ERR("ZCBOR failed to close accel map");
return GOLIOTH_ERR_QUEUE_FULL;
}

return GOLIOTH_OK;
}

/* This will be called by the main() loop after delays or on button presses */
/* Do all of your work here! */
void app_sensors_read_and_stream(void)
{
int err;
bool ok;
enum golioth_status status;
char cbor_buf[256];

ZCBOR_STATE_E(zse, 3, cbor_buf, sizeof(cbor_buf), 1);

ok = zcbor_map_start_encode(zse, 3);

if (!ok)
{
LOG_ERR("ZCBOR failed to open map");
return;
}

status = read_light_sensor(zse);
if (status == GOLIOTH_ERR_QUEUE_FULL)
{
return;
}

status = read_weather_sensor(zse);
if (status == GOLIOTH_ERR_QUEUE_FULL)
{
return;
}

status = read_accel_sensor(zse);
if (status == GOLIOTH_ERR_QUEUE_FULL)
{
return;
}

ok = zcbor_map_end_encode(zse, 3);
if (!ok)
{
LOG_ERR("ZCBOR failed to close map");
}

size_t cbor_size = zse->payload - (const uint8_t *) cbor_buf;

/* Send to LightDB Stream on "sensor" endpoint */
err = golioth_stream_set_async(client, "sensor", GOLIOTH_CONTENT_TYPE_JSON, json_buf,
strlen(json_buf), async_error_handler, NULL);
err = golioth_stream_set_async(client, "sensor", GOLIOTH_CONTENT_TYPE_CBOR, cbor_buf,
cbor_size, async_error_handler, NULL);
if (err) {
LOG_ERR("Failed to send sensor data to Golioth: %d", err);
}

all_leds_on();
}

void app_sensors_set_client(struct golioth_client *sensors_client)
Expand Down

0 comments on commit 889e12f

Please sign in to comment.