From d88eed4e18519e6080e210aebf34ab6e77c7c635 Mon Sep 17 00:00:00 2001
From: discip <53649486+discip@users.noreply.github.com>
Date: Sat, 11 Mar 2023 01:26:35 +0100
Subject: [PATCH 1/5] Update ble_handlers.cpp

Tried to implement #1594
---
 source/Core/BSP/Pinecilv2/ble_handlers.cpp | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/source/Core/BSP/Pinecilv2/ble_handlers.cpp b/source/Core/BSP/Pinecilv2/ble_handlers.cpp
index ad2c3fe8..fdfd5122 100644
--- a/source/Core/BSP/Pinecilv2/ble_handlers.cpp
+++ b/source/Core/BSP/Pinecilv2/ble_handlers.cpp
@@ -243,15 +243,19 @@ 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) {
+      switch (uuid_value) {
+      case SettingsOptions::OLEDInversion:
         OLED::setInverseDisplay(getSettingValue(SettingsOptions::OLEDInversion));
-      }
-      if (uuid_value == SettingsOptions::OLEDBrightness){
+        break;
+      case SettingsOptions::OLEDBrightness:
         OLED::setBrightness(getSettingValue(SettingsOptions::OLEDBrightness));
-      }
-      if (uuid_value == SettingsOptions::OrientationMode){
+        break;
+      case SettingsOptions::OrientationMode:
         OLED::setRotation(getSettingValue(SettingsOptions::OrientationMode) & 1);
+        break;
+      default:
+        BT_WARN("Unhandled uuid_value in %s. Got 0x%x", PRETTY_FUNCTION, uuid_value);
+        break;
       }
       return len;
     }

From 6174d80586ca13ed4e0fa78247891d704ecd66d1 Mon Sep 17 00:00:00 2001
From: discip <53649486+discip@users.noreply.github.com>
Date: Sat, 11 Mar 2023 01:45:44 +0100
Subject: [PATCH 2/5] Update ble_handlers.cpp

---
 source/Core/BSP/Pinecilv2/ble_handlers.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/Core/BSP/Pinecilv2/ble_handlers.cpp b/source/Core/BSP/Pinecilv2/ble_handlers.cpp
index fdfd5122..b93a332a 100644
--- a/source/Core/BSP/Pinecilv2/ble_handlers.cpp
+++ b/source/Core/BSP/Pinecilv2/ble_handlers.cpp
@@ -254,7 +254,6 @@ int ble_char_write_setting_value_callback(struct bt_conn *conn, const struct bt_
         OLED::setRotation(getSettingValue(SettingsOptions::OrientationMode) & 1);
         break;
       default:
-        BT_WARN("Unhandled uuid_value in %s. Got 0x%x", PRETTY_FUNCTION, uuid_value);
         break;
       }
       return len;

From e12903ec283e19279e32b4f6836451f34bfce4f8 Mon Sep 17 00:00:00 2001
From: discip <53649486+discip@users.noreply.github.com>
Date: Sat, 11 Mar 2023 13:56:47 +0100
Subject: [PATCH 3/5] Update ble_handlers.cpp

---
 source/Core/BSP/Pinecilv2/ble_handlers.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/source/Core/BSP/Pinecilv2/ble_handlers.cpp b/source/Core/BSP/Pinecilv2/ble_handlers.cpp
index b93a332a..4fe47bfb 100644
--- a/source/Core/BSP/Pinecilv2/ble_handlers.cpp
+++ b/source/Core/BSP/Pinecilv2/ble_handlers.cpp
@@ -253,8 +253,6 @@ int ble_char_write_setting_value_callback(struct bt_conn *conn, const struct bt_
       case SettingsOptions::OrientationMode:
         OLED::setRotation(getSettingValue(SettingsOptions::OrientationMode) & 1);
         break;
-      default:
-        break;
       }
       return len;
     }

From 2319eebe6541701c358ee5aa30d48ee1ac1ac0b0 Mon Sep 17 00:00:00 2001
From: discip <53649486+discip@users.noreply.github.com>
Date: Mon, 13 Mar 2023 18:38:16 +0100
Subject: [PATCH 4/5] Update ble_handlers.cpp

---
 source/Core/BSP/Pinecilv2/ble_handlers.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/Core/BSP/Pinecilv2/ble_handlers.cpp b/source/Core/BSP/Pinecilv2/ble_handlers.cpp
index 4fe47bfb..68e1dc7b 100644
--- a/source/Core/BSP/Pinecilv2/ble_handlers.cpp
+++ b/source/Core/BSP/Pinecilv2/ble_handlers.cpp
@@ -253,6 +253,9 @@ int ble_char_write_setting_value_callback(struct bt_conn *conn, const struct bt_
       case SettingsOptions::OrientationMode:
         OLED::setRotation(getSettingValue(SettingsOptions::OrientationMode) & 1);
         break;
+        default:
+          BT_ASSERT(uuid_value == uuid_value);
+        break;
       }
       return len;
     }

From f6975b0aa203c238feceb31c9f58eea82fad9989 Mon Sep 17 00:00:00 2001
From: "Ben V. Brown" <Ralim@Ralimtek.com>
Date: Sat, 1 Apr 2023 14:20:10 +1100
Subject: [PATCH 5/5] Update ble_handlers.cpp

---
 source/Core/BSP/Pinecilv2/ble_handlers.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/source/Core/BSP/Pinecilv2/ble_handlers.cpp b/source/Core/BSP/Pinecilv2/ble_handlers.cpp
index 476d6c41..664ce43a 100644
--- a/source/Core/BSP/Pinecilv2/ble_handlers.cpp
+++ b/source/Core/BSP/Pinecilv2/ble_handlers.cpp
@@ -258,8 +258,7 @@ int ble_char_write_setting_value_callback(struct bt_conn *conn, const struct bt_
       case SettingsOptions::OrientationMode:
         OLED::setRotation(getSettingValue(SettingsOptions::OrientationMode) & 1);
         break;
-        default:
-          BT_ASSERT(uuid_value == uuid_value);
+      default:
         break;
       }
       return len;