Merge pull request #439 from sonydevworld/develop

Merge develop into master for v2.5.1 release
sonydevworld · May 18, 2022 · dd422f9 · dd422f9
2 parents 959182b + 9d4e056
commit dd422f9
Show file tree

Hide file tree

Showing 24 changed files with 7 additions and 26 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -24,7 +24,7 @@ Below is the workflow, from cloning to merging a pull request.
 4. Keep your fork up-to-date/synced with the remote repository
 5. Commit your changes
 6. Push changes back to the remote on GitHub
-7. Create pull request
+7. Create pull request to "develop" branch
 8. If you get feedback, fix according to comments/discussion and push a new commit
 9. When the review is done and accepted it will be squashed and merged into master by the maintainers
 

diff --git a/externals/websocket/cwebsocket/src/cwebsocket/common.c b/externals/websocket/cwebsocket/src/cwebsocket/common.c
@@ -38,11 +38,11 @@ char* cwebsocket_base64_encode(const unsigned char *input, int length) {
 
 	if ((olen > 1) && (olen <= 128))
 	{
-		char *buff = (char *)malloc(olen);
+		char *buff = (char *)malloc(olen+1);
 		if (buff != NULL)
 		{
-			memcpy(buff, buffer, olen-1); 
-			buff[olen-1] = '\0'; 
+			memcpy(buff, buffer, olen);
+			buff[olen] = '\0';
 			return buff;
 		}
 	}

diff --git a/nuttx b/nuttx
diff --git a/sdk/apps b/sdk/apps
diff --git a/sdk/configs/examples/lte_awsiot/defconfig b/sdk/configs/examples/lte_awsiot/defconfig
@@ -20,7 +20,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/examples/lte_azureiot/defconfig b/sdk/configs/examples/lte_azureiot/defconfig
@@ -21,7 +21,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_CODECS=y

diff --git a/sdk/configs/examples/lte_http_get/defconfig b/sdk/configs/examples/lte_http_get/defconfig
@@ -18,7 +18,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/examples/lte_lwm2m/defconfig b/sdk/configs/examples/lte_lwm2m/defconfig
@@ -27,7 +27,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/examples/lte_modem_log_save/defconfig b/sdk/configs/examples/lte_modem_log_save/defconfig
@@ -18,7 +18,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/examples/lte_mqtt/defconfig b/sdk/configs/examples/lte_mqtt/defconfig
@@ -19,7 +19,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/examples/lte_tls/defconfig b/sdk/configs/examples/lte_tls/defconfig
@@ -19,7 +19,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/examples/lte_websocket/defconfig b/sdk/configs/examples/lte_websocket/defconfig
@@ -20,7 +20,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/examples/lte_websocket_bitbank/defconfig b/sdk/configs/examples/lte_websocket_bitbank/defconfig
@@ -20,7 +20,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/examples/lte_websocket_gmocoin/defconfig b/sdk/configs/examples/lte_websocket_gmocoin/defconfig
@@ -20,7 +20,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/examples/multiwebcam_eth/defconfig b/sdk/configs/examples/multiwebcam_eth/defconfig
@@ -15,7 +15,6 @@
 +EXAMPLES_MULTIWEBCAM=y
 +EXAMPLES_MULTIWEBCAM_USE_HTTPMJPEG=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_NOADDR=y
 +NETINIT_NETLOCAL=y

diff --git a/sdk/configs/examples/sms_recv/defconfig b/sdk/configs/examples/sms_recv/defconfig
@@ -18,7 +18,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/examples/sms_send/defconfig b/sdk/configs/examples/sms_send/defconfig
@@ -18,7 +18,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/examples/wifi_awsiot_gnsslogger/defconfig b/sdk/configs/examples/wifi_awsiot_gnsslogger/defconfig
@@ -15,7 +15,6 @@
 +FSUTILS_INIH=y
 +INIH_MAX_LINE=128
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x08080808
 +NETINIT_NETLOCAL=y

diff --git a/sdk/configs/feature/ethernet/defconfig b/sdk/configs/feature/ethernet/defconfig
@@ -9,7 +9,6 @@
 +CXD56_DMAC_SPI5_TX_MAXSIZE=2051
 +CXD56_WIZNET_SPI5_DMAC=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_NOADDR=y
 +NETINIT_NETLOCAL=y

diff --git a/sdk/configs/feature/lte/defconfig b/sdk/configs/feature/lte/defconfig
@@ -17,7 +17,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/feature/lte_stub_mbedtls/defconfig b/sdk/configs/feature/lte_stub_mbedtls/defconfig
@@ -17,7 +17,6 @@
 +MODEM=y
 +MODEM_ALT1250=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x8080808
 +NETUTILS_WEBCLIENT=y

diff --git a/sdk/configs/feature/wifi/defconfig b/sdk/configs/feature/wifi/defconfig
@@ -9,7 +9,6 @@
 +CXD56_DMAC_SPI5_TX=y
 +DRIVERS_WIRELESS=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x08080808
 +NETINIT_NETLOCAL=y

diff --git a/sdk/configs/feature/wifi_telnetd/defconfig b/sdk/configs/feature/wifi_telnetd/defconfig
@@ -9,7 +9,6 @@
 +CXD56_DMAC_SPI5_TX=y
 +DRIVERS_WIRELESS=y
 +NETDB_DNSCLIENT=y
-+NETDB_DNSCLIENT_MAXRESPONSE=176
 +NETDB_DNSCLIENT_NAMESIZE=255
 +NETDB_DNSSERVER_IPv4ADDR=0x08080808
 +NETINIT_NETLOCAL=y

diff --git a/sdk/tools/mkversion.sh b/sdk/tools/mkversion.sh
@@ -42,7 +42,7 @@ if [ "X${TOPDIR}" = "X" ]; then
 fi
 
 APP_VERSION="0.0.0"
-SDK_VERSION="SDK2.5.0"
+SDK_VERSION="SDK2.5.1"
 if [ -r sdk_version ]; then
     SDK_VERSION="SDK`cat sdk_version`"
 fi
+8 −0		boards/arm/cxd56xx/spresense/src/cxd56_alt1250_power.c
+47 −24		drivers/video/isx012.c
+195 −121		drivers/video/isx019.c
+1 −1		include/lte/lte_lwm2m.h
+3 −9		lte/alt1250/alt1250_daemon.h
+58 −1		lte/alt1250/usock_handlers/alt1250_accepthdlr.c
+1 −1		lte/alt1250/usock_handlers/alt1250_usrsock_hdlr.h