From 8e0d2d41f5954b29bb10e2d0199d56956db8c160 Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <Ralim@Ralimtek.com>
Date: Mon, 23 May 2022 18:48:54 +1000
Subject: [PATCH] Cleanup

---
 Dockerfile                            | 1 +
 source/Core/BSP/Magic/UnitSettings.h  | 6 +++---
 source/Core/BSP/Magic/configuration.h | 2 +-
 source/Core/Src/main.cpp              | 1 -
 source/Core/Threads/GUIThread.cpp     | 1 -
 source/Core/Threads/MOVThread.cpp     | 1 -
 source/Core/Threads/PIDThread.cpp     | 1 -
 source/Core/Threads/POWThread.cpp     | 1 -
 8 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4622f33b..3b40c2e0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,7 @@ RUN apk add --no-cache gcc-riscv-none-elf gcc-arm-none-eabi newlib-riscv-none-el
 # Install Python3 packages
 
 RUN python3 -m pip install bdflib black
+RUN git config --global --add safe.directory /build/source
 
 COPY . /build/source
 COPY ./ci /build/ci
diff --git a/source/Core/BSP/Magic/UnitSettings.h b/source/Core/BSP/Magic/UnitSettings.h
index 20fadb8b..61fafd30 100644
--- a/source/Core/BSP/Magic/UnitSettings.h
+++ b/source/Core/BSP/Magic/UnitSettings.h
@@ -5,7 +5,7 @@
  *      Author: Ralim
  */
 
-#ifndef BSP_PINE64_UNITSETTINGS_H_
-#define BSP_PINE64_UNITSETTINGS_H_
+#ifndef BSP_MAGIC_UNITSETTINGS_H_
+#define BSP_MAGIC_UNITSETTINGS_H_
 
-#endif /* BSP_PINE64_UNITSETTINGS_H_ */
+#endif /* BSP_MAGIC_UNITSETTINGS_H_ */
diff --git a/source/Core/BSP/Magic/configuration.h b/source/Core/BSP/Magic/configuration.h
index 75060750..69742d6e 100644
--- a/source/Core/BSP/Magic/configuration.h
+++ b/source/Core/BSP/Magic/configuration.h
@@ -138,7 +138,7 @@
 #define POW_DC     1
 #define POW_QC_20V 1
 #define ENABLE_QC2 1
-#define TEMP_TMP36
+#define TEMP_NTC
 #define ACCEL_BMA
 #define ACCEL_SC7
 #define HALL_SENSOR
diff --git a/source/Core/Src/main.cpp b/source/Core/Src/main.cpp
index 02f55143..7b92316b 100644
--- a/source/Core/Src/main.cpp
+++ b/source/Core/Src/main.cpp
@@ -7,7 +7,6 @@
 #include "main.hpp"
 #include "BSP.h"
 #include "Settings.h"
-#include "bflb_platform.h"
 #include "cmsis_os.h"
 #include "power.hpp"
 AccelType DetectedAccelerometerVersion = AccelType::Scanning;
diff --git a/source/Core/Threads/GUIThread.cpp b/source/Core/Threads/GUIThread.cpp
index f32f6b24..83da399d 100644
--- a/source/Core/Threads/GUIThread.cpp
+++ b/source/Core/Threads/GUIThread.cpp
@@ -15,7 +15,6 @@ extern "C" {
 #include "Settings.h"
 #include "TipThermoModel.h"
 #include "Translation.h"
-#include "bflb_platform.h"
 #include "cmsis_os.h"
 #include "configuration.h"
 #include "main.hpp"
diff --git a/source/Core/Threads/MOVThread.cpp b/source/Core/Threads/MOVThread.cpp
index 9fe832fa..b7235649 100644
--- a/source/Core/Threads/MOVThread.cpp
+++ b/source/Core/Threads/MOVThread.cpp
@@ -16,7 +16,6 @@
 #include "SC7A20.hpp"
 #include "Settings.h"
 #include "TipThermoModel.h"
-#include "bflb_platform.h"
 #include "cmsis_os.h"
 #include "configuration.h"
 #include "history.hpp"
diff --git a/source/Core/Threads/PIDThread.cpp b/source/Core/Threads/PIDThread.cpp
index 9e3d37b3..65cce4db 100644
--- a/source/Core/Threads/PIDThread.cpp
+++ b/source/Core/Threads/PIDThread.cpp
@@ -9,7 +9,6 @@
 #include "FreeRTOS.h"
 #include "Settings.h"
 #include "TipThermoModel.h"
-#include "bflb_platform.h"
 #include "cmsis_os.h"
 #include "history.hpp"
 #include "main.hpp"
diff --git a/source/Core/Threads/POWThread.cpp b/source/Core/Threads/POWThread.cpp
index b5280a5f..9d41967e 100644
--- a/source/Core/Threads/POWThread.cpp
+++ b/source/Core/Threads/POWThread.cpp
@@ -10,7 +10,6 @@
 #include "QC3.h"
 #include "Settings.h"
 #include "USBPD.h"
-#include "bflb_platform.h"
 #include "cmsis_os.h"
 #include "configuration.h"
 #include "main.hpp"