diff --git a/apix-can-examples/can-recv-example.c b/apix-can-examples/can-recv-example.c index bb1ff6c..10631f5 100644 --- a/apix-can-examples/can-recv-example.c +++ b/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;ilen;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); diff --git a/apix-can-examples/can-send-example.c b/apix-can-examples/can-send-example.c index 230e1ad..1d060bb 100644 --- a/apix-can-examples/can-send-example.c +++ b/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; } diff --git a/apix-gpio-example/main.c b/apix-gpio-example/main.c index f707950..b7751e9 100644 --- a/apix-gpio-example/main.c +++ b/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 || - led_ctrl == NULL || led_line < 0) { + if (button_ctrl[0] == '\0' || button_line < 0 || + led_ctrl[0] == '\0' || led_line < 0) { printf("Unable to parse button and led GPIOs\n"); return EXIT_FAILURE; } diff --git a/apix-spi-example/main.c b/apix-spi-example/main.c index 097cd42..713c06c 100644 --- a/apix-spi-example/main.c +++ b/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; } diff --git a/connectcore-demo-example/demoserver.py b/connectcore-demo-example/demoserver.py index caf2b3e..0beca5e 100755 --- a/connectcore-demo-example/demoserver.py +++ b/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(): diff --git a/connectcore-demo-example/index.html b/connectcore-demo-example/index.html index c3599fd..baf0e08 100644 --- a/connectcore-demo-example/index.html +++ b/connectcore-demo-example/index.html @@ -95,7 +95,7 @@ Digi Demo - Dashboard