examples: Add some more log output

u-blox · Feb 8, 2024 · 6cfc951 · 6cfc951
1 parent b5938b9
commit 6cfc951
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 2 deletions.
diff --git a/examples/http_example.c b/examples/http_example.c
@@ -146,6 +146,12 @@ int main(int argc, char **argv)
     const char *pDevice = U_EXAMPLE_UART;
     const char *pSsid = U_EXAMPLE_SSID;
     const char *pWpaPsk = U_EXAMPLE_WPA_PSK;
+
+    if (*pWpaPsk == 0) {
+        U_CX_LOG_LINE(U_CX_LOG_CH_WARN, "Wi-Fi not configured - connection will not work")
+        U_CX_LOG_LINE(U_CX_LOG_CH_WARN,
+            "- You need to define U_EXAMPLE_UART, U_EXAMPLE_SSID & U_EXAMPLE_WPA_PSK.")
+    }
 #endif
 
     U_CX_MUTEX_CREATE(gUrcSem);

diff --git a/examples/http_example_no_os.c b/examples/http_example_no_os.c
@@ -127,6 +127,12 @@ int main(int argc, char **argv)
     const char *pSsid = U_EXAMPLE_SSID;
     const char *pWpaPsk = U_EXAMPLE_WPA_PSK;
 
+    if (*pWpaPsk == 0) {
+        U_CX_LOG_LINE(U_CX_LOG_CH_WARN, "Wi-Fi not configured - connection will not work")
+        U_CX_LOG_LINE(U_CX_LOG_CH_WARN,
+            "- You need to define U_EXAMPLE_UART, U_EXAMPLE_SSID & U_EXAMPLE_WPA_PSK.")
+    }
+
     uPortAtInit(&client);
     if (!uPortAtOpen(&client, pDevice, 115200, true)) {
         return 1;

diff --git a/examples/port/u_port_no_os.c b/examples/port/u_port_no_os.c
@@ -197,6 +197,10 @@ bool uPortAtOpen(uCxAtClient_t *pClient, const char *pDevName, int baudRate, boo
     assert(pClient->pConfig != NULL);
     assert(pCtx != NULL);
     assert(pCtx->uartFd == -1);
+
+    U_CX_LOG_LINE(U_CX_LOG_CH_DBG, "Opening %s at %d with %s flow control",
+                  pDevName, baudRate, useFlowControl ? "CTS/RTS" : "no");
+
     gUartFd = openUart(pDevName, baudRate, useFlowControl);
     if (gUartFd < 0) {
         U_CX_LOG_LINE(U_CX_LOG_CH_ERROR, "Failed to open UART");
@@ -212,6 +216,8 @@ void uPortAtClose(uCxAtClient_t *pClient)
     uPortContext_t *pCtx = pClient->pConfig->pStreamHandle;
     assert(pCtx->uartFd != -1);
 
+    U_CX_LOG_LINE(U_CX_LOG_CH_DBG, "Closing UART");
+
     close(pCtx->uartFd);
     pCtx->uartFd = -1;
 }

diff --git a/examples/port/u_port_no_os.h b/examples/port/u_port_no_os.h
@@ -63,7 +63,7 @@
 #endif
 
 #ifndef U_EXAMPLE_WPA_PSK
-# define U_EXAMPLE_WPA_PSK "fooooooo"
+# define U_EXAMPLE_WPA_PSK ""
 #endif
 
 /* ----------------------------------------------------------------

diff --git a/examples/port/u_port_posix.c b/examples/port/u_port_posix.c
@@ -235,6 +235,10 @@ bool uPortAtOpen(uCxAtClient_t *pClient, const char *pDevName, int baudRate, boo
     assert(pClient->pConfig != NULL);
     assert(pCtx != NULL);
     assert(pCtx->uartFd == -1);
+
+    U_CX_LOG_LINE(U_CX_LOG_CH_DBG, "Opening %s at %d with %s flow control",
+                  pDevName, baudRate, useFlowControl ? "CTS/RTS" : "no");
+
     gUartFd = openUart(pDevName, baudRate, useFlowControl);
     if (gUartFd < 0) {
         U_CX_LOG_LINE(U_CX_LOG_CH_ERROR, "Failed to open UART");
@@ -260,6 +264,8 @@ void uPortAtClose(uCxAtClient_t *pClient)
     assert(pCtx->uartFd != -1);
     assert(!pCtx->terminateRxTask);
 
+    U_CX_LOG_LINE(U_CX_LOG_CH_DBG, "Closing UART");
+
     // Terminate the RX task
     pCtx->terminateRxTask = true;
     pthread_join(pCtx->rxThread, NULL);

diff --git a/examples/port/u_port_zephyr.c b/examples/port/u_port_zephyr.c
@@ -191,6 +191,9 @@ bool uPortAtOpen(uCxAtClient_t *pClient, const char *pDevName, int baudRate, boo
     U_CX_AT_PORT_ASSERT(pCtx != NULL);
     U_CX_AT_PORT_ASSERT(pCtx->pUartDev == NULL);
 
+    U_CX_LOG_LINE(U_CX_LOG_CH_DBG, "Opening %s at %d with %s flow control",
+                  pDevName, baudRate, useFlowControl ? "CTS/RTS" : "no");
+
     pCtx->pUartDev = device_get_binding(pDevName);
     if (pCtx->pUartDev == NULL) {
         U_CX_LOG_LINE(U_CX_LOG_CH_ERROR, "Failed to open UART %s", pDevName);
@@ -220,6 +223,8 @@ void uPortAtClose(uCxAtClient_t *pClient)
     uPortContext_t *pCtx = pClient->pConfig->pStreamHandle;
     U_CX_AT_PORT_ASSERT(pCtx->pUartDev != NULL);
 
+    U_CX_LOG_LINE(U_CX_LOG_CH_DBG, "Closing UART");
+
     uart_irq_rx_disable(pCtx->pUartDev);
     k_work_cancel(&pCtx->rxWork);
     pCtx->pUartDev = NULL;

diff --git a/examples/port/u_port_zephyr.h b/examples/port/u_port_zephyr.h
@@ -62,7 +62,7 @@
 #endif
 
 #ifndef U_EXAMPLE_WPA_PSK
-# define U_EXAMPLE_WPA_PSK "fooooooo"
+# define U_EXAMPLE_WPA_PSK ""
 #endif
 
 /* ----------------------------------------------------------------