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

105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
guillaumepepin
13ff1df9fc Add files via upload 2019-02-26 15:26:47 -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
Ian
5a40ea168e Merge branch 'master' into #34-gcode_algo 2019-02-20 10:42:32 -05:00
Marc-Antoine Lafreniere
c1a4c532d9 GCode generator and unittests 
closes #35
 2019-02-20 10:38:30 -05:00
Marc-Antoine
abd9d8093a Merge pull request #36 from marc4492/#33-Getpixelheightandwidth 
#33
 2019-02-19 23:07:13 -05:00
Marc-Antoine Lafreniere
462bab50d3 Unit test of pixel dimension 
close #33
 2019-02-16 21:01:18 -05:00
Marc-Antoine Lafreniere
2b1feca451 Fix tests 2019-02-16 20:37:17 -05:00
Marc-Antoine Lafreniere
ff7a860c2d Get pixel dimensions 
Add args to input width and height of the image
 2019-02-16 20:16:47 -05:00
Ian
ef266883ec #16 test images created 
close #16
 2019-02-14 11:50:04 -05:00
Ian
c82d077a04 Merge remote-tracking branch 'origin/master' 2019-02-12 20:01:09 -05:00
Ian
3babccc948 #23 create tool path from image, 
close #23
 2019-02-12 19:50:54 -05:00
Marc-Antoine
181500fffe Merge pull request #30 from marc4492/#25-create_unit_tests 
File utils refactor and unittests
 2019-02-12 13:59:13 -05:00
Marc-Antoine Lafreniere
9d235a803c Build fixes 2019-02-12 12:28:08 -05:00
Marc-Antoine Lafreniere
8fe6da67a3 Build fixes 2019-02-11 22:56:26 -05:00
Marc-Antoine Lafreniere
453a3f7c08 File utils refactor and unittests 
Create unit test for file utils
closes #25
closes #26
 2019-02-11 22:45:41 -05:00
Ian
8ca056fcdb Merge branch '#23-create_tool_path_from_image' 2019-02-11 18:59:55 -05:00
Ian
4d72fa9de4 update from last commit 
close #23
 2019-02-11 18:27:42 -05:00
Ian
1c2919ccd5 #23 create tool path from image, close #23 2019-02-11 18:24:57 -05:00
Ian
66955cb2c3 Merge branch 'master' into #23-create_tool_path_from_image 
Merge fixes
 2019-02-06 12:29:47 -05:00
Ian
a3160c6643 #23 create tool path from image 2019-02-06 11:50:25 -05:00
Marc-Antoine Lafreniere
9edf4dfd54 Setup build server 
Peer with @IanLalonde
 2019-02-06 10:03:27 -05:00
Marc-Antoine
00a928a114 Merge pull request #27 from marc4492/#24-createprojectstructureforunittests 
#24 Create project structure for unit tests
 2019-02-05 14:42:01 -05:00
Marc-Antoine Lafreniere
9ef1058012 #24 Create project structure for unit tests 
Refactor project's structure
closes #24
 2019-02-05 14:16:44 -05:00
Ian
d6a891cdbb #23 create tool path 
v2, removing 2s in a square instead of a cross
 2019-02-04 18:18:30 -05:00
Ian
e2bc465bb9 #23 create tool path 
first working version
 2019-02-04 16:41:18 -05:00
IanLalonde
b6bf4d9291 Merge pull request #22 from marc4492/#16-create_test_bench 
#16 create test bench
 2019-02-04 16:28:37 -05:00
Ian
495273a9b0 #16 create test bench 
6 first test images
 2019-02-04 16:20:07 -05:00
Marc-Antoine
1ad04c2f9d Merge pull request #21 from marc4492/#19_Reformat_pbm_file 
#19 - Reformat pbm file
 2019-02-04 16:04:44 -05:00