From 365ec66c791a6fd32549f894c06baf8c2af0eac0 Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 18 Feb 2020 17:33:52 +0100 Subject: [PATCH 1/2] Ethernet temporary disabled (suspend web server task) --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 43ff883d93..39e224ab9e 100644 --- a/src/main.c +++ b/src/main.c @@ -1003,7 +1003,7 @@ void StartIdleTask(void const *argument) { /* USER CODE END Header_StartWebServerTask */ void StartWebServerTask(void const *argument) { /* USER CODE BEGIN StartWebServerTask */ - // osThreadSuspend(0); + osThreadSuspend(0); MX_LWIP_Init(); lwsapi_init(); /* Infinite loop */ From f6a6552cfc2e07b1e4493a81c9f614fd5ad3437e Mon Sep 17 00:00:00 2001 From: Robert Pelnar Date: Tue, 18 Feb 2020 17:53:10 +0100 Subject: [PATCH 2/2] Firmware version displaying on BSOD fixed. --- src/common/bsod.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/common/bsod.c b/src/common/bsod.c index fc31fafc4a..c0b6ee553f 100644 --- a/src/common/bsod.c +++ b/src/common/bsod.c @@ -115,8 +115,6 @@ extern IWDG_HandleTypeDef hiwdg; //watchdog handle static void get_fw_version(void) { uint8_t FW_version[3]; - uint16_t FW_build = 0; - uint8_t suff_idx = 5; uint16_t fw_parser = FW_VERSION; FW_version[0] = (uint8_t)(fw_parser / 100); @@ -125,15 +123,10 @@ static void get_fw_version(void) { fw_parser -= FW_version[1] * 10; FW_version[2] = (uint8_t)fw_parser; -#ifdef FW_BUILDNR - if (suff_idx < 5) - FW_build = FW_BUILDNR; -#endif - #ifdef PRERELEASE_STR sprintf(FW_version_str, "%d.%d.%d-%s+%d", FW_version[0], FW_version[1], FW_version[2], - PRERELEASE_STR, FW_build); + PRERELEASE_STR, FW_BUILDNR); #else sprintf(FW_version_str, "%d.%d.%d", FW_version[0], FW_version[1], FW_version[2]);