Skip to content
This repository has been archived by the owner on Jun 18, 2020. It is now read-only.

Re-implement sys-clk-Editor using a state machine #18

Merged
merged 8 commits into from Dec 27, 2019
Merged

Re-implement sys-clk-Editor using a state machine #18

merged 8 commits into from Dec 27, 2019

Conversation

cathery
Copy link
Contributor

@cathery cathery commented Dec 24, 2019

sun i'm so sorry

  • Switch to a state machine similar to SPR manager
  • Add multiple program states besides Enabled and Disabled (similar to SPR manager)
  • Change "Delete config" to "Clear config", and actually clear the config

i haven't tested it completely, i don't remember how your gameSelected and configSelected variables are supposed to behave, please test to make sure everything works the same

@gabehxd
Copy link
Member

gabehxd commented Dec 24, 2019

with a state machine gameSelected and configSelected should no longer be necessary afaik as they were used to return to the correct selection on the last page

source/States/ConfigMenu.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ConfigMenu.h Outdated Show resolved Hide resolved
source/States/ConfigMenu.h Outdated Show resolved Hide resolved
source/States/ConfigMenu.h Outdated Show resolved Hide resolved
source/States/ConfigMenu.h Outdated Show resolved Hide resolved
source/States/ConfigMenu.h Outdated Show resolved Hide resolved
source/States/ErrorMenu.h Outdated Show resolved Hide resolved
source/States/ErrorMenu.h Outdated Show resolved Hide resolved
source/States/ErrorMenu.h Outdated Show resolved Hide resolved
source/States/ErrorMenu.h Outdated Show resolved Hide resolved
source/States/ErrorMenu.h Outdated Show resolved Hide resolved
source/States/MainMenu.h Outdated Show resolved Hide resolved
source/States/MainMenu.h Outdated Show resolved Hide resolved
source/States/MainMenu.h Outdated Show resolved Hide resolved
source/States/MainMenu.h Outdated Show resolved Hide resolved
source/States/MainMenu.h Outdated Show resolved Hide resolved
source/States/TitleMenu.h Outdated Show resolved Hide resolved
source/States/TitleMenu.h Outdated Show resolved Hide resolved
source/States/TitleMenu.h Outdated Show resolved Hide resolved
source/States/TitleMenu.h Outdated Show resolved Hide resolved
source/States/TitleMenu.h Outdated Show resolved Hide resolved
Remove "redundant" virtual keywords
source/States/ClockMenus.cpp Show resolved Hide resolved
source/States/ClockMenus.h Outdated Show resolved Hide resolved
source/States/ErrorMenu.h Outdated Show resolved Hide resolved
@gabehxd
Copy link
Member

gabehxd commented Dec 26, 2019

just nitpicking really :p

@gabehxd
Copy link
Member

gabehxd commented Dec 27, 2019

all seems good in testing 👌

@gabehxd gabehxd merged commit ce07d86 into SunResearchInstitute:master Dec 27, 2019
@gabehxd gabehxd added the enhancement New feature or request label Dec 27, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants