Lars Brubaker
|
591528ee91
|
Ran code maid against this code.
|
2015-04-08 15:20:10 -07:00 |
|
Lars Brubaker
|
1445945d9c
|
latest agg
|
2015-04-08 13:20:32 -07:00 |
|
Lars Brubaker
|
2b31beb864
|
latest matterslice
|
2015-04-08 12:30:16 -07:00 |
|
Lars Brubaker
|
412b23a1aa
|
Removed some dependencies.
Made sure paths correct on android
|
2015-04-07 17:29:38 -07:00 |
|
Lars Brubaker
|
7c8acf199e
|
Made UpdateControlData shared.
|
2015-04-07 15:54:20 -07:00 |
|
Lars Brubaker
|
2a2a9c2ebd
|
Merge branch '1.2.2' into development
Conflicts:
StaticData/PrinterSettings/RoBo 3D/R1/config.ini
|
2015-04-07 11:25:01 -07:00 |
|
Lars Brubaker
|
0c4e5866dc
|
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
|
2015-04-07 11:23:47 -07:00 |
|
Lars Brubaker
|
1cce6e1dc1
|
More descriptive naming of camera monitoring.
|
2015-04-07 11:23:23 -07:00 |
|
Lars Brubaker
|
7b40320dce
|
Merge pull request #230 from gregory-diaz/1.2.2
Added slice setting update to for Revolution 3D
|
2015-04-07 11:18:51 -07:00 |
|
Lars Brubaker
|
b4034567c4
|
Merge pull request #229 from gregory-diaz/new_revolution_3d_settings
Added most recent slice settings update for Revolution 3D
|
2015-04-07 11:18:43 -07:00 |
|
Gregory Diaz
|
2153df7923
|
Added slice setting update to for Revolution 3D
|
2015-04-07 10:54:03 -07:00 |
|
Gregory Diaz
|
cb74f82830
|
Added most recent slice settings update for Revolution 3D
|
2015-04-07 10:33:02 -07:00 |
|
Lars Brubaker
|
db3c2ed60d
|
on pause remember if we were printing from sd.
|
2015-04-07 10:19:49 -07:00 |
|
Lars Brubaker
|
f3bea1bb07
|
Adding in the touchscreen icons
Fixed the PrintProgressBar to move up and down.
|
2015-04-06 16:01:57 -07:00 |
|
Lars Brubaker
|
d4453d199b
|
Merge in touch screen code.
|
2015-04-06 15:39:22 -07:00 |
|
Lars Brubaker
|
d911e64ee3
|
check the filament used in the background task so it is cached before the ui is created.
|
2015-04-06 10:53:21 -07:00 |
|
Lars Brubaker
|
1aa57d0f70
|
Took out the Xamarin insights code.
|
2015-04-03 15:31:20 -07:00 |
|
Lars Brubaker
|
1ce2f09103
|
Just trying to get the Xamarin code in a place that works in release.
|
2015-04-03 14:38:00 -07:00 |
|
Lars Brubaker
|
0fead55523
|
Doing some test with Xamarin Insights.
|
2015-04-03 12:55:58 -07:00 |
|
Lars Brubaker
|
ac3cc0a835
|
Merge pull request #228 from gregory-diaz/mattercontrol_test_work
Added command line arguments to start mattercontrol in different states.
|
2015-04-02 16:49:45 -07:00 |
|
Lars Brubaker
|
92b0f974e3
|
latest agg
|
2015-04-02 16:21:21 -07:00 |
|
Gregory Diaz
|
92ab8374b4
|
Added command line arguments to start mattercontrol in different states.
|
2015-04-02 16:15:30 -07:00 |
|
Lars Brubaker
|
6d0d1da756
|
Refactoring ray trace stuff.
|
2015-04-02 14:10:12 -07:00 |
|
Lars Brubaker
|
ebdc415f7c
|
Merge pull request #227 from gregory-diaz/1.2.2
Start Gcode changes for robo
|
2015-04-01 17:43:53 -07:00 |
|
Lars Brubaker
|
6bea10f193
|
latest matter slice
|
2015-04-01 17:38:35 -07:00 |
|
Gregory Diaz
|
b847ed878d
|
Start Gcode changes for robo
|
2015-04-01 16:06:48 -07:00 |
|
Lars Brubaker
|
45c10f7b3c
|
latest agg
|
2015-04-01 15:56:28 -07:00 |
|
Lars Brubaker
|
a41d4f1162
|
Put in toolChangeCode option
|
2015-04-01 15:53:36 -07:00 |
|
Lars Brubaker
|
1ea8f3d0c3
|
Merge pull request #226 from gregory-diaz/development
Implemented the new start gcode requested by Robo
|
2015-04-01 11:27:36 -07:00 |
|
Lars Brubaker
|
b210fccae3
|
latest materslice
|
2015-04-01 11:19:13 -07:00 |
|
Lars Brubaker
|
115693ea42
|
More careful about checking for null serial port
|
2015-04-01 11:19:03 -07:00 |
|
Lars Brubaker
|
069fb3162d
|
latest matterslice
|
2015-04-01 10:26:26 -07:00 |
|
Gregory Diaz
|
154e76c0cb
|
Implemented the new start gcode requested by Robo
|
2015-04-01 10:23:22 -07:00 |
|
larsbrubaker
|
a47aab9b56
|
Latest matter slice.
|
2015-04-01 08:23:31 -07:00 |
|
Kevin Pope
|
cd34e4c6d3
|
Merge pull request #224 from gregory-diaz/Add_to_library
Added 'Add To Library' button and functionality to Queue
|
2015-03-31 17:29:07 -07:00 |
|
Gregory Diaz
|
312d36d8e9
|
Added 'Add To Library' button and functionality to Queue
|
2015-03-31 17:23:39 -07:00 |
|
Lars Brubaker
|
31172619f3
|
latest agg
|
2015-03-31 15:31:19 -07:00 |
|
Lars Brubaker
|
3e6c3ce2dc
|
latest matterslice
|
2015-03-31 15:30:23 -07:00 |
|
Lars Brubaker
|
c8a009be25
|
Made the M2 settings valid.
Put in a starting stl.
|
2015-03-30 18:16:53 -07:00 |
|
Kevin Pope
|
c084db5c62
|
Merge pull request #223 from gregory-diaz/development
added MakerGear to printer white list
|
2015-03-30 16:41:57 -07:00 |
|
Gregory Diaz
|
1391faad19
|
added MakerGear to printer white list
|
2015-03-30 16:39:53 -07:00 |
|
Lars Brubaker
|
c44e526585
|
new matterslice
|
2015-03-30 14:24:33 -07:00 |
|
Lars Brubaker
|
576fa8146d
|
latest matterslice
|
2015-03-30 10:56:22 -07:00 |
|
Lars Brubaker
|
cabffd4f3a
|
Merge pull request #222 from gregory-diaz/development
Renamed ComTester.py to PrinterEmulator.py
|
2015-03-30 09:18:06 -07:00 |
|
larsbrubaker
|
5b0d8c842b
|
latest agg
|
2015-03-28 08:38:14 -07:00 |
|
larsbrubaker
|
e5c0202c28
|
agg update
|
2015-03-28 07:21:23 -07:00 |
|
Lars Brubaker
|
9c53eba167
|
updated agg
|
2015-03-27 15:30:54 -07:00 |
|
Gregory Diaz
|
ec27242f9e
|
Renamed ComTester.py to PrinterEmulator.py
|
2015-03-27 15:16:05 -07:00 |
|
Lars Brubaker
|
07b6937b45
|
Making it easier to set up a printer from the command line for testing.
|
2015-03-27 14:13:11 -07:00 |
|
Lars Brubaker
|
c082488cbd
|
Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development
|
2015-03-26 18:20:36 -07:00 |
|