From 0419def89b49c3a17991f777f0de08fe6a2ef524 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Fri, 10 Nov 2023 08:18:35 +1100
Subject: [PATCH] Change lock switch direction to match r7 standby

---
 src/system_fsm/booting.cpp               | 4 ++--
 src/system_fsm/idle.cpp                  | 2 +-
 src/system_fsm/include/system_events.hpp | 2 +-
 src/system_fsm/system_fsm.cpp            | 4 ++--
 src/ui/ui_fsm.cpp                        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/system_fsm/booting.cpp b/src/system_fsm/booting.cpp
index affd3ebc..168bb960 100644
--- a/src/system_fsm/booting.cpp
+++ b/src/system_fsm/booting.cpp
@@ -114,9 +114,9 @@ auto Booting::react(const BootComplete& ev) -> void {
   ESP_LOGI(kTag, "bootup completely successfully");
 
   if (sServices->gpios().Get(drivers::Gpios::Pin::kKeyLock)) {
-    transit<Running>();
-  } else {
     transit<Idle>();
+  } else {
+    transit<Running>();
   }
 }
 
diff --git a/src/system_fsm/idle.cpp b/src/system_fsm/idle.cpp
index b8ebefdb..640f95cd 100644
--- a/src/system_fsm/idle.cpp
+++ b/src/system_fsm/idle.cpp
@@ -49,7 +49,7 @@ void Idle::exit() {
 }
 
 void Idle::react(const KeyLockChanged& ev) {
-  if (ev.falling) {
+  if (!ev.locking) {
     transit<Running>();
   }
 }
diff --git a/src/system_fsm/include/system_events.hpp b/src/system_fsm/include/system_events.hpp
index 2722fa80..cbb970ec 100644
--- a/src/system_fsm/include/system_events.hpp
+++ b/src/system_fsm/include/system_events.hpp
@@ -43,7 +43,7 @@ struct StorageMounted : tinyfsm::Event {};
 struct StorageError : tinyfsm::Event {};
 
 struct KeyLockChanged : tinyfsm::Event {
-  bool falling;
+  bool locking;
 };
 struct HasPhonesChanged : tinyfsm::Event {
   bool falling;
diff --git a/src/system_fsm/system_fsm.cpp b/src/system_fsm/system_fsm.cpp
index 31aec789..ca191324 100644
--- a/src/system_fsm/system_fsm.cpp
+++ b/src/system_fsm/system_fsm.cpp
@@ -45,7 +45,7 @@ void SystemState::react(const internal::GpioInterrupt&) {
   bool has_headphones = !gpios.Get(drivers::Gpios::Pin::kPhoneDetect);
 
   if (key_lock != prev_key_lock) {
-    KeyLockChanged ev{.falling = key_lock};
+    KeyLockChanged ev{.locking = key_lock};
     events::System().Dispatch(ev);
     events::Ui().Dispatch(ev);
   }
@@ -77,7 +77,7 @@ void SystemState::react(const internal::SamdInterrupt&) {
 }
 
 auto SystemState::IdleCondition() -> bool {
-  return !sServices->gpios().Get(drivers::IGpios::Pin::kKeyLock) &&
+  return sServices->gpios().Get(drivers::IGpios::Pin::kKeyLock) &&
          audio::AudioState::is_in_state<audio::states::Standby>();
 }
 
diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp
index ee915779..a4001efe 100644
--- a/src/ui/ui_fsm.cpp
+++ b/src/ui/ui_fsm.cpp
@@ -91,8 +91,8 @@ void UiState::PopScreen() {
 }
 
 void UiState::react(const system_fsm::KeyLockChanged& ev) {
-  sDisplay->SetDisplayOn(ev.falling);
-  sInput->lock(!ev.falling);
+  sDisplay->SetDisplayOn(!ev.locking);
+  sInput->lock(ev.locking);
 }
 
 void UiState::react(const system_fsm::BatteryStateChanged& ev) {