From 3bb9bf694e3263adf56ae10a097c39f4df5d669f Mon Sep 17 00:00:00 2001 From: Marcel Peterkau Date: Wed, 27 Sep 2023 09:59:35 +0200 Subject: [PATCH] fixed some warnings --- Software/platformio.ini | 8 ++++---- Software/prepare_fwfiles.py | 2 +- Software/src/debugger.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Software/platformio.ini b/Software/platformio.ini index feb088b..ddf4dae 100644 --- a/Software/platformio.ini +++ b/Software/platformio.ini @@ -46,7 +46,7 @@ lib_deps = [env:pcb_rev_1-3] ;build_type = debug -pcb_revision = 3 +custom_pcb_revision = 3 build_flags = ${env.build_flags} ;-DFEATURE_ENABLE_WIFI_CLIENT @@ -56,7 +56,7 @@ build_flags = -DFEATURE_ENABLE_WEBSOCKETS -DFEATURE_ENABLE_CAN -DCAN_DEBUG_MESSAGE - -DPCB_REV=${this.pcb_revision} + -DPCB_REV=${this.custom_pcb_revision} board_build.ldscript = eagle.flash.4m1m.ld @@ -67,14 +67,14 @@ lib_deps = [env:pcb_rev_1-2] ;build_type = debug -pcb_revision = 2 +custom_pcb_revision = 2 build_flags = ${env.build_flags} ;-DFEATURE_ENABLE_WIFI_CLIENT ;-DFEATURE_ENABLE_TIMER -DFEATURE_ENABLE_OLED -DFEATURE_ENABLE_WEBSOCKETS - -DPCB_REV=${this.pcb_revision} + -DPCB_REV=${this.custom_pcb_revision} board_build.ldscript = eagle.flash.4m1m.ld diff --git a/Software/prepare_fwfiles.py b/Software/prepare_fwfiles.py index 9a680a6..be1d788 100644 --- a/Software/prepare_fwfiles.py +++ b/Software/prepare_fwfiles.py @@ -1,3 +1,3 @@ Import("env") -env.Replace(PROGNAME="firmware_pcb_1.%s.fw" % env.GetProjectOption("pcb_revision")) +env.Replace(PROGNAME="firmware_pcb_1.%s.fw" % env.GetProjectOption("custom_pcb_revision")) diff --git a/Software/src/debugger.cpp b/Software/src/debugger.cpp index 6e2b6a0..1960da9 100644 --- a/Software/src/debugger.cpp +++ b/Software/src/debugger.cpp @@ -33,7 +33,7 @@ void Debug_Process() CMD_OVERFLOW } InputProcessed_t; - static int inputCnt = 0; + static unsigned int inputCnt = 0; static char inputBuffer[32]; InputProcessed_t InputProcessed = IDLE; @@ -334,7 +334,7 @@ void Debug_printHelp() { char buff[64]; - for (int i = sizeof(helpCmd) / 63; i < sizeof(helpCmd) / 63; i++) + for (unsigned int i = sizeof(helpCmd) / 63; i < sizeof(helpCmd) / 63; i++) { memcpy_P(buff, (helpCmd + (i * 63)), 63); buff[63] = 0;