Skip to content

Commit bfa581c

Browse files
svenhbsvenhb
authored
Version 1.7.5.3
1 parent 2b49672 commit bfa581c

28 files changed

+1890
-1909
lines changed

‎GRBL-Plotter/MachineControl/ControlCameraForm.cs‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* GRBL-Plotter. Another GCode sender for GRBL.
22
This file is part of the GRBL-Plotter application.
33
4-
Copyright (C) 2015-2023 Sven Hasemann contact: [email protected]
4+
Copyright (C) 2015-2025 Sven Hasemann contact: [email protected]
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@ You should have received a copy of the GNU General Public License
3535
* 2023-01-22 line 546 use lock (Object is currently in use elsewhere. Source: System.Drawing Target:)
3636
* 2023-01-24 check range of index in line 1218
3737
* 2023-08-01 check if (!e.Bounds.IsEmpty)
38+
* 2025-03-12 l:1452 add class ini-file at the end
3839
*/
3940

4041
using AForge;
@@ -1445,6 +1446,38 @@ private void TabControl1_DrawItem(object sender, DrawItemEventArgs e)
14451446
};
14461447
g.DrawString(_tabPage.Text, _tabFont, _textBrush, _tabBounds, new StringFormat(_stringFlags));
14471448
}
1448-
14491449
}
1450+
1451+
public partial class IniFile
1452+
{
1453+
internal static string sectionCamera = "Camera";
1454+
internal static string[,] keyValueCamera = {
1455+
{"Fix Index", "cameraIndexFix"},
1456+
{"Fix Rotation", "cameraRotationFix"},
1457+
{"Fix Radius", "cameraTeachRadiusFix"},
1458+
{"Fix Scaling", "cameraScalingFix"},
1459+
{"Fix Offset X", "cameraZeroFixX"},
1460+
{"Fix Offset Y", "cameraZeroFixY"},
1461+
1462+
{"XY Index", "cameraIndexXy"},
1463+
{"XY Rotation", "cameraRotationXy"},
1464+
{"XY Radius", "cameraTeachRadiusXy"},
1465+
{"XY Scaling", "cameraScalingXy"},
1466+
{"XY Offset X", "cameraToolOffsetX"},
1467+
{"XY Offset Y", "cameraToolOffsetY"},
1468+
{"XY Top Pos", "cameraPosTop"},
1469+
{"XY Top Radius", "cameraTeachRadiusXyzTop"},
1470+
{"XY Top Scaling", "cameraScalingXyzTop"},
1471+
{"XY Bottom Pos", "cameraPosBot"},
1472+
{"XY Bottom Radius", "cameraTeachRadiusXyzBot"},
1473+
{"XY Bottom Scaling", "cameraScalingXyzBot"},
1474+
1475+
{"Fiducial Name", "importFiducialLabel"},
1476+
{"Fiducial Skip", "importFiducialSkipCode"},
1477+
{"Parameter Set 1", "camShapeSet1"},
1478+
{"Parameter Set 2", "camShapeSet2"},
1479+
{"Parameter Set 3", "camShapeSet3"},
1480+
{"Parameter Set 4", "camShapeSet4"}
1481+
};
1482+
}
14501483
}

‎GRBL-Plotter/MachineControl/ControlSerialForm.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* GRBL-Plotter. Another GCode sender for GRBL.
22
This file is part of the GRBL-Plotter application.
33
4-
Copyright (C) 2015-2023 Sven Hasemann contact: [email protected]
4+
Copyright (C) 2015-2025 Sven Hasemann contact: [email protected]
55
66
This program is free software: you can redistribute it and/or modify
77
it under the terms of the GNU General Public License as published by
@@ -69,6 +69,7 @@ This project was my starting point
6969
* 2023-06-28 l:665 f:AddToLog limit amount of lines to 10000 replaced RichTextBox by TextBox
7070
* 2023-07-27 l:269 f:SerialForm_FormClosing set grblCharacterCounting = true; // may helps to avoid locking the form
7171
* 2023-09-16 l:342 f:CopySelectionToClipboard add try catch
72+
* 2025-03-06 l:830 f:JustgrblReset - cbPort.Text = "COM1" on TimeoutException, to avoid same exception on next program start
7273
*/
7374

7475
// OnRaiseStreamEvent(new StreamEventArgs((int)lineNr, codeFinish, buffFinish, status));
@@ -826,6 +827,7 @@ private void JustgrblReset()
826827
serialPortError = true;
827828
timerSerial.Enabled = false;
828829
DisconnectFromGrbl(null, null); // ClosePortSerial();
830+
cbPort.Text = "COM1";
829831
LogError("! Error sending reset (Ctrl-X)", err);
830832
}
831833
catch (Exception err)
@@ -1461,7 +1463,7 @@ private void BtnCheckGRBLResult_Click(object sender, EventArgs e)
14611463

14621464
public bool FlagGrblSettingClick { get; set; } = false;
14631465
private void BtnGRBLCommand1_Click(object sender, EventArgs e) // $$and $x=val - View and write Grbl settings
1464-
{ RequestSend("$$"); GRBLSettings.Clear(); FlagGrblSettingClick = true; }
1466+
{ RequestSend("$$"); GRBLSettings.Clear(); Grbl.Settings.Clear(); FlagGrblSettingClick = true; }
14651467
private void BtnGRBLCommand2_Click(object sender, EventArgs e) // $# - View gcode parameters
14661468
{ RequestSend("$#"); }
14671469
private void BtnGRBLCmndParser_Click(object sender, EventArgs e) // $G - View gcode parser state

‎GRBL-Plotter/MachineControl/ControlSerialFormInterface.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -899,6 +899,7 @@ private void ProcessGrblUserQuery(string rxStringTmp) // see also FeedBackSettin
899899
AddToLog(string.Format("< {0}", rxStringTmp));
900900

901901
GRBLSettings.Add(rxStringTmp);
902+
Grbl.Settings.Add(rxStringTmp);
902903
Grbl.SetSettings(id, val); // splt[1]
903904
OnRaiseStreamEvent(new StreamEventArgs(id, 0, 0, 0, GrblStreaming.setting));
904905
}

‎GRBL-Plotter/MachineControl/ControlSerialFormStreaming.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,10 +434,10 @@ private void AddCodeFromFile(string fileRaw, int linenr)
434434
return;
435435

436436
string file = Datapath.MakeAbsolutePath(fileRaw);
437-
if (Path.GetFileName(file) == string.Empty) // path but no filename
438-
return;
437+
Logger.Info("◯◯◯ AddCodeFromFile line:{0} fileRaw:{1} file:{2}", linenr, fileRaw, file);
439438

440-
Logger.Info("◯◯◯ AddCodeFromFile file:{0} line:{1}", file, linenr);
439+
if (Path.GetFileName(file) == string.Empty) // path but no filename
440+
{ return; }
441441

442442
if (File.Exists(file))
443443
{
@@ -715,6 +715,7 @@ private void SendStreamEvent(GrblStreaming status, int linePause = -1)
715715
}
716716
}
717717
else { progressUpdateMarker = true; }
718+
//Logger.Trace("Progress:{0,3}% sent:{1} confirmed:{2} time:{3}", codeFinish, lineNrSent, lineNrConfirmed, DateTime.Now.ToString("HH:mm:ss"));
718719
OnRaiseStreamEvent(new StreamEventArgs(lineNrSent, lineNrConfirmed, codeFinish, buffFinish, status));
719720
}
720721

‎GRBL-Plotter/MachineControl/ControlSetupForm.Designer.cs‎

Lines changed: 95 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎GRBL-Plotter/MachineControl/ControlSetupForm.ar.resx‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4005,4 +4005,27 @@ Pushbullet: لأسباب تتعلق بالسلامة ، يجب عليك استخ
40054005
<data name="CbToolChangeM6PassThrough.ToolTip" xml:space="preserve">
40064006
<value>ملحوظة: لا يمكن لـ Grbl "الكلاسيكي" على Arduino Uno معالجة أمر M6 ويعطي خطأ.</value>
40074007
</data>
4008+
<data name="BtnSetGrblCustomString.Text" xml:space="preserve">
4009+
<value>تعيين</value>
4010+
</data>
4011+
<data name="BtnSetGrblCustomString.ToolTip" xml:space="preserve">
4012+
<value>تعيين/تجاوز السلسلة المخصصة. ثم قم بإعادة ضبط وحدة التحكم لقراءة السلسلة المخصصة.
4013+
لتعيين هذه السلسلة، أرسل Grbl $I=xxx، حيث xxx هي سلسلة التخصيص الخاصة بك والتي يقل طولها عن 80 حرفًا. يتم تخزين هذه السلسلة بأحرف كبيرة، ويتم إزالة المسافات، ويمكن أن تحتوي على أحرف أبجدية رقمية فقط.</value>
4014+
</data>
4015+
<data name="label115.Text" xml:space="preserve">
4016+
<value>سلسلة - اسم الملف المطلوب</value>
4017+
</data>
4018+
<data name="CbLoadMachineDefaults.Text" xml:space="preserve">
4019+
<value>تحميل الإعدادات الافتراضية</value>
4020+
</data>
4021+
<data name="CbLoadMachineDefaults.ToolTip" xml:space="preserve">
4022+
<value>يقوم بتحميل الإعدادات الافتراضية مرة واحدة فقط، بعد الاتصال، إذا تم العثور على اسم الملف.</value>
4023+
</data>
4024+
<data name="label114.Text" xml:space="preserve">
4025+
<value>يستخدم السلسلة المخصصة "$I" كاسم ملف لتحميل حالة الاستخدام من data\usecases.
4026+
استخدم "تصدير إعدادات الجهاز" لحفظ "الإعدادات الافتراضية".</value>
4027+
</data>
4028+
<data name="GbGrblDefaults.Text" xml:space="preserve">
4029+
<value>تحميل الإعدادات الافتراضية عند الاتصال</value>
4030+
</data>
40084031
</root>

0 commit comments

Comments
 (0)