6 files changed, 16 insertions, 24 deletions
diff --git a/source/Core/BSP/Pine64/I2C_Wrapper.cpp b/source/Core/BSP/Pine64/I2C_Wrapper.cpp
index 180a71b6..c54380c0 100644
--- a/source/Core/BSP/Pine64/I2C_Wrapper.cpp
+++ b/source/Core/BSP/Pine64/I2C_Wrapper.cpp
@@ -385,18 +385,10 @@ bool FRToSI2C::lock() {
   if (I2CSemaphore == nullptr) {
     return false;
   }
-  if (xTaskGetSchedulerState() != taskSCHEDULER_RUNNING) {
-    return true;
-  }
   return xSemaphoreTake(I2CSemaphore, TICKS_SECOND) == pdTRUE;
 }
 
-void FRToSI2C::unlock() {
-  if (xTaskGetSchedulerState() != taskSCHEDULER_RUNNING) {
-    return;
-  }
-  xSemaphoreGive(I2CSemaphore);
-}
+void FRToSI2C::unlock() { xSemaphoreGive(I2CSemaphore); }
 
 bool FRToSI2C::writeRegistersBulk(const uint8_t address, const I2C_REG *registers, const uint8_t registersLength) {
   for (int index = 0; index < registersLength; index++) {
diff --git a/source/Core/BSP/Pine64/IRQ.h b/source/Core/BSP/Pine64/IRQ.h
index be2891d0..b3d27122 100644
--- a/source/Core/BSP/Pine64/IRQ.h
+++ b/source/Core/BSP/Pine64/IRQ.h
@@ -5,8 +5,8 @@
  *      Author: Ralim
  */
 
-#ifndef BSP_MINIWARE_IRQ_H_
-#define BSP_MINIWARE_IRQ_H_
+#ifndef BSP_PINE64_IRQ_H_
+#define BSP_PINE64_IRQ_H_
 
 #include "BSP.h"
 #include "I2C_Wrapper.hpp"
@@ -53,4 +53,4 @@ extern volatile uint8_t  i2c_process_flag;
 #ifdef __cplusplus
 }
 #endif
-#endif /* BSP_MINIWARE_IRQ_H_ */
+#endif /* BSP_PINE64_IRQ_H_ */
diff --git a/source/Core/BSP/Pine64/Model_Config.h b/source/Core/BSP/Pine64/Model_Config.h
index 0c8577cf..d0ac1e36 100644
--- a/source/Core/BSP/Pine64/Model_Config.h
+++ b/source/Core/BSP/Pine64/Model_Config.h
@@ -5,8 +5,8 @@
  *      Author: Ralim
  */
 
-#ifndef BSP_MINIWARE_MODEL_CONFIG_H_
-#define BSP_MINIWARE_MODEL_CONFIG_H_
+#ifndef BSP_PINE64_MODEL_CONFIG_H_
+#define BSP_PINE64_MODEL_CONFIG_H_
 /*
  * Lookup for mapping features <-> Models
  */
@@ -29,4 +29,4 @@
 #define BATTFILTERDEPTH 32
 #endif
 
-#endif /* BSP_MINIWARE_MODEL_CONFIG_H_ */
+#endif /* BSP_PINE64_MODEL_CONFIG_H_ */
diff --git a/source/Core/BSP/Pine64/Pins.h b/source/Core/BSP/Pine64/Pins.h
index d143cfb1..d6590081 100644
--- a/source/Core/BSP/Pine64/Pins.h
+++ b/source/Core/BSP/Pine64/Pins.h
@@ -5,8 +5,8 @@
  *      Author: Ralim
  */
 
-#ifndef BSP_MINIWARE_PINS_H_
-#define BSP_MINIWARE_PINS_H_
+#ifndef BSP_PINE64_PINS_H_
+#define BSP_PINE64_PINS_H_
 #include "gd32vf103_gpio.h"
 
 #define KEY_B_Pin             BIT(1)
@@ -50,4 +50,4 @@
 #define FUSB302_IRQ_Pin       BIT(5)
 #define FUSB302_IRQ_GPIO_Port GPIOB
 
-#endif /* BSP_MINIWARE_PINS_H_ */
+#endif /* BSP_PINE64_PINS_H_ */
diff --git a/source/Core/BSP/Pine64/Setup.h b/source/Core/BSP/Pine64/Setup.h
index 9ad2e1c6..d3d6e12d 100644
--- a/source/Core/BSP/Pine64/Setup.h
+++ b/source/Core/BSP/Pine64/Setup.h
@@ -5,8 +5,8 @@
  *      Author: Ben V. Brown
  */
 
-#ifndef SETUP_H_
-#define SETUP_H_
+#ifndef PINE_SETUP_H_
+#define PINE_SETUP_H_
 #include "gd32vf103_libopt.h"
 #include <stdint.h>
 
@@ -21,4 +21,4 @@ void     setupFUSBIRQ();
 #endif
 extern const uint8_t holdoffTicks;
 extern const uint8_t tempMeasureTicks;
-#endif /* SETUP_H_ */
+#endif /* PINE_SETUP_H_ */
diff --git a/source/Core/BSP/Pine64/UnitSettings.h b/source/Core/BSP/Pine64/UnitSettings.h
index 46f76091..20fadb8b 100644
--- a/source/Core/BSP/Pine64/UnitSettings.h
+++ b/source/Core/BSP/Pine64/UnitSettings.h
@@ -5,7 +5,7 @@
  *      Author: Ralim
  */
 
-#ifndef BSP_MINIWARE_UNITSETTINGS_H_
-#define BSP_MINIWARE_UNITSETTINGS_H_
+#ifndef BSP_PINE64_UNITSETTINGS_H_
+#define BSP_PINE64_UNITSETTINGS_H_
 
-#endif /* BSP_MINIWARE_UNITSETTINGS_H_ */
+#endif /* BSP_PINE64_UNITSETTINGS_H_ */