Skip to content

Commit

Permalink
#1.0c
Browse files Browse the repository at this point in the history
  • Loading branch information
@MakeMagazinDE
MakeMagazinDE committed Oct 1, 2015
1 parent 46ae37f commit e5f6a62
Show file tree
Hide file tree
Showing 7 changed files with 169 additions and 163 deletions.
28 changes: 14 additions & 14 deletions GRBLize.dproj.local
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<BorlandProject>
<Transactions>
<Transaction>1899.12.30 00:00:00.000.dfm,E:\Dropbox\GRBL_644\GRBLSEND\drawing_window.dfm=</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\GRBL_644\GRBLSEND\hpgl_import.pas=E:\Dropbox\GRBL_644\GRBLSEND\hpgl_import.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.dfm,E:\Dropbox\ProjDelphi\GRBLSEND\Demo01_MainForm.dfm=E:\Dropbox\ProjDelphi\GRBLSEND\main.dfm</Transaction>
<Transaction>1899.12.30 00:00:00.000.dfm,E:\Dropbox\GRBL_644\GRBLSEND\drawing_window.dfm=</Transaction>
<Transaction>1899.12.30 00:00:00.000.221,E:\Dropbox\GRBLize_XE8\grbl_com.pas=E:\Dropbox\GRBLize_XE8\grbl_com115.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\GRBL_644\GRBLSEND\hpgl_import.pas=E:\Dropbox\GRBL_644\GRBLSEND\hpgl_import.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\GIT\GRBL-JOG\GRBLSEND\Unit3.pas=E:\Dropbox\GIT\GRBL-JOG\GRBLSEND\cam_view.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\ProjDelphi\GRBLSEND\ColorButton.pas=</Transaction>
<Transaction>1899.12.30 00:00:00.000.276,E:\Dropbox\GRBLize_XE8\grbl_settings.inc=E:\Dropbox\GRBLize_XE8\Neu1.inc</Transaction>
Expand Down Expand Up @@ -44,21 +44,21 @@
<Transaction>1899.12.30 00:00:00.000.628,E:\Dropbox\GIT\GRBLize\GLMultiPolygon.pas=E:\Dropbox\GIT\GRBLize\Neu1.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.827,E:\Dropbox\GRBLize_XE8\drill_import.inc=E:\Dropbox\GRBLize_XE8\drill_import.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\GRBL_644\GRBLSEND\path_calc.pas=</Transaction>
<Transaction>1899.12.30 00:00:00.000.005,E:\Dropbox\GIT\GRBLize\GLMultiPolygon.pas=</Transaction>
<Transaction>1899.12.30 00:00:00.000.890,E:\Dropbox\GIT\GRBLize\GLMultiPolygon.pas=</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\ProjDelphi\HX3 Remote\grbl_com.pas=E:\Dropbox\ProjDelphi\HX3 Remote\hx3_com.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\ProjDelphi\HX3 Remote\hx3_com.pas=E:\Dropbox\ProjDelphi\HX3 Remote\grbl_com.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.005,E:\Dropbox\GIT\GRBLize\GLMultiPolygon.pas=</Transaction>
<Transaction>1899.12.30 00:00:00.000.167,=E:\Dropbox\GIT\GRBLize\GLMultiPolygon.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.890,E:\Dropbox\GIT\GRBLize\GLMultiPolygon.pas=</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\GIT\GRBL-JOG\GRBLSEND\glscene_view.pas=</Transaction>
<Transaction>1899.12.30 00:00:00.000.126,=E:\Dropbox\GRBLize_XE8\Neu1.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.418,=E:\Dropbox\GRBLize_XE8\Neu1.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.200,=E:\Dropbox\GRBLize_XE8\Neu1.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\GIT\GRBL-JOG\GRBLSEND\dsruler\dsRuler.pas=</Transaction>
<Transaction>1899.12.30 00:00:00.000.dfm,E:\Dropbox\GIT\GRBL-JOG\GRBLSEND\drawing.dfm=</Transaction>
<Transaction>1899.12.30 00:00:00.000.619,=E:\Dropbox\GRBLize_XE8\Neu1.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.200,=E:\Dropbox\GRBLize_XE8\Neu1.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.904,E:\Dropbox\GRBLize_XE8\grbl_com115.pas=E:\Dropbox\GRBLize_XE8\grbl_com.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.416,=E:\Dropbox\GRBLize_XE8\Neu1.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.405,=E:\Dropbox\GRBLize_XE8\Neu1.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.904,E:\Dropbox\GRBLize_XE8\grbl_com115.pas=E:\Dropbox\GRBLize_XE8\grbl_com.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.418,=E:\Dropbox\GRBLize_XE8\Neu1.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.619,=E:\Dropbox\GRBLize_XE8\Neu1.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.dfm,E:\Dropbox\GIT\GRBL-JOG\GRBLSEND\glscene.dfm=E:\Dropbox\GIT\GRBL-JOG\GRBLSEND\glscene_view.dfm</Transaction>
<Transaction>1899.12.30 00:00:00.000.inc,E:\Dropbox\GIT\GRBL-JOG\GRBLSEND\hpgl_import.inc=E:\Dropbox\GIT\GRBL-JOG\GRBLSEND\drl_import.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\GRBL_644\GRBLSEND\drawing.pas=E:\Dropbox\GRBL_644\GRBLSEND\drawing_window.pas</Transaction>
Expand All @@ -68,16 +68,16 @@
<Transaction>1899.12.30 00:00:00.000.inc,E:\Dropbox\GRBL_644\GRBLSEND\hpgl_import.inc=</Transaction>
<Transaction>1899.12.30 00:00:00.000.637,E:\Dropbox\GRBLize_XE8\page_job.inc=E:\Dropbox\GRBLize_XE8\Neu1.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.358,E:\Dropbox\GRBLize_XE8\gcode_interpreter.inc=E:\Dropbox\GRBLize_XE8\gcode_interpreter.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.745,E:\Dropbox\GRBLize_XE8\GRBLize.dproj=E:\Dropbox\GRBLize_XE8\GRBLize.dproj</Transaction>
<Transaction>1899.12.30 00:00:00.000.225,E:\Dropbox\GRBLize_XE8\GRBLize.dproj=E:\Dropbox\GRBLize_XE8\GRBLize.dproj</Transaction>
<Transaction>1899.12.30 00:00:00.000.276,E:\Dropbox\GRBLize_XE8\page_grblsetup.inc=E:\Dropbox\GRBLize_XE8\page_grblsetup.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.478,E:\Dropbox\GRBLize_XE8\page_grblsetup.inc=E:\Dropbox\GRBLize_XE8\grbl_settings.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.inc,E:\Dropbox\GIT\GRBL-JOG\GRBLSEND\drawing.inc=</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\ProjDelphi\HX3 Remote\hx3_com.pas=</Transaction>
<Transaction>1899.12.30 00:00:00.000.276,E:\Dropbox\GRBLize_XE8\page_grblsetup.inc=E:\Dropbox\GRBLize_XE8\page_grblsetup.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.inc,E:\Dropbox\GIT\GRBL-JOG\GRBLSEND\drawing.inc=</Transaction>
<Transaction>1899.12.30 00:00:00.000.192,E:\Dropbox\GRBLize_XE8\hpgl_import.inc=E:\Dropbox\GRBLize_XE8\hpgl_import.inc</Transaction>
<Transaction>1899.12.30 00:00:00.000.225,E:\Dropbox\GRBLize_XE8\GRBLize.dproj=E:\Dropbox\GRBLize_XE8\GRBLize.dproj</Transaction>
<Transaction>1899.12.30 00:00:00.000.132,E:\Dropbox\GRBLize_XE8\GRBLize.dproj=E:\Dropbox\GRBLize_XE8\GRBLize.dproj</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\ProjDelphi\GRBLSEND\Demo01_MainForm.pas=E:\Dropbox\ProjDelphi\GRBLSEND\main.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.233,E:\Dropbox\GRBLize_XE8\GRBLize.dproj=E:\Dropbox\GRBLize_XE8\GRBLize.dproj</Transaction>
<Transaction>1899.12.30 00:00:00.000.745,E:\Dropbox\GRBLize_XE8\GRBLize.dproj=E:\Dropbox\GRBLize_XE8\GRBLize.dproj</Transaction>
<Transaction>1899.12.30 00:00:00.000.pas,E:\Dropbox\ProjDelphi\GRBLSEND\Demo01_MainForm.pas=E:\Dropbox\ProjDelphi\GRBLSEND\main.pas</Transaction>
<Transaction>1899.12.30 00:00:00.000.132,E:\Dropbox\GRBLize_XE8\GRBLize.dproj=E:\Dropbox\GRBLize_XE8\GRBLize.dproj</Transaction>
</Transactions>
<ProjectSortOrder AutoSort="0" SortType="0">
<File Path="DirectX"/>
Expand Down
129 changes: 67 additions & 62 deletions GRBLize.dsk
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,47 @@
[Closed Files]
File_0=TSourceModule,'E:\GIT Heise\GRBLize\deviceselect.pas',0,1,19,1,1,0,0,,
File_1=TSourceModule,'E:\Dropbox\GLScene_VCL\Source\GLWin32Context.pas',0,1,159,1,182,0,0,,
File_2=TSourceModule,'E:\Dropbox\GRBLize_XE8\glscene_view.pas',0,1,415,42,445,0,0,,
File_3=TSourceModule,'E:\Dropbox\GRBLize_XE8\page_run.pas',0,1,503,1,537,0,0,,
File_4=TSourceModule,'E:\Dropbox\GRBLize_XE8\import_files.pas',0,1,174,23,190,0,0,,
File_5=TSourceModule,'E:\Dropbox\GRBLize_XE8\gcode_interpreter.pas',0,1,1,20,210,0,0,,
File_6=TSourceModule,'E:\Dropbox\GRBLize_XE8\hpgl_import.pas',0,1,1,1,1,0,0,,
File_7=TSourceModule,'E:\GIT Heise\GRBLize\page_job.pas',0,1,1,34,13,0,0,,
File_8=TSourceModule,'E:\GIT Heise\GRBLize\grbl_player_main.pas',0,1,1,1,1,0,0,,
File_9=TSourceModule,'E:\GIT Heise\GRBLize\ABOUT.PAS',0,1,29,1,30,0,0,,
File_10=TSourceModule,'E:\Dropbox\GRBLize_XE8\drill_import.pas',0,1,42,48,53,0,0,,
File_11=TSourceModule,'E:\Dropbox\glscene_vcl\samples\delphi\demos\computing\vertexdatageneration\uDemo.pas',0,1,1,1,1,0,0,,
File_12=TSourceModule,'E:\Dropbox\GIT\GRBLize\glscene_view.pas',0,1,223,1,233,0,0,,
File_13=TSourceModule,'E:\Dropbox\GLScene_VCL\Samples\Delphi\Demos\movements\SmoothNavigator\uMainForm.pas',0,1,20,82,67,0,0,,
File_0=TSourceModule,'E:\Dropbox\GRBLize_XE8\page_grblsetup.pas',0,1,58,1,41,0,0,,
File_1=TSourceModule,'E:\Dropbox\GRBLize_XE8\deviceselect.pas',0,1,10,100,9,0,0,,
File_2=TSourceModule,'E:\GIT Heise\GRBLize\page_grblsetup.pas',0,1,58,1,92,0,0,,
File_3=TSourceModule,'E:\Dropbox\GRBLize_XE8\ftdiclass\FTDItypes.pas',0,1,109,50,133,0,0,,
File_4=TSourceModule,'E:\GIT Heise\GRBLize\deviceselect.pas',0,1,19,1,1,0,0,,
File_5=TSourceModule,'E:\Dropbox\GLScene_VCL\Source\GLWin32Context.pas',0,1,159,1,182,0,0,,
File_6=TSourceModule,'E:\Dropbox\GRBLize_XE8\glscene_view.pas',0,1,415,42,445,0,0,,
File_7=TSourceModule,'E:\Dropbox\GRBLize_XE8\page_run.pas',0,1,503,1,537,0,0,,
File_8=TSourceModule,'E:\Dropbox\GRBLize_XE8\import_files.pas',0,1,174,23,190,0,0,,
File_9=TSourceModule,'E:\Dropbox\GRBLize_XE8\gcode_interpreter.pas',0,1,1,20,210,0,0,,
File_10=TSourceModule,'E:\Dropbox\GRBLize_XE8\hpgl_import.pas',0,1,1,1,1,0,0,,
File_11=TSourceModule,'E:\GIT Heise\GRBLize\page_job.pas',0,1,1,34,13,0,0,,
File_12=TSourceModule,'E:\GIT Heise\GRBLize\ABOUT.PAS',0,1,29,1,30,0,0,,
File_13=TSourceModule,'E:\Dropbox\GRBLize_XE8\drill_import.pas',0,1,42,48,53,0,0,,
File_14=TSourceModule,'E:\Dropbox\glscene_vcl\samples\delphi\demos\computing\vertexdatageneration\uDemo.pas',0,1,1,1,1,0,0,,

[Modules]
Module0=E:\Dropbox\GRBLize_XE8\grbl_com.pas
Module1=E:\Dropbox\GRBLize_XE8\ftdiclass\FTDItypes.pas
Module2=E:\Dropbox\GRBLize_XE8\page_grblsetup.pas
Module3=E:\Dropbox\GRBLize_XE8\grbl_player_main.pas
Module4=E:\GIT Heise\GRBLize\page_grblsetup.pas
Module5=default.htm
Module6=E:\Dropbox\GRBLize_XE8\deviceselect.pas
Module0=E:\GIT Heise\GRBLize\drawing_window.pas
Module1=E:\GIT Heise\GRBLize\cam_view.pas
Module2=E:\GIT Heise\GRBLize\grbl_player_main.pas
Module3=E:\GIT Heise\GRBLize\grbl_com.pas
Module4=E:\Dropbox\GRBLize_XE8\grbl_player_main.pas
Module5=E:\Dropbox\GRBLize_XE8\grbl_com.pas
Module6=default.htm
Count=7
EditWindowCount=1

[E:\Dropbox\GRBLize_XE8\grbl_com.pas]
[E:\GIT Heise\GRBLize\drawing_window.pas]
ModuleType=TSourceModule
FormState=0
FormState=1
FormOnTop=0

[E:\Dropbox\GRBLize_XE8\ftdiclass\FTDItypes.pas]
[E:\GIT Heise\GRBLize\cam_view.pas]
ModuleType=TSourceModule
FormState=0
FormState=1
FormOnTop=0

[E:\Dropbox\GRBLize_XE8\page_grblsetup.pas]
[E:\GIT Heise\GRBLize\grbl_player_main.pas]
ModuleType=TSourceModule
FormState=1
FormOnTop=0

[E:\GIT Heise\GRBLize\grbl_com.pas]
ModuleType=TSourceModule
FormState=0
FormOnTop=0
Expand All @@ -45,22 +51,17 @@ ModuleType=TSourceModule
FormState=1
FormOnTop=0

[E:\GIT Heise\GRBLize\page_grblsetup.pas]
[E:\Dropbox\GRBLize_XE8\grbl_com.pas]
ModuleType=TSourceModule
FormState=0
FormOnTop=0

[default.htm]
ModuleType=TURLModule

[E:\Dropbox\GRBLize_XE8\deviceselect.pas]
ModuleType=TSourceModule
FormState=1
FormOnTop=0

[EditWindow0]
ViewCount=7
CurrentEditView=E:\Dropbox\GRBLize_XE8\grbl_com.pas
CurrentEditView=E:\GIT Heise\GRBLize\drawing_window.pas
View0=0
View1=1
View2=2
Expand Down Expand Up @@ -102,8 +103,8 @@ WelcomePageURL=bds:/default.htm
[View1]
CustomEditViewType=TEditView
Module=E:\Dropbox\GRBLize_XE8\grbl_com.pas
CursorX=32
CursorY=736
CursorX=66
CursorY=752
TopLine=719
LeftCol=1
Elisions=
Expand All @@ -112,62 +113,61 @@ EditViewName=E:\Dropbox\GRBLize_XE8\grbl_com.pas

[View2]
CustomEditViewType=TEditView
Module=E:\Dropbox\GRBLize_XE8\ftdiclass\FTDItypes.pas
CursorX=50
CursorY=133
TopLine=109
Module=E:\GIT Heise\GRBLize\drawing_window.pas
CursorX=63
CursorY=1052
TopLine=1193
LeftCol=1
Elisions=
Bookmarks=
EditViewName=E:\Dropbox\GRBLize_XE8\ftdiclass\FTDItypes.pas
EditViewName=E:\GIT Heise\GRBLize\drawing_window.pas

[View3]
CustomEditViewType=TEditView
Module=E:\Dropbox\GRBLize_XE8\page_grblsetup.pas
CursorX=1
CursorY=63
TopLine=25
Module=E:\GIT Heise\GRBLize\cam_view.pas
CursorX=37
CursorY=186
TopLine=17
LeftCol=1
Elisions=
Bookmarks=
EditViewName=E:\Dropbox\GRBLize_XE8\page_grblsetup.pas
EditViewName=E:\GIT Heise\GRBLize\cam_view.pas

[View4]
CustomEditViewType=TEditView
Module=E:\Dropbox\GRBLize_XE8\grbl_player_main.pas
CursorX=12
CursorY=460
TopLine=430
Module=E:\GIT Heise\GRBLize\grbl_player_main.pas
CursorX=1
CursorY=696
TopLine=670
LeftCol=1
Elisions=
Bookmarks=
EditViewName=E:\Dropbox\GRBLize_XE8\grbl_player_main.pas
EditViewName=E:\GIT Heise\GRBLize\grbl_player_main.pas

[View5]
CustomEditViewType=TEditView
Module=E:\GIT Heise\GRBLize\page_grblsetup.pas
CursorX=1
CursorY=92
TopLine=58
Module=E:\GIT Heise\GRBLize\grbl_com.pas
CursorX=14
CursorY=851
TopLine=839
LeftCol=1
Elisions=
Bookmarks=
EditViewName=E:\GIT Heise\GRBLize\page_grblsetup.pas
EditViewName=E:\GIT Heise\GRBLize\grbl_com.pas

[View6]
CustomEditViewType=TEditView
Module=E:\Dropbox\GRBLize_XE8\deviceselect.pas
CursorX=18
CursorY=1
TopLine=1
Module=E:\Dropbox\GRBLize_XE8\grbl_player_main.pas
CursorX=12
CursorY=460
TopLine=430
LeftCol=1
Elisions=
Bookmarks=
EditViewName=E:\Dropbox\GRBLize_XE8\deviceselect.pas
EditViewName=E:\Dropbox\GRBLize_XE8\grbl_player_main.pas

[Breakpoints]
Count=1
Breakpoint0='E:\Dropbox\GRBLize_XE8\page_grblsetup.pas',41,'',0,1,'',1,0,0,'',1,'','','',0,''
Count=0

[EmbarcaderoWin32Debugger_AddressBreakpoints]
Count=0
Expand Down Expand Up @@ -321,6 +321,11 @@ Dockable=1
StayOnTop=0
SplitPos=111

[PropInspDesignerSelection]
ArrangeBy=Name
SelectedItem=,
ExpandedItems=Anchors=0,BorderIcons=0

[TFileExplorerForm]
PercentageSizes=1
Create=1
Expand Down
Binary file modified Win32/bin/GRBLize.exe
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions cam_view.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,16 +191,16 @@ procedure TForm3.BtnCamAtHiliteClick(Sender: TObject);
exit;

if HilitePoint >= 0 then begin
hilite_to_toolcursor;
hilite_to(x,y);
Form1.Memo1.lines.add('');
Form1.Memo1.lines.add('// OFFSET CAM TO POINT');
end else begin
hilite_center_to_toolcursor;
hilite_center_to(x,y);
Form1.Memo1.lines.add('');
Form1.Memo1.lines.add('// OFFSET CAM TO CENTER');
end;
x:= drawing_ToolPos.X-job.cam_x;
y:= drawing_ToolPos.Y-job.cam_y;
x:= x - job.cam_x;
y:= y - job.cam_y;
grbl_offsXY(x, y);
SetSimPositionMMxy(x, y);
NeedsRedraw:= true;
Expand Down
Loading

0 comments on commit e5f6a62

Please sign in to comment.