1 files changed, 14 insertions, 1 deletions
diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp
index 760f216..4f81271 100644
--- a/src/systemtask/SystemTask.cpp
+++ b/src/systemtask/SystemTask.cpp
@@ -133,7 +133,14 @@ void SystemTask::Work() {
 
   fs.Init();
 
+  settingsController.Init();
+  if(settingsController.GetBluetoothPasskeyEnabled()) {
+    bleController.EnablePasskey();
+  } else {
+    bleController.DisablePasskey();
+  }
   nimbleController.Init();
+
   lcd.Init();
 
   twiMaster.Init();
@@ -159,7 +166,6 @@ void SystemTask::Work() {
 
   motionSensor.Init();
   motionController.Init(motionSensor.DeviceType());
-  settingsController.Init();
 
   displayApp.Register(this);
   displayApp.Start(bootError);
@@ -451,6 +457,13 @@ void SystemTask::Work() {
             nimbleController.DisableRadio();
           }
           break;
+        case Messages::BluetoothPasskeyEnableToggle:
+          if(settingsController.GetBluetoothPasskeyEnabled()) {
+            bleController.EnablePasskey();
+          } else {
+            bleController.DisablePasskey();
+          }
+          break;
         default:
           break;
       }