Refactored User Interface #36
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge Develop into Master
Update to Master
…" to "printerconnection". Marlin: Property IsConnected and function EmergencyStop added. PrinterConnection: refactor regarding name change of state machine "movement" to "printerconnection". In Init check property IsConnected before proceeding to state homing/idle and send signal "isconnected" to "main" so "main" can start controlling temperature. In Init set fan speed. Update bed/extruder temperature (target values to set received as a signal from "main") and report current values (as signal to "main"). Possibility (signal) to disconnect printer added. Possibility (signal) to do an emergency stop added. Main: refactor regarding name change of state machine "movement" to "printerconnection". In StartProcess wait until printer is connected before proceeding to "WaitForTemperature". In "WaitForTemperature" prepare signat with temperature to be set (in PrinterConnection) and wait for signal with current temperature (in a loop). Check received temperature data and wait until expected temperature is reached. If "reached" proceed to "ExtrudeLayer". Command to disconnect printer added to "finishprocess" (probably to be removed again). Just for testing, signal to call EmergencyStop added to "NextLayer" => commented out after testing.
@alexanderoster I added the NOPAUSE option as Param1 to run the Jenkins Builds
Refactor program sequence. Homed, connected, temperature etc are now controlled by Main (using sognals). Main: set fan speed, initlialize extruder, set temperature without waiting, read target temperature from xml, finalize extrude process and retract/restore filament (layer change) added. PrinterConnection/Marlin: updateStateFromDriver renamed to updatePositionStateFromDriver now just updates printerstate parameters (positions...) and no more temperature. Some functions moved to handleSignals. UpdateFanSpeed added. DoExtrudeLayer (and others) now call handleSignals in addition to updatePositionStateFromDriver. Stored value "ExtrudeValue" used to save value of E axis after layer is fninshed => to be (re)used in next layer. HandleSignals added => handles all signals received from Main UpdatedState has been split => update position and temperature is done seperately now. State homing removed.
Merged Develop
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.