update state manager

- Migrated instationation of StateManager objects to CPP file.

This was to remove them from the main, keep the main clean.

Now objects are accessible whenever you include the header.
No need to recreate them.
This commit is contained in:
ZanzyTHEbar 2022-07-18 15:38:34 +01:00 committed by Zdzislaw Goik
parent fca754d2cc
commit 06ca809d26
3 changed files with 16 additions and 8 deletions

View File

@ -0,0 +1,9 @@
#include "StateManager.hpp"
StateManager<ProgramStates::DeviceStates::State_e> stateManager;
StateManager<ProgramStates::DeviceStates::WiFiState_e> wifiStateManager;
StateManager<ProgramStates::DeviceStates::WebServerState_e> webServerStateManager;
StateManager<ProgramStates::DeviceStates::MDNSState_e> mdnsStateManager;
StateManager<ProgramStates::DeviceStates::CameraState_e> cameraStateManager;
StateManager<ProgramStates::DeviceStates::ButtonState_e> buttonStateManager;
StateManager<ProgramStates::DeviceStates::StreamState_e> streamStateManager;

View File

@ -107,5 +107,12 @@ private:
T _current_state;
};
extern StateManager<ProgramStates::DeviceStates::State_e> stateManager;
extern StateManager<ProgramStates::DeviceStates::WiFiState_e> wifiStateManager;
extern StateManager<ProgramStates::DeviceStates::WebServerState_e> webServerStateManager;
extern StateManager<ProgramStates::DeviceStates::MDNSState_e> mdnsStateManager;
extern StateManager<ProgramStates::DeviceStates::CameraState_e> cameraStateManager;
extern StateManager<ProgramStates::DeviceStates::ButtonState_e> buttonStateManager;
extern StateManager<ProgramStates::DeviceStates::StreamState_e> streamStateManager;
#endif // STATEMANAGER_HPP

View File

@ -17,14 +17,6 @@ const char *MDSNTrackerName = "OpenIrisTracker";
int STREAM_SERVER_PORT = 80;
int CONTROL_SERVER_PORT = 81;
StateManager<ProgramStates::DeviceStates::State_e> stateManager;
StateManager<ProgramStates::DeviceStates::WiFiState_e> wifiStateManager;
StateManager<ProgramStates::DeviceStates::WebServerState_e> webServerStateManager;
StateManager<ProgramStates::DeviceStates::MDNSState_e> mdnsStateManager;
StateManager<ProgramStates::DeviceStates::CameraState_e> cameraStateManager;
StateManager<ProgramStates::DeviceStates::ButtonState_e> buttonStateManager;
StateManager<ProgramStates::DeviceStates::StreamState_e> streamStateManager;
OTA ota;
LEDManager ledManager(33);
CameraHandler cameraHandler;