Submitted the PR and talked to Mitch. He’s working on some larger changes so he’s going to manually merge it in with the other stuff he’s working on.
2 Likes
@Michael_Melancon I see that Luc has made a number of useful changes to WebUI 3 related to extension functionality. I’m not sure if this is something you want to merge in yet? Maybe it makes sense to do that in a different branch? I’m willing to try and help if needed.
Comparing michmela44:3.0-FluidNCDev…luc-github:3.0 · michmela44/ESP3D-WEBUI
1 Like
I’ll try to take a look at it tomorrow. I’m travelling right now so I haven’t been paying as much attention to whether he was committing things or not
4 Likes
Ok, sounds good. No rush.
2 Likes
Ok, I merged all of his changes and it looks ok in the simulator at least.
If you want to give it a try and let me know if there are any issues, it’s published here:
4 Likes
Thank you Mike.
I think the merge is good but the updates caused a couple issues.
This broke a couple things on the tablet extension:
- It’s incorrectly using /sdfiles instead of /upload for listing files which is a FluidNC difference. This is due to an enhancements to the “capabilities” functionality, so it now needs to pass an “ID” of “connection” to get the connection details. The tablet extension uses this to determine if it is FluidNC so it knows which URL to use.
- The added fullscreen functionality works for panel extensions but not page extensions. The fullscreen button at the bottom just flashes fullscreen and goes out of it. This also means the fullscreen functionality I had added no longer works. I’m pretty sure it’s due to how it’s handling the fullscreenchange event.
Luc had created a “Click2Go” extension where you can click in a rectangle and go to that position. It has some issues but it generally works now where it didn’t at all on the previous v3 build.
Somewhere along the way something bad happened and I could no longer connect to the UI at all. This was while I was messing with the “Click2Go” extension. It has functionality to store extension-specific settings in preferences.json. I ended up resolving it by re-uploading index.html.gz and preferences.json via FluidTerm. I’m wondering if I tried updating the settings while it was moving and somehow that hosed my preferences.json.
This was changed awhile ago, but in the base WebUI, the “Emergency Stop” button label was changed to “Quick Stop” since it’s not really a true emergency stop. I’m not sure if that’s something that should be updated for FluidNC.
They should match.
The nature of the code layout means that when he changes the base code, the merge is all you need.
If he changes something under the targets/ folder, I have to manually search them out.
If there are easy fixes, you can submit a PR if you like and I will look through it in the morning.
Otherwise I’ll try to look through it in more detail sometime this week if I can
The “Quick Stop” label is just updating line 60 in \src\targets\CNC\FluidNC\translations\en.json:
"P15": "Emergency Stop",
Yeah, I knew where that one would be. I mostly meant for your #1 related to file listing.
Oh, that’s just an update to the tablet extension. The WebUI code is fine.
Oh ok. Maybe I misread.
I thought you meant it was something I needed to fix in the WebUI code to make the tablet extension be able to work correctly again
@jeyeager @Michael_Melancon and any other github users.
I am trying to understand how the branches work on github. Bart and Mitch fixed a homing problem that @vicious1 brought to their attention. If I were to download the homing_I_fix branch and install it, would I still have everything from 3.7.18?
The homing_I_fix branch shows 0 behind and 3 ahead.
The wmb-s3 shows 411 behind and 131 ahead. If I installed this would it be anything close to 3.7.18?
What does the behind and ahead mean?
Thanks
The ahead/behind is referring to commit differences between the selected branch and the default branch (main). So, homing_I_fix is 0 commits behind main, so it has everything, and is 3 commits ahead of main (the fixes).
So, in this case, homing_I_fix gives you what you want, the fixes on top of main.
Note that you could just add “homing_amps” to config.yaml that matches the “run_amps” under all of the tmc_2209 sections and skip this update.
tmc_2209:
addr: 0
cs_pin: NO_PIN
uart_num: 1
step_pin: I2SO.2
direction_pin: I2SO.1
disable_pin: I2SO.0
r_sense_ohms: 0.110000
run_amps: 0.800000
homing_amps: 0.800000
hold_amps: 0.500000
2 Likes
Thank you for the reply Jason. I have added homing_amps. I wonder what the other 2 fixes are?
They’re all related to the same fix. Second commit fixed where the code was called and third added a startup warning if the setting was missing.
1 Like
Those 3 are the different phases of the fix. I think it is actually complete now and should get merged soon.
I am looking to update the yaml’s right now, just have to make sure things are backwards compatible or if I need to make a new folder. Also wondering about the new webui, but I guess that is a seperate topic.
2 Likes
I just sent a message on the FluidNC Discord about the issues the latest WebUI has with the tablet extension. Otherwise, the latest WebUI build seems fine. It looks like all of these config changes affect both v2 and v3.
2 Likes
I don’t mind putting the newest webui in the V3 config folder. I think it is safest to keep the V2 config folder very plain (how I ship them).
In V3 the biggest issue I have is the “use this network” thing I am seeing on android. I need to check out this new UI and see if that is different now.
1 Like
Jason, did you ever make a repo with your theme’s?
1 Like