AT Client Sample

.gitlint

@@ -13,7 +13,7 @@ debug = false
 extra-path=../zephyr/scripts/gitlint
 
 [title-max-length-no-revert]
-line-length=72
+line-length=75
 
 [body-min-line-count]
 min-line-count=1
@@ -22,7 +22,7 @@ min-line-count=1
 max-line-count=200
 
 [title-starts-with-subsystem]
-regex = ^(([^:]+):)(\s([^:]+):)*\s(.+)$
+regex = ^(?!subsys:)(([^:]+):)(\s([^:]+):)*\s(.+)$
 
 [title-must-not-contain-word]
 # Comma-separated list of words that should not occur in the title. Matching is case

CODEOWNERS

@@ -32,12 +32,14 @@
 /include/debug/ppi_trace.h                @nordic-krch
 /include/                                 @anangl @rlubos @pizi-nordic
 /include/bluetooth/                       @joerchan
+/include/bluetooth/mesh/                  @trond-snekvik @joerchan
 /include/drivers/                         @anangl
 /include/net/                             @rlubos
 /include/nfc/                             @anangl @grochu
 /include/shell/                           @nordic-krch @jarz-nordic
 /lib/at_cmd_parser/                       @rlubos
 /lib/at_host/                             @rlubos
+/lib/at_notif/                            @pkchan
 /lib/bsdlib/                              @rlubos
 /lib/modem_info/                          @rlubos
 /lib/pdn_management/                      @rlubos
@@ -57,10 +59,12 @@ subsys/debug/CMakeLists.txt               @nordic-krch
 /scripts/                                 @mbolivar @tejlmand
 /scripts/hid_configurator/                @pdunaj
 /subsys/bluetooth/                        @joerchan @carlescufi
+/subsys/bluetooth/mesh/                   @trond-snekvik @joerchan
 /subsys/bootloader/                       @hakonfam @ioannisg
+/subsys/dfu/                              @hakonfam @sigvartmh
 /subsys/enhanced_shockburst/              @Raane @lemrey
 /subsys/event_manager/                    @pdunaj
-/subsys/fw_metadata/                      @hakonfam
+/subsys/fw_info/                          @hakonfam
 /subsys/net/                              @rlubos
 /subsys/nfc/                              @grochu @anangl
 /subsys/partition_manager/                @hakonfam

applications/asset_tracker/CMakeLists.txt

@@ -23,6 +23,7 @@ zephyr_library_include_directories(
   src/ui
   src/cloud_codec
   src/env_sensors
+  src/light_sensor
   )
 
 # Application sources
@@ -31,6 +32,7 @@ add_subdirectory(src/ui)
 add_subdirectory(src/cloud_codec)
 add_subdirectory(src/gps_controller)
 add_subdirectory(src/env_sensors)
+add_subdirectory_ifdef(CONFIG_LIGHT_SENSOR src/light_sensor)
 
 if (CONFIG_USE_BME680_BSEC)
   target_link_libraries(app PUBLIC bsec_lib)

applications/asset_tracker/Kconfig

@@ -233,6 +233,18 @@ config CLOUD_UA_CONSOLE
 
 endchoice
 
+config CLOUD_FOTA_APP
+	bool "Enable firmware over-the-air upgrades for application"
+	depends on AWS_FOTA
+	depends on DFU_TARGET_MCUBOOT
+	default y
+
+config CLOUD_FOTA_MODEM
+	bool "Enable firmware over-the-air upgrades for modem"
+	depends on AWS_FOTA
+	depends on DFU_TARGET_MODEM
+	default y
+
 endmenu # Cloud
 
 menu "Environment sensors"
@@ -323,6 +335,27 @@ endif
 
 endmenu # Environment sensors
 
+menuconfig LIGHT_SENSOR
+	bool "Light sensor"
+	select BH1749 if BOARD_NRF9160_PCA20035NS
+	default y if BOARD_NRF9160_PCA20035NS
+
+if LIGHT_SENSOR
+
+config LIGHT_SENSOR_DEV_NAME
+	string "Light sensor device name"
+	default "BH1749" if BOARD_NRF9160_PCA20035NS
+
+config LIGHT_SENSOR_DATA_SEND_INTERVAL
+	int "Interval in seconds for sending light sensor data"
+	default 60
+	help
+	  Interval between each sampling and sending of light sensor data.
+	  If the GPS is active, sensor data will not be sent before it is
+	  stopped. The unit is seconds.
+
+endif # LIGHT_SENSOR
+
 config USE_AT_HOST
 	bool "Enable AT commands"
 	default y

applications/asset_tracker/README.rst

@@ -76,7 +76,6 @@ LED 3 and LED 4:
     Application state indicated by LEDs
 
 All LEDs (1-4):
-    * Blinking simultaneously: Irrecoverable error in the BSD library.
     * Blinking in groups of two (LED 1 and 3, LED 2 and 4): Recoverable error in the BSD library.
     * Blinking in cross pattern (LED 1 and 4, LED 2 and 3): Communication error with the nRF Cloud.
 

applications/asset_tracker/prj.conf

@@ -18,11 +18,6 @@ CONFIG_NET_NATIVE=n
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_OFFLOAD=y
 
-# MQTT
-CONFIG_MQTT_SOCKET_LIB=y
-CONFIG_MQTT_LIB_TLS=y
-CONFIG_MQTT_MAX_PACKET_LENGTH=2048
-
 # LTE link control
 CONFIG_POWER_OPTIMIZATION_ENABLE=n
 CONFIG_LTE_LINK_CONTROL=y
@@ -81,3 +76,22 @@ CONFIG_HEAP_MEM_POOL_SIZE=16384
 CONFIG_MAIN_STACK_SIZE=8192
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
 CONFIG_HW_STACK_PROTECTION=y
+
+# MCUBOOT
+CONFIG_BOOTLOADER_MCUBOOT=y
+CONFIG_IMG_MANAGER=y
+CONFIG_MCUBOOT_IMG_MANAGER=y
+
+# Flash
+CONFIG_FLASH=y
+
+# AWS FOTA
+CONFIG_AWS_FOTA=y
+CONFIG_AWS_FOTA_LOG_LEVEL_DBG=y
+CONFIG_AWS_JOBS_LOG_LEVEL_DBG=y
+CONFIG_AWS_FOTA_VERSION_STRING_MAX_LEN=128
+CONFIG_DFU_TARGET=y
+
+# Download client (needed by AWS FOTA)
+CONFIG_DOWNLOAD_CLIENT=y
+CONFIG_DOWNLOAD_CLIENT_STACK_SIZE=4096

applications/asset_tracker/prj_nrf9160_pca20035ns.conf

@@ -18,11 +18,6 @@ CONFIG_NET_NATIVE=n
 CONFIG_NET_SOCKETS=y
 CONFIG_NET_SOCKETS_OFFLOAD=y
 
-# MQTT
-CONFIG_MQTT_SOCKET_LIB=y
-CONFIG_MQTT_LIB_TLS=y
-CONFIG_MQTT_MAX_PACKET_LENGTH=2048
-
 # LTE link control
 CONFIG_POWER_OPTIMIZATION_ENABLE=n
 CONFIG_LTE_LINK_CONTROL=y
@@ -116,3 +111,14 @@ CONFIG_MPU_ALLOW_FLASH_WRITE=y
 CONFIG_BOOTLOADER_MCUBOOT=y
 CONFIG_IMG_MANAGER=y
 CONFIG_MCUBOOT_IMG_MANAGER=y
+
+# AWS FOTA
+CONFIG_AWS_FOTA=y
+CONFIG_AWS_FOTA_LOG_LEVEL_DBG=y
+CONFIG_AWS_JOBS_LOG_LEVEL_DBG=y
+CONFIG_AWS_FOTA_VERSION_STRING_MAX_LEN=128
+CONFIG_DFU_TARGET=y
+
+# Download client (needed by AWS FOTA)
+CONFIG_DOWNLOAD_CLIENT=y
+CONFIG_DOWNLOAD_CLIENT_STACK_SIZE=4096

applications/asset_tracker/prj_qemu_x86.conf

@@ -33,9 +33,6 @@ CONFIG_CONSOLE_SUBSYS=y
 CONFIG_CONSOLE_HANDLER=y
 CONFIG_CONSOLE_GETCHAR=y
 
-CONFIG_MQTT_SOCKET_LIB=y
-CONFIG_MQTT_MAX_PACKET_LENGTH=2048
-CONFIG_MQTT_LIB_TLS=y
 CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
 
 # TLS configuration

applications/asset_tracker/src/cloud_codec/CMakeLists.txt

@@ -6,3 +6,4 @@
 
 zephyr_include_directories(.)
 target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cloud_codec.c)
+target_sources(app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/service_info.c)

applications/asset_tracker/src/cloud_codec/cloud_codec.c

@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: LicenseRef-BSD-5-Clause-Nordic
  */
 
-
 #include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
@@ -185,18 +184,16 @@ static CMD_NEW_GROUP(group_get, CLOUD_CMD_GROUP_GET, CMD_ARRAY(
 );
 
 static const char *const channel_type_str[] = {
-	[CLOUD_CHANNEL_GPS] = "GPS",
-	[CLOUD_CHANNEL_FLIP] = "FLIP",
-	[CLOUD_CHANNEL_BUTTON] = "BUTTON",
-	[CLOUD_CHANNEL_TEMP] = "TEMP",
-	[CLOUD_CHANNEL_HUMID] = "HUMID",
-	[CLOUD_CHANNEL_AIR_PRESS] = "AIR_PRESS",
-	[CLOUD_CHANNEL_AIR_QUAL] = "AIR_QUAL",
-	[CLOUD_CHANNEL_LTE_LINK_RSRP] = "RSRP",
-	/* The "device" is intended for the shadow, which expects its objects
-	 * to have lowercase keys.
-	 */
-	[CLOUD_CHANNEL_DEVICE_INFO] = "device",
+	[CLOUD_CHANNEL_GPS] = CLOUD_CHANNEL_STR_GPS,
+	[CLOUD_CHANNEL_FLIP] = CLOUD_CHANNEL_STR_FLIP,
+	[CLOUD_CHANNEL_BUTTON] = CLOUD_CHANNEL_STR_BUTTON,
+	[CLOUD_CHANNEL_TEMP] = CLOUD_CHANNEL_STR_TEMP,
+	[CLOUD_CHANNEL_HUMID] = CLOUD_CHANNEL_STR_HUMID,
+	[CLOUD_CHANNEL_AIR_PRESS] = CLOUD_CHANNEL_STR_AIR_PRESS,
+	[CLOUD_CHANNEL_AIR_QUAL] = CLOUD_CHANNEL_STR_AIR_QUAL,
+	[CLOUD_CHANNEL_LTE_LINK_RSRP] = CLOUD_CHANNEL_STR_LTE_LINK_RSRP,
+	[CLOUD_CHANNEL_DEVICE_INFO] = CLOUD_CHANNEL_STR_DEVICE_INFO,
+	[CLOUD_CHANNEL_LIGHT_SENSOR] = CLOUD_CHANNEL_STR_LIGHT_SENSOR,
 };
 
 static cloud_cmd_cb_t cloud_command_cb;
@@ -460,3 +457,28 @@ int cloud_encode_env_sensors_data(const env_sensor_data_t *sensor_data,
 
 	return cloud_encode_data(&cloud_sensor, output);
 }
+
+#if CONFIG_LIGHT_SENSOR
+/* 4 32-bit ints, 3 spaces, NULL */
+#define LIGHT_SENSOR_DATA_STRING_MAX_LEN ((4 * 11) + 3 + 1)
+int cloud_encode_light_sensor_data(const struct light_sensor_data *sensor_data,
+				   struct cloud_msg *output)
+{
+	char buf[LIGHT_SENSOR_DATA_STRING_MAX_LEN];
+	u8_t len;
+	struct cloud_channel_data cloud_sensor;
+
+	if ((sensor_data == NULL) || (output == NULL)) {
+		return -EINVAL;
+	}
+
+	len = snprintf(buf, sizeof(buf), "%d %d %d %d", sensor_data->red,
+		       sensor_data->green, sensor_data->blue, sensor_data->ir);
+
+	cloud_sensor.data.buf = buf;
+	cloud_sensor.data.len = len;
+	cloud_sensor.type = CLOUD_CHANNEL_LIGHT_SENSOR;
+
+	return cloud_encode_data(&cloud_sensor, output);
+}
+#endif /* CONFIG_LIGHT_SENSOR */

applications/asset_tracker/src/cloud_codec/cloud_codec.h

@@ -13,8 +13,9 @@
 #ifndef CLOUD_CODEC_H__
 #define CLOUD_CODEC_H__
 
-#include "env_sensors.h"
 #include <net/cloud.h>
+#include "env_sensors.h"
+#include "light_sensor.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,8 +49,24 @@ enum cloud_channel {
 	CLOUD_CHANNEL_LTE_LINK_RSRP,
 	/** The descriptive DEVICE data indicating its status. */
 	CLOUD_CHANNEL_DEVICE_INFO,
+	/** The RBG IR light levels on the device. */
+	CLOUD_CHANNEL_LIGHT_SENSOR,
 };
 
+#define CLOUD_CHANNEL_STR_GPS "GPS"
+#define CLOUD_CHANNEL_STR_FLIP "FLIP"
+#define CLOUD_CHANNEL_STR_BUTTON "BUTTON"
+#define CLOUD_CHANNEL_STR_TEMP "TEMP"
+#define CLOUD_CHANNEL_STR_HUMID "HUMID"
+#define CLOUD_CHANNEL_STR_AIR_PRESS "AIR_PRESS"
+#define CLOUD_CHANNEL_STR_AIR_QUAL "AIR_QUAL"
+#define CLOUD_CHANNEL_STR_LTE_LINK_RSRP "RSRP"
+/* The "device" is intended for the shadow, which expects its objects
+ * to have lowercase keys.
+ */
+#define CLOUD_CHANNEL_STR_DEVICE_INFO "device"
+#define CLOUD_CHANNEL_STR_LIGHT_SENSOR "LIGHT"
+
 struct cloud_data {
 	char *buf;
 	size_t len;
@@ -164,6 +181,11 @@ static inline void cloud_release_data(struct cloud_msg *data)
 int cloud_encode_env_sensors_data(const env_sensor_data_t *sensor_data,
 				  struct cloud_msg *output);
 
+#if CONFIG_LIGHT_SENSOR
+int cloud_encode_light_sensor_data(const struct light_sensor_data *sensor_data,
+				   struct cloud_msg *output);
+#endif /* CONFIG_LIGHT_SENSOR */
+
 /**
  * @}
  */

applications/asset_tracker/src/cloud_codec/service_info.c

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: LicenseRef-BSD-5-Clause-Nordic
+ */
+#include <stdio.h>
+#include "service_info.h"
+
+#define SERVICE_INFO_JSON_NAME "serviceInfo"
+#define UI_JSON_NAME "ui"
+#define FOTAS_JSON_NAME "fota_v"
+#define FOTAS_JSON_NAME_SIZE (sizeof(FOTAS_JSON_NAME) + 5)
+
+static int add_array_obj(const char * const items[], const u32_t item_cnt,
+			 const char * const item_name, cJSON * const obj)
+{
+	cJSON *obj_to_add = NULL;
+	cJSON *str = NULL;
+
+	if ((obj == NULL) || (item_name == NULL)) {
+		return -EINVAL;
+	}
+
+	obj_to_add = cJSON_CreateArray();
+	if (obj_to_add == NULL) {
+		return -ENOMEM;
+	}
+
+	for (u32_t cnt = 0; cnt < item_cnt; ++cnt) {
+		if (items[cnt] != NULL) {
+			str = cJSON_CreateString(items[cnt]);
+			if (str == NULL) {
+				cJSON_Delete(obj_to_add);
+				return -ENOMEM;
+			}
+			cJSON_AddItemToArray(obj_to_add, str);
+		}
+	}
+
+	/* if no strings were added, use NULL object */
+	if (cJSON_GetArraySize(obj_to_add) == 0) {
+		obj_to_add->type = cJSON_NULL;
+	}
+
+	cJSON_AddItemToObject(obj, item_name, obj_to_add);
+
+	return 0;
+}
+
+int service_info_json_object_encode(
+	const char * const ui[], const u32_t ui_count, const char * const fota[],
+	const u32_t fota_count, const u16_t fota_version, cJSON * const obj_out)
+{
+	int err = 0;
+	cJSON *service_info_obj = NULL;
+	char fota_name[FOTAS_JSON_NAME_SIZE];
+
+	if ((obj_out == NULL) || ((ui == NULL) && ui_count) ||
+	    ((fota == NULL) && fota_count)) {
+		return -EINVAL;
+	}
+
+	service_info_obj = cJSON_CreateObject();
+	if (service_info_obj == NULL) {
+		return -ENOMEM;
+	}
+
+	if (!err) {
+		err = add_array_obj(ui, ui_count, UI_JSON_NAME,
+				    service_info_obj);
+	}
+
+	if (!err) {
+		snprintf(fota_name, sizeof(fota_name), "%s%hu", FOTAS_JSON_NAME,
+			 fota_version);
+		err = add_array_obj(fota, fota_count, fota_name,
+				    service_info_obj);
+	}
+
+	if (!err) {
+		cJSON_AddItemToObject(obj_out, SERVICE_INFO_JSON_NAME,
+				      service_info_obj);
+	} else {
+		cJSON_Delete(service_info_obj);
+	}
+
+	return err;
+}