lefake/S4-P3-Projet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
81 Commits 1 Branch 0 Tags
8c08de315f8d2630c5bdb412d50f08eb1a8d8ed9
Commit Graph

81 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc-Antoine
8c08de315f Merge pull request #66 from marc4492/rename_modules 
Rename modules
 2019-04-06 15:19:31 -04:00
Marc-Antoine Lafreniere
31c8ae3470 Rename modules 
Rename modules with better name and move the arduino code to its own folder
 2019-04-06 15:17:02 -04:00
IanLalonde
19e698e15e Merge pull request #65 from marc4492/#55_Create_UI_frame 
#55 create ui frame
 2019-04-06 15:03:34 -04:00
Ian
3939b8d590 Merge branch 'master' into #55_Create_UI_frame 2019-04-06 14:56:57 -04:00
Ian
89e751350c #55 float can be entered for dimensions 
changed verifications so dimensions entry can be floats
 2019-04-06 14:04:10 -04:00
Marc-Antoine
d5d56968b8 Merge pull request #62 from marc4492/#51-BuildingofG-28request 
Building of G-28 request
 2019-04-06 12:57:17 -04:00
Marc-Antoine Lafreniere
63152a5991 Refactor serial read 
Ease usage of the serialread if statements
 2019-04-06 12:50:15 -04:00
Marc-Antoine Lafreniere
06da9b8bb4 Bug fixes 
Fix emergency state issue
 2019-04-06 12:47:06 -04:00
Marc-Antoine Lafreniere
98c01ad36e Refactor and bug fixes 
Fix homing issue
Add motor direction as constant
 2019-04-06 11:17:55 -04:00
IanLalonde
7f0756ec0f Update README.md 2019-04-04 12:39:07 -04:00
IanLalonde
ddf75db254 Update README.md 2019-04-04 12:38:26 -04:00
IanLalonde
e92c46ed83 Update README.md 2019-04-04 12:36:37 -04:00
IanLalonde
b128752273 Update README.md 2019-04-04 12:34:19 -04:00
IanLalonde
b5bf5b0c1c Update README.md 2019-04-04 12:33:03 -04:00
IanLalonde
5a8d1b52bc Update README.md 2019-04-04 12:31:40 -04:00
IanLalonde
15fa1efb77 Update README.md 2019-04-04 12:30:37 -04:00
IanLalonde
ad42d74f1a Create README.md 2019-04-04 12:25:42 -04:00
Marc-Antoine Lafreniere
4867ccb626 Add error code 
reviewed with @IanLalonde
 2019-04-04 11:02:51 -04:00
Marc-Antoine
8ddd03d847 Merge pull request #64 from marc4492/#60CreateUItocontrolthedevice 
#60 Create UI to control the device
 2019-04-02 18:07:30 -04:00
IanLalonde
1a97eb015d Merge pull request #63 from marc4492/#55_Create_UI_frame 
#55 create ui frame
 2019-04-02 15:34:32 -04:00
Marc-Antoine Lafreniere
0a6e5041fc Merge branch 'master' into #60CreateUItocontrolthedevice 2019-04-02 14:38:15 -04:00
Marc-Antoine
7872676176 Merge pull request #59 from marc4492/#45-SendGCodecommandtotheArduino 
#45 send g codecommandtothe arduino
 2019-04-02 14:37:12 -04:00
Ian
22b632da9b #55 verify entries to be the right type 
verify the entries and tells the user when the wrong type is entered
 2019-03-27 13:13:48 -04:00
Marc-Antoine Lafreniere
3f0e4080a4 #60 Create UI to control the device 
Create a UI to control the device in manual mode and auto mode
 2019-03-27 11:49:03 -04:00
Maxime
4753c2486b pull request review and changes. 
- Refactoring following pull requests.
 2019-03-27 10:59:08 -04:00
Maxime
bf1dfbaf7d Building of G-28 request 
This commit is for the implementation of the request G28, M18 and M112. G28 is for Homing, M18 is for emergency stop and M112 is for a full stop.
 2019-03-26 11:53:12 -04:00
Ian
f746e769fd #55 modification of the entries 
changing some entry boxes with other input methods to limit the choices of the user
 2019-03-25 21:15:20 -04:00
Ian
cf1ebd0e0f #55 first version of a working Ui 
Can only work if given the right parameters, (no safety)
 2019-03-24 20:48:45 -04:00
Ian
4593079feb Merge remote-tracking branch 'origin/#55_Create_UI_frame' into #55_Create_UI_frame 2019-03-20 13:51:59 -04:00
Marc-Antoine Lafreniere
7f85e02893 #55-UI frame 
Refactor main the ease usage in the UI
 2019-03-20 13:51:05 -04:00
Marc-Antoine Lafreniere
7469e58cdf #55-UI frame 
Refactor main the ease usage in the UI
 2019-03-20 13:48:58 -04:00
Marc-Antoine Lafreniere
2ec7984da2 #56-Delay in Arduino communication 
Wait for input from the arduino before sending next GCode command
 2019-03-20 13:25:30 -04:00
Marc-Antoine Lafreniere
736230eb48 Merge branch 'master' into #45-SendGCodecommandtotheArduino 2019-03-20 09:18:10 -04:00
Marc-Antoine
df46cbc405 Merge pull request #57 from marc4492/#42-convert_pbm 
#42 Run the c++ code to convert PBM binary to ascii
 2019-03-18 17:43:53 -04:00
IanLalonde
e91cb99d0c Merge pull request #58 from marc4492/#32-path_unit_test 
# 32 unit tests for path function
 2019-03-18 17:36:17 -04:00
Ian
6ee49008c0 # 32 unit tests for path function 
closes #32
 2019-03-18 15:26:24 -04:00
Marc-Antoine Lafreniere
30c219d6b2 #42 Run the c++ code to convert PBM binary to ascii 
Run the converter if the image is in binary
 2019-03-17 20:00:03 -04:00
Marc-Antoine Lafreniere
baeecfb47b Send all GCode command 
Read a gcode file and send it to the arduino
 2019-02-27 09:52:05 -05:00
Marc-Antoine
b4c50e2aea Merge pull request #40 from marc4492/#38-CreateGCodefromimage 
Convert matrix index to gcode
 2019-02-26 21:56:06 -05:00
RealMadMax
07cc9dd88a Merge pull request #44 from marc4492/#5-GCCodetoposition 
#5- Add OpenCR-Controler
 2019-02-26 21:45:48 -05:00
Maxime
65ca5c9e8c #5- Add OpenCR-Controler 
Initial state of  Gcode interpreter.
Only G0 implemented and others basics functions.
 2019-02-26 21:36:38 -05:00
Marc-Antoine Lafreniere
921e04f88c Fix issue with tool size 2019-02-26 20:54:19 -05:00
Marc-Antoine Lafreniere
46a3a02b2a Add functions description 
Add python documentation
 2019-02-26 17:51:53 -05:00
Marc-Antoine Lafreniere
1b4d729e87 Build fix 2019-02-21 13:59:17 -05:00
Marc-Antoine Lafreniere
f5599ce4b7 Create gcode file from image with arguments 
#38-Create GCode from image
closes #38
 2019-02-21 13:41:48 -05:00
Marc-Antoine Lafreniere
e842141e59 Merge branch 'master' into #38-CreateGCodefromimage 2019-02-20 15:52:00 -05:00
IanLalonde
51570b108d Merge pull request #41 from marc4492/#34-gcode_algo 
#34 gcode algo
 2019-02-20 15:49:12 -05:00
Ian
94bf542799 #34 gcode algo 
closes #34
algorithm that creates a gcode from a path
unittest for the algorithm
 2019-02-20 15:01:16 -05:00
Marc-Antoine Lafreniere
8aee76eee2 Convert matrix index to gcode 
#39 Save GCode in file
Convert a list of index to gcode string in an array
 2019-02-20 13:48:37 -05:00
Marc-Antoine
ef8e908c33 Merge pull request #37 from marc4492/#35-GenerateGCodefromlistmatrixindexes 
GCode generator and unittests
 2019-02-20 10:45:52 -05:00