Hack can now control the door effectively

Author: ncmreynolds

examples/PINAndRFID/PINAndRFID.ino

@@ -3,7 +3,7 @@
  * 
  */
 
-#define DEBUG_ENABLED
+//#define DEBUG_ENABLED
 
 #include <LarpHackableRfidLock.h>
 #ifdef DEBUG_ENABLED

src/LarpHackableRfidLock.cpp

@@ -496,8 +496,8 @@ bool ICACHE_FLASH_ATTR LarpHackableRfidLock::loadConfiguration(const char* filen
 			//Hacking game
 			game_enabled_ = doc[game_enabled_key_] | game_enabled_default_;
 			game_type_ =  doc[game_type_key_] | game_type_default_;
-			game_length_ = doc[game_length_key_] = game_length_default_;
-			game_retries_ = doc[game_retries_key_] = game_retries_default_;
+			game_length_ = doc[game_length_key_] | game_length_default_;
+			game_retries_ = doc[game_retries_key_] | game_retries_default_;
 			//Multi-factor authentication
 			multi_factor_enabled_ = doc[multi_factor_enabled_key_] | multi_factor_enabled_default_;
 			uint8_t multifactortype =  doc[multi_factor_type_key_] | 0;
@@ -1412,6 +1412,29 @@ void  ICACHE_FLASH_ATTR LarpHackableRfidLock::housekeeping(){
 	#endif
 	if(game_enabled_) {
 		game.runFsm();  //Run the game finite state machine
+		if(game.won()) {
+			if(game_lock_controls_visible_ == false) {
+				hack_complete_ = true;
+				game_lock_controls_visible_ = true;
+				ESPUI.updateVisibility(game_lock_controls_tab_id_, true);
+			}
+		}
+		else if(hack_complete_ == true) {
+			hack_complete_ = false;
+			turn_off_wifi_soon_ = millis();
+			if(debugStream_ != nullptr) {
+				debugStream_->println(F("Hack complete, hiding lock controls again"));
+			}
+			ESPUI.updateVisibility(game_lock_controls_tab_id_, false);
+		}
+		if(turn_off_wifi_soon_ !=0 && millis() - turn_off_wifi_soon_ > 3e3)
+		{
+			turn_off_wifi_soon_ = 0;
+			if(debugStream_ != nullptr) {
+				debugStream_->println(F("Wifi Off"));
+			}
+			WiFi.mode(WIFI_OFF);
+		}
 	}
 	#ifdef HOUSEKEEPING_DEBUG
 		Serial.println(housekeepingdebug++);
@@ -2090,6 +2113,13 @@ void LarpHackableRfidLock::setupGame()
 		game.addPlayButton(PSTR("Delta"), PSTR("Hack"), ControlColor::Carrot);
 	}
 	game.addGameTab(); //Builds all the game controls
+	//Lock controls
+	game_lock_controls_tab_id_ = ESPUI.addControl(ControlType::Tab, PSTR("Entry control"), PSTR("Entry control"));	//Create the tab
+	game_lock_controls_button0_id_ = ESPUI.addControl(ControlType::Button, PSTR("Open once"), PSTR("Open"), ControlColor::Peterriver, game_lock_controls_tab_id_, &gameButtonCallback);
+	game_lock_controls_button1_id_ = ESPUI.addControl(ControlType::Button, PSTR("Open permanently"), PSTR("Unseal"), ControlColor::Peterriver, game_lock_controls_tab_id_, &gameButtonCallback);
+	game_lock_controls_button2_id_ = ESPUI.addControl(ControlType::Button, PSTR("Require Code/Card"), PSTR("Normal behaviour"), ControlColor::Peterriver, game_lock_controls_tab_id_, &gameButtonCallback);
+	game_lock_controls_button3_id_ = ESPUI.addControl(ControlType::Button, PSTR("Permanently Lock"), PSTR("Seal"), ControlColor::Peterriver, game_lock_controls_tab_id_, &gameButtonCallback);
+	ESPUI.updateVisibility(game_lock_controls_tab_id_, false);	//Hide the tabe
 	game.setHelpTabTitle(PSTR("OC: How to hack"));
 	if(game_type_ == 0) {
 		game.setHelpContent(
@@ -2105,6 +2135,47 @@ void LarpHackableRfidLock::setupGame()
 	game.addHelpTab(); //Builds all the help controls
 	ESPUI.begin(game.title());  //ESPUI is started from the sketch in case you want to add your own controls and pages as well before starting ESPUI
 }
+void LarpHackableRfidLock::gameButtonCallback(Control* sender, int type)
+{
+	if(Lock.debugStream_ != nullptr) {
+		//Lock.debugStream_->printf_P(PSTR("Game callback: %u %s\r\n"), sender->id, (type==B_DOWN ? PSTR("Down") : PSTR("Up")));	//Debug feedback in callback
+		if(type==B_UP)
+		{
+			if(sender->id == Lock.game_lock_controls_button0_id_)
+			{
+				Lock.debugStream_->println(PSTR("Hack: Open"));
+			}
+			else if(sender->id == Lock.game_lock_controls_button1_id_)
+			{
+				Lock.debugStream_->println(PSTR("Hack: Unseal"));
+			}
+			else if(sender->id == Lock.game_lock_controls_button2_id_)
+			{
+				Lock.debugStream_->println(PSTR("Hack: Normal"));
+			}
+			else if(sender->id == Lock.game_lock_controls_button3_id_)
+			{
+				Lock.debugStream_->println(PSTR("Hack: Seal"));
+			}
+		}
+	}
+	if(sender->id == Lock.game_lock_controls_button0_id_)
+	{
+		Lock.allow();
+	}
+	else if(sender->id == Lock.game_lock_controls_button1_id_)
+	{
+		Lock.unseal();
+	}
+	else if(sender->id == Lock.game_lock_controls_button2_id_)
+	{
+		Lock.normal();
+	}
+	else if(sender->id == Lock.game_lock_controls_button3_id_)
+	{
+		Lock.seal();
+	}
+}
 #ifdef DRD
 	bool ICACHE_FLASH_ATTR LarpHackableRfidLock::doubleReset() {
 		if(this->reset_detector_.detectDoubleReset() == true) {

src/LarpHackableRfidLock.h

@@ -64,7 +64,7 @@
 //#include <Servo.h>							//Support servo based locks
 #include <ESP32Servo.h>
 
-#include <ESPUI.h>
+#include <ESPUI.h>							//Hacking game support
 #include <ESPUIgames.h>
 
 const char web_admin_header_includes_[348] PROGMEM = "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><link href=\"//fonts.googleapis.com/css?family=Raleway:400,300,600\" rel=\"stylesheet\" type=\"text/css\"><link rel=\"stylesheet\" href=\"css/normalize.css\"><link rel=\"stylesheet\" href=\"css/skeleton.css\"><link rel=\"icon\" type=\"image/png\" href=\"images/favicon.png\">";
@@ -793,6 +793,7 @@ class LarpHackableRfidLock	{
 		String mqtt_topic_key_ = PSTR("mqttTopic");
 		//Hacking game
 		void setupGame();														//Set up the game
+		static void gameButtonCallback(Control* sender, int type);				// Lock control callbacks for the game
 		bool game_enabled_ = false;
 		bool game_enabled_default_ = false;
 		String game_enabled_key_ = PSTR("gameEnabled");
@@ -805,6 +806,14 @@ class LarpHackableRfidLock	{
 		uint8_t game_retries_ = 0;
 		uint8_t game_retries_default_ = 0;
 		String game_retries_key_ = PSTR("gameRetries");
+		uint16_t game_lock_controls_tab_id_ = 0;		//ESPUI tab ID
+		uint16_t game_lock_controls_button0_id_ = 0;	//ESPUI button IDs
+		uint16_t game_lock_controls_button1_id_ = 0;
+		uint16_t game_lock_controls_button2_id_ = 0;
+		uint16_t game_lock_controls_button3_id_ = 0;
+		bool hack_complete_ = false;
+		bool game_lock_controls_visible_ = false;
+		uint32_t turn_off_wifi_soon_ = 0;
 		//Multi-factor authentication
 		bool multi_factor_enabled_ = false;
 		bool multi_factor_enabled_default_ = false;

src/webAdminInterface.cpp

@@ -311,6 +311,7 @@ void ICACHE_FLASH_ATTR LarpHackableRfidLock::web_admin_control_page_button3_pres
 	if(Lock.debugStream_ != nullptr)	{
 		Lock.debugStream_->println(F("web_admin_control_page_button3_pressed Seal"));
 	}
+	Lock.seal();
 }
 void ICACHE_FLASH_ATTR LarpHackableRfidLock::webAdminControlPageCallback()	{
 	if(Lock.debugStream_ != nullptr)	{