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/7050fee512a49e673104a79b0a4ed421078d55d1/applications/asset_tracker_v2
  • Loading branch information
github-actions[bot] committed Oct 28, 2023
1 parent 8e5dbb1 commit b47f5c7
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 44 deletions.
2 changes: 1 addition & 1 deletion doc/cloud_module.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ Configurations for AWS IoT library
To enable communication with AWS IoT, set the following options in the :file:`overlay-aws.conf` file:

* :kconfig:option:`CONFIG_AWS_IOT_BROKER_HOST_NAME`
* :kconfig:option:`CONFIG_AWS_IOT_SEC_TAG`
* :kconfig:option:`CONFIG_MQTT_HELPER_SEC_TAG`

Configurations for Azure IoT Hub library
----------------------------------------
Expand Down
6 changes: 2 additions & 4 deletions overlay-aws.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ CONFIG_AWS_IOT=y
CONFIG_AWS_IOT_TOPIC_UPDATE_DELTA_SUBSCRIBE=y
CONFIG_AWS_IOT_TOPIC_GET_REJECTED_SUBSCRIBE=y
CONFIG_AWS_IOT_AUTO_DEVICE_SHADOW_REQUEST=y
CONFIG_AWS_IOT_MQTT_RX_TX_BUFFER_LEN=2048
CONFIG_AWS_IOT_APP_SUBSCRIPTION_LIST_COUNT=3
CONFIG_AWS_IOT_CLIENT_ID_APP=y
CONFIG_MQTT_HELPER_RX_TX_BUFFER_SIZE=2048

# Options that must be configured in order to establish a connection.
CONFIG_AWS_IOT_SEC_TAG=42
CONFIG_MQTT_HELPER_SEC_TAG=42
CONFIG_AWS_IOT_BROKER_HOST_NAME=""

# MQTT Transport library
Expand Down
78 changes: 39 additions & 39 deletions src/cloud/aws_iot_integration.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,8 @@ static char pgps_request_topic[PGPS_REQUEST_TOPIC_LEN + 1];
static char pgps_response_topic[PGPS_RESPONSE_TOPIC_LEN + 1];
static char memfault_topic[MEMFAULT_TOPIC_LEN + 1];

static struct aws_iot_topic_data sub_topics[APP_SUB_TOPICS_COUNT];
static struct aws_iot_topic_data pub_topics[APP_PUB_TOPICS_COUNT];

static struct aws_iot_config config;
static struct mqtt_topic sub_topics[APP_SUB_TOPICS_COUNT];
static struct mqtt_topic pub_topics[APP_PUB_TOPICS_COUNT];

static cloud_wrap_evt_handler_t wrapper_evt_handler;

Expand All @@ -100,81 +98,80 @@ static int populate_app_endpoint_topics(void)
return -ENOMEM;
}

pub_topics[APP_PUB_TOPIC_IDX_BATCH].str = batch_topic;
pub_topics[APP_PUB_TOPIC_IDX_BATCH].len = BATCH_TOPIC_LEN;
pub_topics[APP_PUB_TOPIC_IDX_BATCH].topic.utf8 = batch_topic;
pub_topics[APP_PUB_TOPIC_IDX_BATCH].topic.size = BATCH_TOPIC_LEN;

err = snprintf(messages_topic, sizeof(messages_topic), MESSAGES_TOPIC,
client_id_buf);
if (err != MESSAGES_TOPIC_LEN) {
return -ENOMEM;
}

pub_topics[APP_PUB_TOPIC_IDX_UI].str = messages_topic;
pub_topics[APP_PUB_TOPIC_IDX_UI].len = MESSAGES_TOPIC_LEN;
pub_topics[APP_PUB_TOPIC_IDX_UI].topic.utf8 = messages_topic;
pub_topics[APP_PUB_TOPIC_IDX_UI].topic.size = MESSAGES_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 = ground_fix_topic;
pub_topics[APP_PUB_TOPIC_IDX_NEIGHBOR_CELLS].len = GROUND_FIX_TOPIC_LEN;
pub_topics[APP_PUB_TOPIC_IDX_NEIGHBOR_CELLS].topic.utf8 = ground_fix_topic;
pub_topics[APP_PUB_TOPIC_IDX_NEIGHBOR_CELLS].topic.size = GROUND_FIX_TOPIC_LEN;

err = snprintf(agnss_request_topic, sizeof(agnss_request_topic),
AGNSS_REQUEST_TOPIC, client_id_buf);
if (err != AGNSS_REQUEST_TOPIC_LEN) {
return -ENOMEM;
}

pub_topics[APP_PUB_TOPIC_IDX_AGNSS].str = agnss_request_topic;
pub_topics[APP_PUB_TOPIC_IDX_AGNSS].len = AGNSS_REQUEST_TOPIC_LEN;
pub_topics[APP_PUB_TOPIC_IDX_AGNSS].topic.utf8 = agnss_request_topic;
pub_topics[APP_PUB_TOPIC_IDX_AGNSS].topic.size = AGNSS_REQUEST_TOPIC_LEN;

err = snprintf(pgps_request_topic, sizeof(pgps_request_topic),
PGPS_REQUEST_TOPIC, client_id_buf);
if (err != PGPS_REQUEST_TOPIC_LEN) {
return -ENOMEM;
}

pub_topics[APP_PUB_TOPIC_IDX_PGPS].str = pgps_request_topic;
pub_topics[APP_PUB_TOPIC_IDX_PGPS].len = PGPS_REQUEST_TOPIC_LEN;
pub_topics[APP_PUB_TOPIC_IDX_PGPS].topic.utf8 = pgps_request_topic;
pub_topics[APP_PUB_TOPIC_IDX_PGPS].topic.size = PGPS_REQUEST_TOPIC_LEN;

err = snprintf(memfault_topic, sizeof(memfault_topic), MEMFAULT_TOPIC, client_id_buf);
if (err != MEMFAULT_TOPIC_LEN) {
return -ENOMEM;
}

pub_topics[APP_PUB_TOPIC_IDX_MEMFAULT].str = memfault_topic;
pub_topics[APP_PUB_TOPIC_IDX_MEMFAULT].len = MEMFAULT_TOPIC_LEN;
pub_topics[APP_PUB_TOPIC_IDX_MEMFAULT].topic.utf8 = memfault_topic;
pub_topics[APP_PUB_TOPIC_IDX_MEMFAULT].topic.size = MEMFAULT_TOPIC_LEN;

err = snprintf(cfg_topic, sizeof(cfg_topic), CFG_TOPIC, client_id_buf);
if (err != CFG_TOPIC_LEN) {
return -ENOMEM;
}

sub_topics[APP_SUB_TOPIC_IDX_CFG].str = cfg_topic;
sub_topics[APP_SUB_TOPIC_IDX_CFG].len = CFG_TOPIC_LEN;
sub_topics[APP_SUB_TOPIC_IDX_CFG].topic.utf8 = cfg_topic;
sub_topics[APP_SUB_TOPIC_IDX_CFG].topic.size = CFG_TOPIC_LEN;

err = snprintf(agnss_response_topic, sizeof(agnss_response_topic), AGNSS_RESPONSE_TOPIC,
client_id_buf);
if (err != AGNSS_RESPONSE_TOPIC_LEN) {
return -ENOMEM;
}

sub_topics[APP_SUB_TOPIC_IDX_AGNSS].str = agnss_response_topic;
sub_topics[APP_SUB_TOPIC_IDX_AGNSS].len = AGNSS_RESPONSE_TOPIC_LEN;
sub_topics[APP_SUB_TOPIC_IDX_AGNSS].topic.utf8 = agnss_response_topic;
sub_topics[APP_SUB_TOPIC_IDX_AGNSS].topic.size = AGNSS_RESPONSE_TOPIC_LEN;

err = snprintf(pgps_response_topic, sizeof(pgps_response_topic), PGPS_RESPONSE_TOPIC,
client_id_buf);
if (err != PGPS_RESPONSE_TOPIC_LEN) {
return -ENOMEM;
}

sub_topics[APP_SUB_TOPIC_IDX_PGPS].str = pgps_response_topic;
sub_topics[APP_SUB_TOPIC_IDX_PGPS].len = PGPS_RESPONSE_TOPIC_LEN;
sub_topics[APP_SUB_TOPIC_IDX_PGPS].topic.utf8 = pgps_response_topic;
sub_topics[APP_SUB_TOPIC_IDX_PGPS].topic.size = PGPS_RESPONSE_TOPIC_LEN;

err = aws_iot_subscription_topics_add(sub_topics,
ARRAY_SIZE(sub_topics));
err = aws_iot_application_topics_set(sub_topics, ARRAY_SIZE(sub_topics));
if (err) {
LOG_ERR("cloud_ep_subscriptions_add, error: %d", err);
return err;
Expand Down Expand Up @@ -222,9 +219,6 @@ void aws_iot_event_handler(const struct aws_iot_evt *const evt)
break;
case AWS_IOT_EVT_CONNECTED:
LOG_DBG("AWS_IOT_EVT_CONNECTED");
break;
case AWS_IOT_EVT_READY:
LOG_DBG("AWS_IOT_EVT_READY");
cloud_wrap_evt.type = CLOUD_WRAP_EVT_CONNECTED;
notify = true;
break;
Expand Down Expand Up @@ -317,11 +311,7 @@ int cloud_wrap_init(cloud_wrap_evt_handler_t event_handler)
CONFIG_CLOUD_CLIENT_ID);
#endif

/* Fetch IMEI from modem data and set IMEI as cloud connection ID **/
config.client_id = client_id_buf;
config.client_id_len = strlen(client_id_buf);

err = aws_iot_init(&config, aws_iot_event_handler);
err = aws_iot_init(aws_iot_event_handler);
if (err) {
LOG_ERR("aws_iot_init, error: %d", err);
return err;
Expand Down Expand Up @@ -353,7 +343,11 @@ int cloud_wrap_connect(void)
{
int err;

err = aws_iot_connect(NULL);
struct aws_iot_config config = {
.client_id = client_id_buf
};

err = aws_iot_connect(&config);
if (err) {
LOG_ERR("aws_iot_connect, error: %d", err);
return err;
Expand Down Expand Up @@ -450,7 +444,8 @@ int cloud_wrap_batch_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,
/* <imei>/batch */
.topic = pub_topics[APP_PUB_TOPIC_IDX_BATCH]
.topic.str = pub_topics[APP_PUB_TOPIC_IDX_BATCH].topic.utf8,
.topic.len = pub_topics[APP_PUB_TOPIC_IDX_BATCH].topic.size
};

err = aws_iot_send(&msg);
Expand All @@ -474,7 +469,8 @@ int cloud_wrap_ui_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,
/* <imei>/messages */
.topic = pub_topics[APP_PUB_TOPIC_IDX_UI]
.topic.str = pub_topics[APP_PUB_TOPIC_IDX_UI].topic.utf8,
.topic.len = pub_topics[APP_PUB_TOPIC_IDX_UI].topic.size
};

err = aws_iot_send(&msg);
Expand All @@ -495,7 +491,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,
/* <imei>/ncellmeas */
.topic = pub_topics[APP_PUB_TOPIC_IDX_NEIGHBOR_CELLS]
.topic.str = pub_topics[APP_PUB_TOPIC_IDX_NEIGHBOR_CELLS].topic.utf8,
.topic.len = pub_topics[APP_PUB_TOPIC_IDX_NEIGHBOR_CELLS].topic.size
};

err = aws_iot_send(&msg);
Expand All @@ -521,7 +518,8 @@ int cloud_wrap_agnss_request_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,
/* <imei>/agps/get */
.topic = pub_topics[APP_PUB_TOPIC_IDX_AGNSS]
.topic.str = pub_topics[APP_PUB_TOPIC_IDX_AGNSS].topic.utf8,
.topic.len = pub_topics[APP_PUB_TOPIC_IDX_AGNSS].topic.size
};

err = aws_iot_send(&msg);
Expand All @@ -542,7 +540,8 @@ int cloud_wrap_pgps_request_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,
/* <imei>/pgps/get */
.topic = pub_topics[APP_PUB_TOPIC_IDX_PGPS]
.topic.str = pub_topics[APP_PUB_TOPIC_IDX_PGPS].topic.utf8,
.topic.len = pub_topics[APP_PUB_TOPIC_IDX_PGPS].topic.size
};

err = aws_iot_send(&msg);
Expand All @@ -563,7 +562,8 @@ int cloud_wrap_memfault_data_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,
/* <imei>/memfault */
.topic = pub_topics[APP_PUB_TOPIC_IDX_MEMFAULT]
.topic.str = pub_topics[APP_PUB_TOPIC_IDX_MEMFAULT].topic.utf8,
.topic.len = pub_topics[APP_PUB_TOPIC_IDX_MEMFAULT].topic.size
};

err = aws_iot_send(&msg);
Expand Down

0 comments on commit b47f5c7

Please sign in to comment.