Baudrate limitation

GC-3.6.1-T1/README

@@ -0,0 +1,29 @@
+                        ---- GrblController ----
+
+GrblController is a gcode sender, monitor and homing tool for GRBL for
+Mac, Windows and Linux systems written using the Qt Desktop Framework in C++.
+
+Enhanced by Zapmaker. Kosme did a great deal of excellent foundation work on this
+project.
+
+Details on how to do this can be found here:
+http://zapmaker.org/
+
+
+V3.6.1-T1   (LETARTARE proposals June 01, 2014)
+
+- 3.6.1 +
+1- Improved to the same card 3 and 4 axis detection
+2- Displays the line numbers of the file if no number exists
+3- Updating of the French translation
+
+- Works with versions Grbl :
+   1- Three axes 0.8c, 0.9d, 0.9e,
+   2- Four axes 0845, future 0.8c1 (0.8c to 4 axes)
+
+
+
+
+
+
+

GC-3.6.1-T1/buildWin.txt

@@ -0,0 +1,25 @@
+builWin.txt by LETARTARE
+
+
+To build the executable under Windows, you must have
+1- a 'Qt' version installed and compiled, the tests were performed with 'Qt-4.7.3'.
+2- 'mingw32' installed to use 'mingw32-make.exe', the tests were performed with 'MinGw32-TDM-4.7.1'
+
+You have to adapt the file 'makeWin.bat' for the paths are correct.
+
+Example Qt4 :
+ 	set PATH_Qt=u:\DONNEES\SVN_COMPILE\qt\4.7.3
+	set PATH_MINGW32=o:\DevCpp\MinGw32-TDM
+
+Example Qt5 :
+ 	set PATH_QT=o:\DevCpp\Qt-5.3\5.2.0\mingw48_32\
+	set PATH_MINGW32=o:\DevCpp\Qt-5.3\Tools\mingw48_32\ 
+
+
+Open a DOS console and
+1 - makeWin.bat
+2 - execute.bat
+
+if you want the French translation
+3 - translate.bat
+4 - execute.bat

GC-3.6.1-T1/clean.bat

@@ -0,0 +1,26 @@
+rem clean.bat
+rem by LETARTARE
+
+rem Change with your paths
+
+rem QT5
+rem set PATH_QT=o:\DevCpp\Qt-5.3\5.2.0\mingw48_32\
+rem set PATH_MINGW32=o:\DevCpp\Qt-5.3\Tools\mingw48_32\ 
+
+
+rem Qt4 
+set PATH_QT=u:\DONNEES\SVN_COMPILE\qt\4.7.3\
+set PATH_MINGW32o:\DevCpp\MinGw32-TDM\
+
+
+echo off
+
+PATH = %PATH_QT%bin;%PATH_MINGW32%bin;%PATH%;
+
+set path
+
+cd src
+
+clean.bat
+
+

GC-3.6.1-T1/execute.bat

@@ -0,0 +1,8 @@
+rem execute.bat 
+rem by LETARTARE
+
+cd src\release
+
+GrblController.exe
+
+cd ..\..

GC-3.6.1-T1/mw.bat

@@ -0,0 +1,24 @@
+rem makeWin.bat
+rem by LETARTARE
+
+rem Change with your paths
+
+rem QT5
+rem set PATH_QT=o:\DevCpp\Qt-5.3\5.2.0\mingw48_32\
+rem set PATH_MINGW32=o:\DevCpp\Qt-5.3\Tools\mingw48_32\ 
+
+rem Qt4 
+set PATH_QT=u:\DONNEES\SVN_COMPILE\qt\4.7.3\
+set PATH_MINGW32o:\DevCpp\MinGw32-TDM\
+
+echo off
+
+PATH = %PATH_QT%bin;%PATH_MINGW32%bin;%PATH%;
+
+set path
+
+cd src
+
+makeWin.bat
+
+

.gitignore → GC-3.6.1-T1/src/.gitignore

@@ -11,3 +11,9 @@ settings
 ui_*.h
 Output/
 android/
+GrblController
+*.o
+moc_*.cpp
+qrc_*.cpp
+*.stash
+GrblController-local.iss

GcodeSenderGUIthreads.pro → GC-3.6.1-T1/src/GcodeSenderGUIthreads.pro

@@ -1,10 +1,16 @@
 #-------------------------------------------------
 #
-# Project created by QtCreator 2012-02-13T17:48:40
+# Project created by QtCreator 2012-02-13 T17:48:40
 #
+# (fourth axis modifications and translation added by LETARTARE 2013-08-03)
 #-------------------------------------------------
 
-QT       += core gui widgets
+QT       += core gui
+
+# LETARTARE  June 12, 2014
+contains(QT_VERSION, "^5.*") {
+   QT *= widgets
+}
 
 TARGET = GrblController
 TEMPLATE = app
@@ -99,3 +105,6 @@ OTHER_FILES += \
     android/src/org/kde/necessitas/origo/QtApplication.java \
     android/version.xml
 
+# Translations
+	TRANSLATIONS += trlocale/GrblController_xx.ts
+	TRANSLATIONS += trlocale/GrblController_fr.ts

GrblController.iss → GC-3.6.1-T1/src/GrblController.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Grbl Controller"
-#define MyAppVersion "3.4.3"
+#define MyAppVersion "3.6.1"
 #define MyAppPublisher "Zapmaker"
 #define MyAppURL "http://zapmaker.org"
 #define MyAppExeName "GrblController.exe"
@@ -25,7 +25,7 @@ AllowNoIcons=yes
 LicenseFile=C:\dev\github\GrblHoming\winlicense.txt
 InfoBeforeFile=C:\dev\github\GrblHoming\wininfobefore.txt
 InfoAfterFile=C:\dev\github\GrblHoming\wininfoafter.txt
-OutputBaseFilename=GrblController343Setup
+OutputBaseFilename=GrblController361Setup
 Compression=lzma
 SolidCompression=yes
 
@@ -38,6 +38,7 @@ Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescrip
 
 [Files]
 Source: "C:\dev\github\GrblHoming\release\GrblController.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\dev\github\GrblHoming\trlocale\*.qm"; DestDir: "{app}\trlocale"; Flags: ignoreversion
 Source: "C:\Qt\4.8.3\bin\libgcc_s_dw2-1.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Qt\4.8.3\bin\mingwm10.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "C:\Qt\4.8.3\bin\QtCore4.dll"; DestDir: "{app}"; Flags: ignoreversion