Skip to content

Development #1

Merged
merged 5 commits into from May 21, 2020
Merged

Development #1

merged 5 commits into from May 21, 2020

Conversation

cks11003
Copy link
Contributor

Merging new software architecture back to master branch

Christian added 5 commits May 19, 2020 21:58
…ror handling, a live GUI, and a few other small things.
…(simulated IRC, connected camera, tested for correct data flow and state transitions) carried out, various bugs discovered and fixed. GigE camera timeout bug still needs to be addressed.
…age and Process_Images state entry procedure. Switched from event-triggered state changes to local FSM variable triggers. Now, the thread initiated by receipt of IRC packet does not handle execution of the state entry methods; this is instead handled by the FSM timer (which will not be pre-empted)
@cks11003 cks11003 merged commit cc7dc82 into master May 21, 2020
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant