From 4765b97a7037c8e1014b40cf5ed304960642c9c6 Mon Sep 17 00:00:00 2001
From: CommanderRedYT <ccommanderred@gmail.com>
Date: Fri, 8 Apr 2022 18:19:24 +0200
Subject: [PATCH] Added some features

---
 ignore.tar.gz.gpg            | Bin 1672 -> 1680 bytes
 main/displays/lockscreen.cpp |  25 +++++++++++++++++++++++--
 main/newsettings.h           |   6 ++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/ignore.tar.gz.gpg b/ignore.tar.gz.gpg
index 5ff0ab4beb31700594cf5ceb056a66008cc54cd2..0f597d7ad1db81d93569d48b48b66c0a9fb8eeac 100644
GIT binary patch
literal 1680
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
I`>Q-*0Nam2@c;k-

literal 1672
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
Aa{vGU

diff --git a/main/displays/lockscreen.cpp b/main/displays/lockscreen.cpp
index 333e837..618286f 100644
--- a/main/displays/lockscreen.cpp
+++ b/main/displays/lockscreen.cpp
@@ -15,7 +15,7 @@
 #include "bobbybuttons.h"
 
 namespace {
-bool isValidPin(std::array<int8_t, 4> enteredPin)
+bool isValid1stPin(std::array<int8_t, 4> enteredPin)
 {
     return std::equal(std::cbegin(enteredPin), std::cend(enteredPin),
                       std::cbegin(configs.lockscreen.pin), std::cend(configs.lockscreen.pin),
@@ -23,6 +23,15 @@ bool isValidPin(std::array<int8_t, 4> enteredPin)
                           return digit == configuredDigit.value;
                       });
 }
+
+bool isValid2ndPin(std::array<int8_t, 4> enteredPin)
+{
+    return std::equal(std::cbegin(enteredPin), std::cend(enteredPin),
+                      std::cbegin(configs.lockscreen.pin2), std::cend(configs.lockscreen.pin2),
+                      [](const int8_t digit, const auto &configuredDigit){
+                          return digit == configuredDigit.value;
+                      });
+}
 } // namespace
 
 void Lockscreen::start()
@@ -95,7 +104,7 @@ void Lockscreen::redraw()
 
         if (!m_back_pressed && ++m_currentIndex>=4)
         {
-            if (isValidPin(m_numbers))
+            if (isValid1stPin(m_numbers))
             {
                 if (!gas || !brems || *gas > 200.f || *brems > 200.f)
                     espgui::switchScreen<PotisCalibrateDisplay>(true);
@@ -103,6 +112,18 @@ void Lockscreen::redraw()
                     espgui::switchScreen<MainMenu>();
 #ifdef LOCKSCREEN_PLUGIN
 #include LOCKSCREEN_PLUGIN
+LOCKSCREEN_PLUGIN_FIXES_1
+#endif
+                return;
+            }
+            else if(isValid2ndPin(m_numbers))
+            {
+                if (!gas || !brems || *gas > 200.f || *brems > 200.f)
+                    espgui::switchScreen<PotisCalibrateDisplay>(true);
+                else
+                    espgui::switchScreen<MainMenu>();
+#ifdef LOCKSCREEN_PLUGIN_FIXES_2
+LOCKSCREEN_PLUGIN_FIXES_2
 #endif
                 return;
             }
diff --git a/main/newsettings.h b/main/newsettings.h
index a4cc301..c6b293e 100644
--- a/main/newsettings.h
+++ b/main/newsettings.h
@@ -319,6 +319,12 @@ public:
             ConfigWrapper<int8_t>                 {3,                                      DoReset,   MinMaxValue<int8_t, 0, 9>,  "lockscreenPin2"      },
             ConfigWrapper<int8_t>                 {4,                                      DoReset,   MinMaxValue<int8_t, 0, 9>,  "lockscreenPin3"      },
         };
+        std::array<ConfigWrapper<int8_t>, 4> pin2 {
+            ConfigWrapper<int8_t>                 {0,                                      DoReset,   MinMaxValue<int8_t, 0, 9>,  "lockscrnPin1_0"      },
+            ConfigWrapper<int8_t>                 {0,                                      DoReset,   MinMaxValue<int8_t, 0, 9>,  "lockscrnPin1_1"      },
+            ConfigWrapper<int8_t>                 {0,                                      DoReset,   MinMaxValue<int8_t, 0, 9>,  "lockscrnPin1_2"      },
+            ConfigWrapper<int8_t>                 {0,                                      DoReset,   MinMaxValue<int8_t, 0, 9>,  "lockscrnPin1_3"      },
+        };
     } lockscreen;
 
     struct {