Trying to merge in additions for buttons, pendant, command line display, and R code removal #125
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
Fix link to Feather.js in README.md
…f control elements, add styles for cleaner display.
…ra closing brackets from JavaScript action calls, Add controls div for styling, Add feather icons, fix button layout, Remove 'Dist to move text' to optimize space, Move 'Def. Home' button.
added rpt_btn mode and resetting of connected flag so connection to wiimote occurs in the thread, not the thread calling routine
updated with madgrizzle's LED gpio updates
in thread and thread reference because it cannot see the data object
wiiPendantThread.py file deleted and the thread call accesses a subroutine in the wiiPendant.py class file
added thread file contents as a procedure to be called within wiiPendant.py
…-improvements Desktop and Mobile UI improvements
… 3 decimal places.
…ile browsers except Firefox.
…low the navbar on mobile devices.
regular expression finds R in the string then string.find used for "G03 and G02" string.replace puts in G01 instead of 3 or 2 and then the string is split at R and truncated so the radius becomes a line.
…pindlespeed Fix M3 with no spindle speed.
changed location for min and max calculations for cut limits
addes space before sled position calculated numbers were not scaled properly
added webcontrol start, restart, and stop bash scripts
changed process start commands in main and button. added comment in pendant
Added rpi "turn off" button to action menu in action.html right below Webcontrol shutdown added os.exit(0) to main that handles "turn off" request from action.html
os.system call to shut down.
when user lacks sufficient rights to run sudo commands, provide appropriate notification
added enableRPIshutdown variable in webPageProcessor.py that gets rendered into the actions.html page. In that page the if statement checks the boolean value of enableRPIshutdown and either displays or hids the RPI shutdown button. From there, actions.py calls turnOff() which then does a 'sudo --non-interactive shutdown -h now' function call (from subprocess) to shutdown the raspberry pi.
as well as "RPI" stored in self.data.platform will toggle rpi shutdown button option in actions menu
…tton Rpi off menu button
added workspace file changed gcodeFile.py to reinsert the try case around the erroring code so it coudlb e traced.
Contributor
Author
|
This is being closed for 3 reasons:
The plan is to start a new branch after 1650 and rpi_shutdown are pulled in and then submit one feature at a time as PRs with fewer items to review. This branch demonstrates the concept can work but is very difficult to follow all the changes. Many of which are because I'm so new to this developemental workflow. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Raspberry pi additions all run in Python 3.8.3
data.py has flag for python version to fix deprecated string parse function in gcodeFile.py
MaslowButton service runs from /usr/local/etc and uses webcontrol gpio setup to read buttons
-relies on new code in main.py to communicate via requests.get and requests. put commands
-has command line display options
-sets up the gpio here instead of in the gpioactions.py file
MaslowPendant service runs from /usr/local/etc and interfaces via bluetooth with wii remote
-requires cwiid module import
-relies on new code in main.py to communicate via requests.put command
gcodeFile.py file has modifications for updating command line interface (CLI) dislplay
added settings in webcontrol.json
command line display
button service
pendant connected
main.py has route for pendant or button interaction
/gpio calls web input function
/led returns json data with system settings to display on CLI
shows sled coordinates, home coordinates, pendant status, cut run time, and bounds of cut from home location
/pendant calls web input function
toggles for selecting pendant, cli, and rpi button service show in maslow settings