Merge pull request #4 from Ralim/dev

Merge upstream changes into fork
Ralim · Feb 27, 2023 · d692cd4 · d692cd4
2 parents 6bf3488 + 6fc27e1
commit d692cd4
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -22,15 +22,18 @@ _This firmware does **NOT** support the USB port while running for changing sett
 
 |   Device   | DC  | QC  | PD  | EPR | BLE | Battery | Recommended |
 | :--------: | :-: | :-: | :-: | :-: | :-: | :-----: | :---------: |
-|   MHP30    | ❌  | ❌  | ✔️  | ❌  | ❌  |   ❌    |     ✔️      |
-| Pinecil V1 | ✔️  | ✔️  | ✔️  | ❌  | ❌  |   ✔️    |     ✔️      |
-| Pinecil V2 | ✔️  | ✔️  | ✔️  | ✔️  | ✔️  |   ✔️    |     ✔️      |
-|   TS80P    | ❌  | ✔️  | ✔️  | ❌  | ❌  |   ✔️    |     ✔️      |
-|   TS100    | ✔️  | ❌  | ❌  | ❌  | ❌  |   ✔️    |     ❌      |
-|    TS80    | ❌  | ✔️  | ❌  | ❌  | ❌  |   ✔️    |     ❌      |
+|   MHP30    | ❌  | ❌  | ✔️  | ❌  | ❌  |   ❌    |      ✔️       |
+| Pinecil V1 | ✔️  | ✔️  | ✔️  | ❌  | ❌  |   ✔️    |      ✔️       |
+| Pinecil V2 | ✔️  | ✔️  | ✔️  | ✔️  | ✔️  |   ✔️    |      ✔️       |
+|   TS80P    | ❌  | ✔️  | ✔️  | ❌  | ❌  |   ✔️    |      ✔️       |
+|   TS100    | ✔️  | ❌  | ❌  | ❌  | ❌  |   ✔️    |      ❌*      |
+|    TS80    | ❌  | ✔️  | ❌  | ❌  | ❌  |   ✔️    |     ❌**      |
 
 \*Please note that Miniware started shipping TS100's using cloned STM32 Chips. While these do work with IronOS, their DFU bootloader works terribly, and it is hard to get it to successfully flash larger firmware images like IronOS without timing out. This is the main reason why the TS100 is **_no longer recommended_**.
 
+\**TS80 is replaced by TS80P. Production ramped down a long time ago and it's just existing stock clearing the system. It's marked not recommended being optimistic that people might pause and buy the far superior TS80P instead. This is the main reason why the \
+TS80 is **_no longer recommended_**.
+
 ## Getting Started
 
 To get started with IronOS firmware, please jump to [Getting Started Guide](https://ralim.github.io/IronOS/GettingStarted/).

diff --git a/Translations/translation_BE.json b/Translations/translation_BE.json
@@ -28,7 +28,7 @@
             "message": "!ЗАМКНУТЫ!"
         },
         "WarningThermalRunaway": {
-            "message": "Цеплавы\nУцякач"
+            "message": "Некантралюемае\nразаграванне"
         },
         "SettingsCalibrationWarning": {
             "message": "Пераканайцеся, што пры наступнай загрузцы наканечнік і ручка маюць пакаёвую тэмпературу!"
@@ -240,12 +240,12 @@
             "description": ""
         },
         "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
+            "displayText": "BLE\n Уключаны",
             "description": ""
         },
 	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
+            "displayText": "PD VPDO\nУключаны",
+	    "description": "Уключае рэжымы PPS/EPR."
 	}
     }
 }
diff --git a/Translations/translation_EN.json b/Translations/translation_EN.json
@@ -243,9 +243,9 @@
             "displayText": "BLE\n Enabled",
             "description": "Enables BLE"
         },
-	"PDVpdoEnabled": {
+        "PDVpdoEnabled": {
             "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
-	}
+            "description": "Enables PPS/EPR modes."
+        }
     }
 }
diff --git a/Translations/translation_PL.json b/Translations/translation_PL.json
@@ -240,12 +240,12 @@
             "description": ""
         },
         "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
+            "displayText": "BLE\n Włączony",
             "description": ""
         },
 	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
+            "displayText": "PD VPDO\nWłączony",
+	    "description": "Włącza tryby PPS/EPR."
 	}
     }
 }
diff --git a/Translations/translation_RU.json b/Translations/translation_RU.json
@@ -28,7 +28,7 @@
             "message": "!ЗАБЛОК!"
         },
         "WarningThermalRunaway": {
-            "message": "Thermal\nRunaway"
+            "message": "Неуправляемый\nРазогрев"
         },
         "SettingsCalibrationWarning": {
             "message": "Пожалуйста, убедитесь, что жало и корпус имеют комнатную температуру при следующей загрузке!"
@@ -240,12 +240,12 @@
             "description": ""
         },
         "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
+            "displayText": "BLE\n Включено",
             "description": ""
         },
 	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
+            "displayText": "PD VPDO\nВключено",
+	    "description": "Включает режимы PPS/EPR."
 	}
     }
 }
diff --git a/Translations/translation_UK.json b/Translations/translation_UK.json
@@ -240,12 +240,12 @@
             "description": ""
         },
         "BLEEnabled": {
-            "displayText": "BLE\n Enabled",
+            "displayText": "BLE\n Увімкнено",
             "description": ""
         },
 	"PDVpdoEnabled": {
-            "displayText": "PD VPDO\nEnabled",
-	    "description": "Enables PPS/EPR modes."
+            "displayText": "PD VPDO\nУвімкнено",
+	    "description": "Вмикає режими PPS/EPR."
 	}
     }
 }
diff --git a/source/Core/BSP/Pinecilv2/ble_characteristics.h b/source/Core/BSP/Pinecilv2/ble_characteristics.h
@@ -88,6 +88,6 @@
 #define BT_UUID_CHAR_BLE_SETTINGS_VALUE_35    BT_UUID_DECLARE_16(35)
 #define BT_UUID_CHAR_BLE_SETTINGS_VALUE_36    BT_UUID_DECLARE_16(36)
 #define BT_UUID_CHAR_BLE_SETTINGS_VALUE_37    BT_UUID_DECLARE_16(37)
-#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_38    BT_UUID_DECLARE_16(37)
+#define BT_UUID_CHAR_BLE_SETTINGS_VALUE_38    BT_UUID_DECLARE_16(38)
 
 #endif
diff --git a/source/Core/BSP/Pinecilv2/ble_handlers.cpp b/source/Core/BSP/Pinecilv2/ble_handlers.cpp
@@ -21,6 +21,7 @@
 #include "uuid.h"
 
 #include "OperatingModes.h"
+#include "OLED.hpp"
 #include "USBPD.h"
 #include "ble_characteristics.h"
 #include "ble_handlers.h"
@@ -242,6 +243,16 @@ int ble_char_write_setting_value_callback(struct bt_conn *conn, const struct bt_
       }
     } else if (uuid_value < SettingsOptions::SettingsOptionsLength) {
       setSettingValue((SettingsOptions)(uuid_value), new_value);
+      // @TODO refactor to make this more usable
+      if (uuid_value == SettingsOptions::OLEDInversion) {
+        OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion));
+      }
+      if (uuid_value == SettingsOptions::OLEDBrightness){
+        OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness));
+      }
+      if (uuid_value == SettingsOptions::OrientationMode){
+        OLED::setRotation(getSettingValue(SettingsOptions::OrientationMode) & 1);
+      }
       return len;
     }
   }

diff --git a/source/Core/Src/Settings.cpp b/source/Core/Src/Settings.cpp
@@ -140,15 +140,16 @@ void resetSettings() {
 
 void setSettingValue(const enum SettingsOptions option, const uint16_t newValue) {
   const auto constants                       = settingsConstants[(int)option];
-  systemSettings.settingsValues[(int)option] = newValue;
-  // If less than min, constrain
-  if (systemSettings.settingsValues[(int)option] < constants.min) {
-    systemSettings.settingsValues[(int)option] = constants.min;
+  uint16_t constrainedValue = newValue;
+  if (constrainedValue < constants.min) {
+    // If less than min, constrain
+    constrainedValue = constants.min;
   }
-  // If hit max, constrain
-  if (systemSettings.settingsValues[(int)option] > constants.max) {
-    systemSettings.settingsValues[(int)option] = constants.max;
+  else if (constrainedValue > constants.max) {
+    // If hit max, constrain
+    constrainedValue = constants.max;
   }
+  systemSettings.settingsValues[(int)option] = constrainedValue;
 }
 // Lookup wrapper for ease of use (with typing)
 uint16_t getSettingValue(const enum SettingsOptions option) { return systemSettings.settingsValues[(int)option]; }