Merge branch 'master' into dey-5.0/maint

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>

apix-can-examples/can-recv-example.c

@@ -34,6 +34,12 @@ static bool running = true;
 static bool prn_msg_info = false;
 static bool prn_msg_count = false;
 
+/* Default CAN filter if not specified in command line */
+static struct can_filter deffilter = {
+	.can_id = 0,
+	.can_mask = 0
+};
+
 /*
  * usage_and_exit() - Show usage information and exit with 'exitval' return
  *		      value
@@ -124,12 +130,12 @@ static void can_rx_callback(struct canfd_frame *frame, struct timeval *tv)
 
 	if (prn_msg_info) {
 		printf(
-			" - Time:        %ld.%06ld\n"
+			" - Time:        %llu.%06llu\n"
 			" - Type:        %s\n"
 			" - ID:          %x\n"
 			" - Data length: %u\n"
 			" - Data:        "
-			,tv->tv_sec, tv->tv_usec, ldx_can_is_extid_frame(frame) ?
+			, (unsigned long long)tv->tv_sec, (unsigned long long)tv->tv_usec, ldx_can_is_extid_frame(frame) ?
 			"Extended ID" : "Standard ID", ldx_can_get_id(frame), frame->len);
 
 		for (i=0;i<frame->len;i++) {
@@ -207,16 +213,12 @@ static int parse_filters(char *str, struct can_filter **cfilter, int *nfilters)
 int main(int argc, char **argv)
 {
 	char *name = basename(argv[0]);
-	char *iface;
+	char *iface = NULL;
 	can_if_cfg_t ifcfg;
 	int nfilters = 0;
 	int opt;
 	int ret;
 	float sp = 0.0;
-	struct can_filter deffilter;
-
-	deffilter.can_id = 0;
-	deffilter.can_mask = 0;
 
 	if (argc <= 3) {
 		usage_and_exit(name, EXIT_FAILURE);
@@ -277,6 +279,10 @@ int main(int argc, char **argv)
 		}
 	}
 
+	if (!iface) {
+		fprintf(stderr, "Error: CAN interface not specified\n");
+		return EXIT_FAILURE;
+	}
 	printf("Requesting CAN interface %s... ", iface);
 
 	can_if = ldx_can_request_by_name(iface);

apix-can-examples/can-send-example.c

@@ -177,7 +177,7 @@ void update_msg(struct canfd_frame *frame, uint32_t id, uint8_t dlc, uint8_t fla
 int main(int argc, char **argv)
 {
 	char *name = basename(argv[0]);
-	char *iface;
+	char *iface = NULL;
 	can_if_cfg_t ifcfg;
 	int opt;
 	int ret;
@@ -262,10 +262,13 @@ int main(int argc, char **argv)
 		}
 	}
 
+	if (!iface) {
+		fprintf(stderr, "Error: CAN interface not specified\n");
+		return EXIT_FAILURE;
+	}
 	printf("Requesting CAN interface %s... ", iface);
 
 	can_if = ldx_can_request_by_name(iface);
-
 	if (!can_if) {
 		printf("ERROR\n");
 		return EXIT_FAILURE;
@@ -304,7 +307,7 @@ int main(int argc, char **argv)
 		}
 
 		if (!retries) {
-			printf("Failed to send CAN frame after %d tries\n", ret);
+			printf("Failed to send CAN frame after %d tries\n", TX_RETRIES);
 			goto error;
 		}
 

apix-gpio-example/main.c

@@ -163,8 +163,8 @@ int main(int argc, char *argv[])
 		usage_and_exit(name, EXIT_FAILURE);
 	}
 
-	if (button_ctrl == NULL || button_line < 0 ||
+	if (button_ctrl[0] == '\0' || button_line < 0 ||
-		led_ctrl == NULL || led_line < 0) {
+		led_ctrl[0] == '\0' || led_line < 0) {
 		printf("Unable to parse button and led GPIOs\n");
 		return EXIT_FAILURE;
 	}

apix-spi-example/main.c

@@ -281,6 +281,8 @@ static int read_page(int page_index, uint8_t* data)
 	read_data = (uint8_t *)calloc(page_size + OPERATION_BYTES + address_bytes,
 			  sizeof(uint8_t));
 	if (write_data == NULL || read_data == NULL) {
+		free(write_data);
+		free(read_data);
 		printf("Unable to allocate memory to read the page.");
 		return EXIT_FAILURE;
 	}

connectcore-demo-example/demoserver.py

@@ -1304,7 +1304,7 @@ def get_dey_version():
     Returns:
         String: DEY version, "N/A" if it fails.
     """
-    build_info = read_file("/etc/build")
+    build_info = read_file("/etc/buildinfo")
     if build_info == NOT_AVAILABLE:
         return NOT_AVAILABLE
     for line in build_info.splitlines():

connectcore-demo-example/index.html

@@ -95,7 +95,7 @@ Digi Demo - Dashboard
             </ul>
 
                 <ul id="collapsator" class="list-group">
-                    <a href="#top" data-toggle="sidebar-collapse" class="list-group-item list-group-item-action d-flex align-items-center">
+                    <a data-toggle="sidebar-collapse" class="list-group-item list-group-item-action d-flex align-items-center">
                         <div class="d-flex w-100 justify-content-start align-items-center">
                             <span id="collapse-icon" class="digi-menu-icon fas fa-fw fa-lg mr-3"></span>
                             <span id="collapse-text" class="menu-collapsed">Collapse</span>

connectcore-demo-example/management.html

@@ -95,7 +95,7 @@ Digi Demo - Management
             </ul>
 
                 <ul id="collapsator" class="list-group">
-                    <a href="#top" data-toggle="sidebar-collapse" class="list-group-item list-group-item-action d-flex align-items-center">
+                    <a data-toggle="sidebar-collapse" class="list-group-item list-group-item-action d-flex align-items-center">
                         <div class="d-flex w-100 justify-content-start align-items-center">
                             <span id="collapse-icon" class="digi-menu-icon fas fa-fw fa-lg mr-3"></span>
                             <span id="collapse-text" class="menu-collapsed">Collapse</span>

connectcore-demo-example/multimedia.html

@@ -95,7 +95,7 @@ Digi Demo - Multimedia
             </ul>
 
                 <ul id="collapsator" class="list-group">
-                    <a href="#top" data-toggle="sidebar-collapse" class="list-group-item list-group-item-action d-flex align-items-center">
+                    <a data-toggle="sidebar-collapse" class="list-group-item list-group-item-action d-flex align-items-center">
                         <div class="d-flex w-100 justify-content-start align-items-center">
                             <span id="collapse-icon" class="digi-menu-icon fas fa-fw fa-lg mr-3"></span>
                             <span id="collapse-text" class="menu-collapsed">Collapse</span>

connectcore-demo-example/network.html

@@ -95,7 +95,7 @@ Digi Demo - Network
             </ul>
 
                 <ul id="collapsator" class="list-group">
-                    <a href="#top" data-toggle="sidebar-collapse" class="list-group-item list-group-item-action d-flex align-items-center">
+                    <a data-toggle="sidebar-collapse" class="list-group-item list-group-item-action d-flex align-items-center">
                         <div class="d-flex w-100 justify-content-start align-items-center">
                             <span id="collapse-icon" class="digi-menu-icon fas fa-fw fa-lg mr-3"></span>
                             <span id="collapse-text" class="menu-collapsed">Collapse</span>

connectcore-demo-example/npu.html

@@ -95,7 +95,7 @@ Digi Demo - NPU
             </ul>
 
                 <ul id="collapsator" class="list-group">
-                    <a href="#top" data-toggle="sidebar-collapse" class="list-group-item list-group-item-action d-flex align-items-center">
+                    <a data-toggle="sidebar-collapse" class="list-group-item list-group-item-action d-flex align-items-center">
                         <div class="d-flex w-100 justify-content-start align-items-center">
                             <span id="collapse-icon" class="digi-menu-icon fas fa-fw fa-lg mr-3"></span>
                             <span id="collapse-text" class="menu-collapsed">Collapse</span>