Skip to content
This repository has been archived by the owner on Jul 9, 2024. It is now read-only.

Commit

Permalink
fix: update from upstream
Browse files Browse the repository at this point in the history 
See https://github.com/nrfconnect/sdk-nrf/tree/c4006cdae0500b6f7c5ad4a421d0cdcf1bf3e5d1/applications/asset_tracker_v2
  • Loading branch information
github-actions[bot] committed Mar 23, 2023
1 parent af7bb76 commit 5e6696e
Show file tree
Hide file tree
Showing 12 changed files with 276 additions and 51 deletions.
16 changes: 8 additions & 8 deletions src/cloud/aws_iot_integration.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_CLOUD_INTEGRATION_LOG_LEVEL);
#define BATCH_TOPIC_LEN (AWS_CLOUD_CLIENT_ID_LEN + 6)
#define MESSAGES_TOPIC "%s/messages"
#define MESSAGES_TOPIC_LEN (AWS_CLOUD_CLIENT_ID_LEN + 9)
#define NEIGHBOR_CELLS_TOPIC "%s/ncellmeas"
#define NEIGHBOR_CELLS_TOPIC_LEN (AWS_CLOUD_CLIENT_ID_LEN + 10)
#define GROUND_FIX_TOPIC "%s/ground-fix"
#define GROUND_FIX_TOPIC_LEN (AWS_CLOUD_CLIENT_ID_LEN + 11)
#define AGPS_REQUEST_TOPIC "%s/agps/get"
#define AGPS_REQUEST_TOPIC_LEN (AWS_CLOUD_CLIENT_ID_LEN + 9)
#define AGPS_RESPONSE_TOPIC "%s/agps"
Expand Down Expand Up @@ -67,7 +67,7 @@ static char client_id_buf[AWS_CLOUD_CLIENT_ID_LEN + 1];
static char batch_topic[BATCH_TOPIC_LEN + 1];
static char cfg_topic[CFG_TOPIC_LEN + 1];
static char messages_topic[MESSAGES_TOPIC_LEN + 1];
static char neighbor_cells_topic[NEIGHBOR_CELLS_TOPIC_LEN + 1];
static char ground_fix_topic[GROUND_FIX_TOPIC_LEN + 1];
static char agps_request_topic[AGPS_REQUEST_TOPIC_LEN + 1];
static char agps_response_topic[AGPS_RESPONSE_TOPIC_LEN + 1];
static char pgps_request_topic[PGPS_REQUEST_TOPIC_LEN + 1];
Expand Down Expand Up @@ -112,14 +112,14 @@ static int populate_app_endpoint_topics(void)
pub_topics[APP_PUB_TOPIC_IDX_UI].str = messages_topic;
pub_topics[APP_PUB_TOPIC_IDX_UI].len = MESSAGES_TOPIC_LEN;

err = snprintf(neighbor_cells_topic, sizeof(neighbor_cells_topic),
NEIGHBOR_CELLS_TOPIC, client_id_buf);
if (err != NEIGHBOR_CELLS_TOPIC_LEN) {
err = snprintf(ground_fix_topic, sizeof(ground_fix_topic),
GROUND_FIX_TOPIC, client_id_buf);
if (err != GROUND_FIX_TOPIC_LEN) {
return -ENOMEM;
}

pub_topics[APP_PUB_TOPIC_IDX_NEIGHBOR_CELLS].str = neighbor_cells_topic;
pub_topics[APP_PUB_TOPIC_IDX_NEIGHBOR_CELLS].len = NEIGHBOR_CELLS_TOPIC_LEN;
pub_topics[APP_PUB_TOPIC_IDX_NEIGHBOR_CELLS].str = ground_fix_topic;
pub_topics[APP_PUB_TOPIC_IDX_NEIGHBOR_CELLS].len = GROUND_FIX_TOPIC_LEN;

err = snprintf(agps_request_topic, sizeof(agps_request_topic),
AGPS_REQUEST_TOPIC, client_id_buf);
Expand Down
12 changes: 6 additions & 6 deletions src/cloud/azure_iot_hub_integration.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ LOG_MODULE_REGISTER(MODULE, CONFIG_CLOUD_INTEGRATION_LOG_LEVEL);
#define PROP_BAG_CONTENT_ENCODING_VALUE "utf-8"

#define PROP_BAG_BATCH_KEY "batch"
#define PROP_BAG_NEIGHBOR_CELLS_KEY "ncellmeas"
#define PROP_BAG_GROUND_FIX_KEY "ground-fix"

#define PROP_BAG_AGPS_KEY "agps"
#define PROP_BAG_AGPS_GET_VALUE "get"
Expand Down Expand Up @@ -112,10 +112,10 @@ static struct azure_iot_hub_property prop_bag_pgps[] = {
.value.size = sizeof(PROP_BAG_CONTENT_ENCODING_VALUE) - 1,
},
};
static struct azure_iot_hub_property prop_bag_ncellmeas[] = {
static struct azure_iot_hub_property prop_bag_ground_fix[] = {
{
.key.ptr = PROP_BAG_NEIGHBOR_CELLS_KEY,
.key.size = sizeof(PROP_BAG_NEIGHBOR_CELLS_KEY) - 1,
.key.ptr = PROP_BAG_GROUND_FIX_KEY,
.key.size = sizeof(PROP_BAG_GROUND_FIX_KEY) - 1,
.value.ptr = NULL,
},
{
Expand Down Expand Up @@ -495,8 +495,8 @@ int cloud_wrap_cloud_location_send(char *buf, size_t len, bool ack, uint32_t id)
.message_id = id,
.qos = ack ? MQTT_QOS_1_AT_LEAST_ONCE : MQTT_QOS_0_AT_MOST_ONCE,
.topic.type = AZURE_IOT_HUB_TOPIC_EVENT,
.topic.properties = prop_bag_ncellmeas,
.topic.property_count = ARRAY_SIZE(prop_bag_ncellmeas)
.topic.properties = prop_bag_ground_fix,
.topic.property_count = ARRAY_SIZE(prop_bag_ground_fix)
};

err = azure_iot_hub_send(&msg);
Expand Down
9 changes: 9 additions & 0 deletions src/cloud/cloud_codec/aws_iot/aws_iot_codec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,15 @@ int cloud_codec_encode_cloud_location(
goto exit;
}

#if defined(CONFIG_LOCATION_METHOD_WIFI)
err = json_common_wifi_ap_data_add(root_obj, &cloud_location->wifi_access_points,
JSON_COMMON_ADD_DATA_TO_OBJECT);
if (err) {
goto exit;
}
#endif


buffer = cJSON_PrintUnformatted(root_obj);
if (buffer == NULL) {
LOG_ERR("Failed to allocate memory for JSON string");
Expand Down
7 changes: 5 additions & 2 deletions src/cloud/cloud_codec/aws_iot/json_protocol_names_aws_iot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,15 @@
#define DATA_MOVEMENT_Y "y"
#define DATA_MOVEMENT_Z "z"

#define DATA_GNSS "gnss"
#define DATA_GNSS "gnss"
#define DATA_GNSS_LONGITUDE "lng"
#define DATA_GNSS_LATITUDE "lat"
#define DATA_GNSS_ALTITUDE "alt"
#define DATA_GNSS_SPEED "spd"
#define DATA_GNSS_SPEED "spd"
#define DATA_GNSS_HEADING "hdg"
#define DATA_GNSS_ACCURACY "acc"

#define DATA_NEIGHBOR_CELLS_ROOT "lte"
#define DATA_NEIGHBOR_CELLS_MCC "mcc"
#define DATA_NEIGHBOR_CELLS_MNC "mnc"
#define DATA_NEIGHBOR_CELLS_CID "cell"
Expand All @@ -69,6 +70,8 @@
#define DATA_NEIGHBOR_CELLS_RSRQ "rsrq"
#define DATA_NEIGHBOR_CELLS_NEIGHBOR_MEAS "nmr"
#define DATA_NEIGHBOR_CELLS_PCI "cell"
#define DATA_WIFI_ROOT "wifi"
#define DATA_WIFI_AP_MEAS "aps"

#define DATA_AGPS_REQUEST_MCC "mcc"
#define DATA_AGPS_REQUEST_MNC "mnc"
Expand Down
8 changes: 8 additions & 0 deletions src/cloud/cloud_codec/azure_iot_hub/azure_iot_hub_codec.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ int cloud_codec_encode_cloud_location(
goto exit;
}

#if defined(CONFIG_LOCATION_METHOD_WIFI)
err = json_common_wifi_ap_data_add(root_obj, &cloud_location->wifi_access_points,
JSON_COMMON_ADD_DATA_TO_OBJECT);
if (err) {
goto exit;
}
#endif

buffer = cJSON_PrintUnformatted(root_obj);
if (buffer == NULL) {
LOG_ERR("Failed to allocate memory for JSON string");
Expand Down
5 changes: 4 additions & 1 deletion src/cloud/cloud_codec/azure_iot_hub/json_protocol_names_azure_iot_hub.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,15 @@
#define DATA_MOVEMENT_Y "y"
#define DATA_MOVEMENT_Z "z"

#define DATA_GNSS "gnss"
#define DATA_GNSS "gnss"
#define DATA_GNSS_LONGITUDE "lng"
#define DATA_GNSS_LATITUDE "lat"
#define DATA_GNSS_ALTITUDE "alt"
#define DATA_GNSS_SPEED "spd"
#define DATA_GNSS_HEADING "hdg"
#define DATA_GNSS_ACCURACY "acc"

#define DATA_NEIGHBOR_CELLS_ROOT "lte"
#define DATA_NEIGHBOR_CELLS_MCC "mcc"
#define DATA_NEIGHBOR_CELLS_MNC "mnc"
#define DATA_NEIGHBOR_CELLS_CID "cell"
Expand All @@ -69,6 +70,8 @@
#define DATA_NEIGHBOR_CELLS_RSRQ "rsrq"
#define DATA_NEIGHBOR_CELLS_NEIGHBOR_MEAS "nmr"
#define DATA_NEIGHBOR_CELLS_PCI "cell"
#define DATA_WIFI_ROOT "wifi"
#define DATA_WIFI_AP_MEAS "aps"

#define DATA_AGPS_REQUEST_MCC "mcc"
#define DATA_AGPS_REQUEST_MNC "mnc"
Expand Down
Loading

0 comments on commit 5e6696e

Please sign in to comment.