From dedcda5dda771eb9b079c7fbb95ec1e7c63af281 Mon Sep 17 00:00:00 2001
From: Paciente8159 <Paciente8159@users.noreply.github.com>
Date: Sat, 9 Apr 2022 21:05:36 +0100
Subject: [PATCH] minor code corrections

-fixed warnings on SAMD21 (CACHEDIS reset and math.h missing)
-modified tool length settings range eval
-added setting for clone Bluepill on platformIO
---
 .gitignore                            | 2 ++
 platformio.ini                        | 2 ++
 uCNC/src/hal/mcus/samd21/mcu_samd21.c | 3 ++-
 uCNC/src/interface/settings.c         | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5fbef76a3..d6d288d5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,3 +81,5 @@ windows/uCNCgui/obj/Debug/net6.0-windows/uCNCgui.GeneratedMSBuildEditorConfig.ed
 .vscode/c_cpp_properties.json
 .vscode/launch.json
 .vscode/ipch
+.vscode/launch.json
+.vscode/extensions.json
diff --git a/platformio.ini b/platformio.ini
index 2cbf94f5b..580a67c1a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -52,6 +52,8 @@ platform = ststm32
 board = bluepill_f103c8
 framework = arduino
 build_flags = -D BOARD=BOARD_BLUEPILL -D INTERFACE=1 -D HAL_TIM_MODULE_DISABLED -D HAL_EXTI_MODULE_DISABLED -fdata-sections -ffunction-sections -Wl,--gc-sections
+;uncomment if it's a bluepill clone
+;upload_flags = -c set CPUTAPID 0x2ba01477
 
 [env:blackpill_f401cc]
 platform = ststm32
diff --git a/uCNC/src/hal/mcus/samd21/mcu_samd21.c b/uCNC/src/hal/mcus/samd21/mcu_samd21.c
index 8ecf81636..ac0161f29 100644
--- a/uCNC/src/hal/mcus/samd21/mcu_samd21.c
+++ b/uCNC/src/hal/mcus/samd21/mcu_samd21.c
@@ -26,6 +26,7 @@
 #include "sam.h"
 //#include "instance/nvmctrl.h"
 #include <string.h>
+#include <math.h>
 
 // Non volatile memory
 // SAMD devices page size never exceeds 1024 bytes
@@ -1739,7 +1740,7 @@ void mcu_eeprom_flush(void)
                         remaining -= (remaining > NVM_ROW_SIZE) ? NVM_ROW_SIZE : remaining;
                 }
 
-                NVMCTRL->CTRLB.bit.CACHEDIS = 1;
+                NVMCTRL->CTRLB.bit.CACHEDIS = cache;
                 NVMCTRL->CTRLB.bit.RWS = 0x01;
         }
 
diff --git a/uCNC/src/interface/settings.c b/uCNC/src/interface/settings.c
index e9d01b2fa..0b874f5af 100644
--- a/uCNC/src/interface/settings.c
+++ b/uCNC/src/interface/settings.c
@@ -545,7 +545,7 @@ uint8_t settings_change(uint8_t setting, float value)
         }
 #endif
 #if TOOL_COUNT > 0
-        else if (setting > 80 && setting <= 96)
+        else if (setting > 80 && setting <= (80 + TOOL_COUNT))
         {
             setting -= 80;
             g_settings.tool_length_offset[setting] = value;