From 7a9158fe8424e142ae8f2e3069d87c66b1e35db7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= Date: Thu, 16 May 2019 16:51:03 +0100 Subject: [PATCH] Add debug messages to most SL events MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Simões --- .../common/Device_BlockStorage-DEBUG.c | 4 +- .../nanoCLR/CC3220SF_CLR-DEBUG.ld | 2 +- .../nanoCLR/targetSimpleLinkCC32xx_Threads.c | 55 ++++++++++++++++--- 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/common/Device_BlockStorage-DEBUG.c b/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/common/Device_BlockStorage-DEBUG.c index e5f0826b41..4e7058d4b9 100644 --- a/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/common/Device_BlockStorage-DEBUG.c +++ b/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/common/Device_BlockStorage-DEBUG.c @@ -11,8 +11,8 @@ const BlockRange BlockRange1[] = { // the 1st block is reserved for the flash header // so we don't take it into account for the map - { BlockRange_BLOCKTYPE_CODE , 0 , 123 }, // 0x01000800 nanoCLR - { BlockRange_BLOCKTYPE_DEPLOYMENT , 124, 510 }, // 0x0103E000 deployment + { BlockRange_BLOCKTYPE_CODE , 0 , 124 }, // 0x01000800 nanoCLR + { BlockRange_BLOCKTYPE_DEPLOYMENT , 125, 510 }, // 0x0103E800 deployment }; const BlockRegionInfo BlockRegions[] = diff --git a/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/nanoCLR/CC3220SF_CLR-DEBUG.ld b/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/nanoCLR/CC3220SF_CLR-DEBUG.ld index 38438475b0..53957bea52 100644 --- a/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/nanoCLR/CC3220SF_CLR-DEBUG.ld +++ b/targets/TI-SimpleLink/TI_CC3220SF_LAUNCHXL/nanoCLR/CC3220SF_CLR-DEBUG.ld @@ -35,7 +35,7 @@ STACKSIZE = 0x800; MEMORY { FLASH_HDR (RX) : ORIGIN = 0x01000000, LENGTH = 0x7FF - FLASH (RX) : ORIGIN = 0x01000800, LENGTH = 0x03E000 + FLASH (RX) : ORIGIN = 0x01000800, LENGTH = 0x03E800 SRAM (RWX) : ORIGIN = 0x20000000, LENGTH = 0x00040000 } diff --git a/targets/TI-SimpleLink/nanoCLR/targetSimpleLinkCC32xx_Threads.c b/targets/TI-SimpleLink/nanoCLR/targetSimpleLinkCC32xx_Threads.c index 960cad6dd5..0437f73919 100644 --- a/targets/TI-SimpleLink/nanoCLR/targetSimpleLinkCC32xx_Threads.c +++ b/targets/TI-SimpleLink/nanoCLR/targetSimpleLinkCC32xx_Threads.c @@ -48,7 +48,6 @@ extern void ConfigUART(); #define SL_STOP_TIMEOUT (200) #define SPAWN_TASK_PRIORITY (9) -#define NF_TASK_PRIORITY (5) #define TASK_STACK_SIZE (2048) #define SLNET_IF_WIFI_PRIO (5) @@ -144,9 +143,11 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent) if(SL_WLAN_DISCONNECT_USER_INITIATED == pEventData->ReasonCode) { + UART_PRINT("[WLAN EVENT]Device disconnected from the AP"); } else { + UART_PRINT("[WLAN ERROR]Device disconnected from the AP"); } // memset(nF_ControlBlock.connectionSSID, 0, // sizeof(nF_ControlBlock.connectionSSID)); @@ -159,24 +160,37 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent) case SL_WLAN_EVENT_STA_ADDED: { + UART_PRINT( + "[WLAN EVENT] External Station connected to SimpleLink AP\r\n"); + + UART_PRINT("[WLAN EVENT] STA BSSID: %02x:%02x:%02x:%02x:%02x:%02x\r\n", + pWlanEvent->Data.STAAdded.Mac[0], + pWlanEvent->Data.STAAdded.Mac[1], + pWlanEvent->Data.STAAdded.Mac[2], + pWlanEvent->Data.STAAdded.Mac[3], + pWlanEvent->Data.STAAdded.Mac[4], + pWlanEvent->Data.STAAdded.Mac[5]); } break; case SL_WLAN_EVENT_STA_REMOVED: { + UART_PRINT( + "[WLAN EVENT] External Station disconnected from SimpleLink AP\r\n"); } break; case SL_WLAN_EVENT_PROVISIONING_PROFILE_ADDED: { + UART_PRINT("[WLAN EVENT] Profile Added\r\n"); } break; case SL_WLAN_EVENT_PROVISIONING_STATUS: { - uint16_t Status = + uint16_t status = pWlanEvent->Data.ProvisioningStatus.ProvisioningStatus; - switch(Status) + switch(status) { case SL_WLAN_PROVISIONING_GENERAL_ERROR: case SL_WLAN_PROVISIONING_ERROR_ABORT: @@ -189,24 +203,27 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent) case SL_WLAN_PROVISIONING_ERROR_ABORT_HTTP_SERVER_DISABLED: case SL_WLAN_PROVISIONING_ERROR_ABORT_PROFILE_LIST_FULL: { + UART_PRINT("[WLAN EVENT] Provisioning Error status=%d\r\n", status); // SignalProvisioningEvent(PrvnEvent_StartFailed); } break; case SL_WLAN_PROVISIONING_ERROR_ABORT_PROVISIONING_ALREADY_STARTED: { - + UART_PRINT("[WLAN EVENT] Provisioning already started"); } break; case SL_WLAN_PROVISIONING_CONFIRMATION_STATUS_FAIL_NETWORK_NOT_FOUND: { + UART_PRINT("[WLAN EVENT] Confirmation fail: network not found\r\n"); // SignalProvisioningEvent(PrvnEvent_ConfirmationFailed); } break; case SL_WLAN_PROVISIONING_CONFIRMATION_STATUS_FAIL_CONNECTION_FAILED: { + UART_PRINT("[WLAN EVENT] Confirmation fail: Connection failed\r\n"); // SignalProvisioningEvent(PrvnEvent_ConfirmationFailed); } break; @@ -214,25 +231,33 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent) case SL_WLAN_PROVISIONING_CONFIRMATION_STATUS_CONNECTION_SUCCESS_IP_NOT_ACQUIRED : - { - // SignalProvisioningEvent(PrvnEvent_ConfirmationFailed); - } + { + UART_PRINT( + "[WLAN EVENT] Confirmation fail: IP address not acquired\r\n"); + // SignalProvisioningEvent(PrvnEvent_ConfirmationFailed); + } break; case SL_WLAN_PROVISIONING_CONFIRMATION_STATUS_SUCCESS_FEEDBACK_FAILED: { + UART_PRINT( + "[WLAN EVENT] Connection Success " + "(feedback to Smartphone app failed)\r\n"); // SignalProvisioningEvent(PrvnEvent_ConfirmationFailed); } break; case SL_WLAN_PROVISIONING_CONFIRMATION_STATUS_SUCCESS: { + UART_PRINT("[WLAN EVENT] Confirmation Success!\r\n"); // SignalProvisioningEvent(PrvnEvent_ConfirmationSuccess); } break; case SL_WLAN_PROVISIONING_AUTO_STARTED: { + UART_PRINT("[WLAN EVENT] Auto-Provisioning Started\r\n"); + // stop auto provisioning - // may trigger in case of returning to default // SignalProvisioningEvent(PrvnEvent_Stopped); @@ -243,9 +268,14 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent) { if(ROLE_STA == pWlanEvent->Data.ProvisioningStatus.Role) { + UART_PRINT(" [WLAN EVENT] - WLAN Connection Status:%d\r\n", + pWlanEvent->Data.ProvisioningStatus.WlanStatus); + if(SL_WLAN_STATUS_CONNECTED == pWlanEvent->Data.ProvisioningStatus.WlanStatus) { + UART_PRINT(" [WLAN EVENT] - Connected to SSID:%s\r\n", + pWlanEvent->Data.ProvisioningStatus.Ssid); // memcpy (nF_ControlBlock.connectionSSID, // pWlanEvent->Data.ProvisioningStatus.Ssid, // pWlanEvent->Data.ProvisioningStatus.Ssidlen); @@ -282,6 +312,7 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent) case SL_WLAN_PROVISIONING_SMART_CONFIG_SYNCED: { + UART_PRINT("[WLAN EVENT] Smart Config Synced!\r\n"); } break; @@ -295,6 +326,8 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent) AppStatusBits_Ipv6lAcquired); CLR_STATUS_BIT(nF_ControlBlock.Status, AppStatusBits_Ipv6gAcquired); + + UART_PRINT("[WLAN EVENT] Connection to AP succeeded\r\n"); } break; @@ -302,16 +335,21 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent) { SET_STATUS_BIT(nF_ControlBlock.Status, AppStatusBits_IpAcquired); + + UART_PRINT("[WLAN EVENT] IP address acquired\r\n"); } break; case SL_WLAN_PROVISIONING_SMART_CONFIG_SYNC_TIMEOUT: { + UART_PRINT("[WLAN EVENT] Smart Config Sync timeout\r\n"); } break; default: { + UART_PRINT("[WLAN EVENT] Unknown Provisioning Status: %d\r\n", + pWlanEvent->Data.ProvisioningStatus.ProvisioningStatus); } break; } @@ -320,6 +358,9 @@ void SimpleLinkWlanEventHandler(SlWlanEvent_t *pWlanEvent) default: { + UART_PRINT("[WLAN EVENT] Unexpected event [0x%x]\n\r", + pWlanEvent->Id); + // SignalProvisioningEvent(PrvnEvent_Error); } break;