Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesign Z controls #2190

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added LaserGRBL/Grafica/zcontrolv2.psd
Binary file not shown.
Binary file added LaserGRBL/Grafica/zdown01v2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LaserGRBL/Grafica/zdown10v2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LaserGRBL/Grafica/zdown1v2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LaserGRBL/Grafica/zup01v2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LaserGRBL/Grafica/zup10v2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added LaserGRBL/Grafica/zup1v2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
270 changes: 249 additions & 21 deletions LaserGRBL/JogForm.Designer.cs

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions LaserGRBL/JogForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ private void SettingsForm_SettingsChanged(object sender, EventArgs e)
{
TlpStepControl.Visible = !Settings.GetObject("Enable Continuous Jog", false);
TlpZControl.Visible = Settings.GetObject("Enale Z Jog Control", false);
TlpZControl2.Visible = Settings.GetObject("Enale Z Jog Control", false);
}

private void Core_JogStateChange(bool jog)
Expand Down
356 changes: 336 additions & 20 deletions LaserGRBL/JogForm.resx

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions LaserGRBL/LaserGRBL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -1059,6 +1059,12 @@
<None Include="Resources\flag_greece.png" />
<Content Include="Grafica\777494-200.png" />
<Content Include="Grafica\info.png" />
<None Include="Grafica\zdown01v2.png" />
<None Include="Grafica\zup01v2.png" />
<None Include="Grafica\zup1v2.png" />
<None Include="Grafica\zup10v2.png" />
<None Include="Grafica\zdown1v2.png" />
<None Include="Grafica\zdown10v2.png" />
<Content Include="Sound\beep.wav">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
Expand Down