Skip to content

Commit

Permalink
Merge pull request #235 from XPila/RELEASE-4.0.2+176_dump
Browse files Browse the repository at this point in the history
Release 4.0.3 finalization
  • Loading branch information
XPila authored Feb 19, 2020
2 parents 2e0ec89 + f6a6552 commit d0e742d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
9 changes: 1 addition & 8 deletions src/common/bsod.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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]);
Expand Down
2 changes: 1 addition & 1 deletion src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit d0e742d

Please sign in to comment.