From 27741fc9f2adf60a01363c7f468ddf3e4fd61579 Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Wed, 5 Oct 2022 11:47:14 +0300 Subject: [PATCH 1/5] state-handler: #6 change constructor args --- StateHandler/src/StateHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/StateHandler/src/StateHandler.cpp b/StateHandler/src/StateHandler.cpp index 13286c7..792c11c 100644 --- a/StateHandler/src/StateHandler.cpp +++ b/StateHandler/src/StateHandler.cpp @@ -7,7 +7,7 @@ #include -StateHandler::StateHandler(EVENT_HANDL btns) { +StateHandler::StateHandler() { // TODO Auto-generated constructor stub } From 0bb33cf8574135ec6d762297260069ddd325ab71 Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Wed, 5 Oct 2022 15:16:13 +0300 Subject: [PATCH 2/5] gitignore: remove .project --- periph_blinky/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 periph_blinky/.gitignore diff --git a/periph_blinky/.gitignore b/periph_blinky/.gitignore new file mode 100644 index 0000000..3df573f --- /dev/null +++ b/periph_blinky/.gitignore @@ -0,0 +1 @@ +/Debug/ From f9a1e411aea2632cd591459917c338af31a9959d Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Wed, 5 Oct 2022 15:19:42 +0300 Subject: [PATCH 3/5] global: add .project in global --- .gitignore | 1 - I2C/.project | 28 ++++++++++++++++++++++++++++ LiquidCrystal/.project | 29 +++++++++++++++++++++++++++++ StateHandler/.project | 29 +++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 I2C/.project create mode 100644 LiquidCrystal/.project create mode 100644 StateHandler/.project diff --git a/.gitignore b/.gitignore index e7ccae6..e7bd8bf 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,5 @@ # MCUExpresso stuff *.settings/ -*.project .mcuexpressoide_package_support/ diff --git a/I2C/.project b/I2C/.project new file mode 100644 index 0000000..4afcb42 --- /dev/null +++ b/I2C/.project @@ -0,0 +1,28 @@ + + + I2C + + + lpc_chip_15xx + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/LiquidCrystal/.project b/LiquidCrystal/.project new file mode 100644 index 0000000..6bf5b03 --- /dev/null +++ b/LiquidCrystal/.project @@ -0,0 +1,29 @@ + + + LiquidCrystal + + + lpc_chip_15xx + DigitalIoPin + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + diff --git a/StateHandler/.project b/StateHandler/.project new file mode 100644 index 0000000..ca7ae8f --- /dev/null +++ b/StateHandler/.project @@ -0,0 +1,29 @@ + + + StateHandler + + + lpc_chip_15xx + DigitalIoPin + + + + org.eclipse.cdt.managedbuilder.core.genmakebuilder + clean,full,incremental, + + + + + org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder + full,incremental, + + + + + + org.eclipse.cdt.core.cnature + org.eclipse.cdt.core.ccnature + org.eclipse.cdt.managedbuilder.core.managedBuildNature + org.eclipse.cdt.managedbuilder.core.ScannerConfigNature + + From 452a385756169020f3b3b4be8474e513b03dfcec Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Wed, 5 Oct 2022 15:02:02 +0300 Subject: [PATCH 4/5] state-handler: #6 add state controller functions - HandleState to set an event of the state - SetState to update current state to new --- StateHandler/inc/StateHandler.h | 14 ++++++++++++++ StateHandler/src/StateHandler.cpp | 11 +++++++++++ 2 files changed, 25 insertions(+) diff --git a/StateHandler/inc/StateHandler.h b/StateHandler/inc/StateHandler.h index ac0b385..a31df2b 100644 --- a/StateHandler/inc/StateHandler.h +++ b/StateHandler/inc/StateHandler.h @@ -41,13 +41,27 @@ enum _buttons { BUTTON_CONTROL_TOG_ACTIVE }; +class StateHandler; +typedef void (StateHandler::*state_pointer)(const Event &); + + class StateHandler { public: StateHandler(); virtual ~StateHandler(); int getSetPresuure(); // Get currently set pressure 0-100% int getSetSpeed(); //Get currently set FanSpeed 0-100% + + /** Handle the given event of the current state + * @param event event to be handled in the current state + */ + void HandleState(const Event &event); private: + state_pointer current; + /** Set a new curremt state + * @param newstate new state to be set to current + */ + void SetState(state_pointer newstate); bool mode; Counter * bar_pressure; Counter * bar_speed; diff --git a/StateHandler/src/StateHandler.cpp b/StateHandler/src/StateHandler.cpp index 792c11c..7c4fb0f 100644 --- a/StateHandler/src/StateHandler.cpp +++ b/StateHandler/src/StateHandler.cpp @@ -25,3 +25,14 @@ int StateHandler::getSetSpeed(){ // TODO return 0; } + +void StateHandler::HandleState(const Event &event){ + (this->*current)(event); +} + +void StateHandler::SetState(state_pointer newstate){ + (this->*current)(Event(Event::eExit)); + current = newstate; + (this->*current)(Event(Event::eEnter)); + +} From d6219e4ef4655983abfc787c186978416cc72326 Mon Sep 17 00:00:00 2001 From: Vasily Davydov Date: Wed, 5 Oct 2022 15:51:08 +0300 Subject: [PATCH 5/5] state-handler: #6 prepare for displaying values Add internal fucntionality for: - getBarPressure() - getBarSpeed() - displaySet(int, int) --- StateHandler/.cproject | 6 ++++ StateHandler/.project | 1 + StateHandler/Debug/src/StateHandler.su | 15 ++++++--- StateHandler/inc/Counter.h | 2 +- StateHandler/inc/StateHandler.h | 42 ++++++++++++++++++++++---- StateHandler/src/Counter.cpp | 2 +- StateHandler/src/StateHandler.cpp | 30 +++++++++++++----- 7 files changed, 77 insertions(+), 21 deletions(-) diff --git a/StateHandler/.cproject b/StateHandler/.cproject index 7731589..dce4dd8 100644 --- a/StateHandler/.cproject +++ b/StateHandler/.cproject @@ -48,6 +48,7 @@ +