nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1961 commits 1 branch 0 tags 103 MiB
Commit graph

1961 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gregory Diaz
6ab36e4d79 Modified code so that processing message in layer view is added after the bed and part are drawn onto layer view 2015-03-26 16:07:12 -07:00
Lars Brubaker
f418760c0b Merge pull request #220 from jlewin/development 
Swap Settings -> Enable/Disable buttons for ToggleSwitches
 2015-03-26 09:49:41 -07:00
John Lewin
724472f0e7 Update settings view to use ToggleSwitches 
- Switch remaining Enable/Disable buttons to switches
 - Right align switches
 - Move GenerateToggleSwitch to SettingsViewBase for reuse
 - Wrap switches with container widget to better control layout and structure
 2015-03-26 09:20:02 -07:00
John Lewin
4fe6fcb9d4 Change Camera Sync setting to use ToggleSwitch 2015-03-26 09:19:28 -07:00
larsbrubaker
e7586477c0 new agg 2015-03-25 18:35:28 -07:00
Lars Brubaker
a3e8937817 correct agg 2015-03-25 18:02:08 -07:00
Lars Brubaker
53ded760e9 Put a try catch around the printer on idle call 
Refactor / renaming
 2015-03-25 18:01:57 -07:00
Lars Brubaker
fd699981ec Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2015-03-25 15:14:51 -07:00
Lars Brubaker
e768a850e5 new agg. 2015-03-25 14:45:06 -07:00
Lars Brubaker
1744f2ec06 Merge pull request #219 from gregory-diaz/development 
removed all curly brackets from start/end/resume/ gcode and replaced the...
 2015-03-25 14:39:57 -07:00
Gregory Diaz
95619c6e8e removed all curly brackets from start/end/resume/ gcode and replaced them with square brackets. 2015-03-25 14:31:05 -07:00
Lars Brubaker
cd1b4d3c4a latest libraries with collinear fix 2015-03-25 11:41:25 -07:00
Lars Brubaker
2d44c4d634 Merge branch '1.2.2' into development 2015-03-25 11:36:16 -07:00
Kevin Pope
740acf218e Merge pull request #214 from gregory-diaz/1.2.2 
Added new settings for all 3D Stuffmaker printers
 2015-03-23 16:59:07 -07:00
Kevin Pope
9b74fb4d06 Merge pull request #213 from gregory-diaz/development 
Added most recent 3D Stuffmaker settings for 'Evolution', 'Creator', 'Co...
 2015-03-23 16:58:51 -07:00
Gregory Diaz
95cd04b7b1 Added new settings for all 3D Stuffmaker printers 2015-03-23 12:06:05 -07:00
Gregory Diaz
bb8e6ba3c8 Added most recent 3D Stuffmaker settings for 'Evolution', 'Creator', 'Core'. 2015-03-23 11:04:08 -07:00
Lars Brubaker
2358f1d646 Current submodules 2015-03-19 18:15:15 -07:00
Lars Brubaker
c69bce5b39 Merge branch '1.2.2' into development 2015-03-19 14:22:26 -07:00
Lars Brubaker
04f9200f47 Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2015-03-19 14:21:36 -07:00
Lars Brubaker
14ece2c6d3 Updating to new libraries. 2015-03-19 14:21:27 -07:00
Lars Brubaker
32341844f9 Merge pull request #212 from gregory-diaz/1.2.2 
Updated settings for all 3D Stuffmaker printers.
 2015-03-19 12:35:57 -07:00
Lars Brubaker
56ca6a4cdf Merge pull request #211 from jlewin/development 
Add Camera Sync option
 2015-03-19 12:35:42 -07:00
Gregory Diaz
08c8205f59 Updated settings for all 3D Stuffmaker printers. 2015-03-19 12:31:52 -07:00
John Lewin
cf823ba0d0 Add Camera Sync option 2015-03-18 18:47:40 -07:00
Lars Brubaker
bbbbd6a626 Merge pull request #210 from gregory-diaz/1.2.2 
Added updated settings sent from 'Revolution 3D' and '3D Stuffmaker'
 2015-03-18 13:32:21 -07:00
Gregory Diaz
bb1504d0a3 Added updated settings sent from 'Revolution 3D' and '3D Stuffmaker' 2015-03-18 12:36:44 -07:00
Lars Brubaker
d904756a1f Made sure the text creator is in the project 2015-03-18 09:49:20 -07:00
Lars Brubaker
ff4bb848b5 latest matterslice 2015-03-18 09:16:10 -07:00
Lars Brubaker
2437948068 Open our gcode files with read right share when only needing read. 2015-03-17 17:43:20 -07:00
Lars Brubaker
5d13f4039e Merge pull request #205 from gregory-diaz/development 
Added new settings sent by Revolution 3D to INF3D-AF1-DE and INF3D-AF1-S...
 2015-03-16 14:04:23 -07:00
Gregory Diaz
c79182c882 Added new settings sent by Revolution 3D to INF3D-AF1-DE and INF3D-AF1-SE profiles 2015-03-16 13:17:35 -07:00
Lars Brubaker
64cd6963de Made library actually parse zips correctly (acted like they would open but did not use them). 
Made the keyboard on android work correctly with the part preview window.
Some white space changes
 2015-03-16 11:25:13 -07:00
Lars Brubaker
4f8c0742ce Made the com tester able to respond as if it is MarlinFirmware 
Took out the ability to print to printer sd card.
    You can still print from sd card)
    You can still save gcode to an sd card
Put in and EXTENSIONS check from firmware
Putting in a URI_GCODE_SEND
 2015-03-14 16:00:04 -07:00
Lars Brubaker
c8e5c493ed correct agg version 2015-03-13 17:52:54 -07:00
Lars Brubaker
03342f5e95 Better checking of not connected. 2015-03-13 16:30:19 -07:00
Lars Brubaker
e743a36985 latest agg 2015-03-13 12:25:51 -07:00
Lars Brubaker
4bf34545a5 Make sure we don't set attempting to connect before we have a reasonable chance of reading something from the printer. 2015-03-13 12:25:33 -07:00
Lars Brubaker
4ef9e4c0fc Made the centering of inserted parts work correctly. 
Always show the reset connection button if a printer has it, even when not connected.
 2015-03-12 14:36:42 -07:00
Kevin Pope
e748b2683f Merge pull request #203 from gregory-diaz/development 
Only show slice presets on main preset window and preset dropdown menu i...
 2015-03-11 16:09:25 -07:00
Gregory Diaz
cca89b52a2 Only show slice presets on main preset window and preset dropdown menu if setting is mapped to engine. 2015-03-11 14:51:58 -07:00
Lars Brubaker
474ff67789 Don't reference the print sever code. 2015-03-11 14:03:55 -07:00
Lars Brubaker
338b20378d updated matterslice 2015-03-11 13:40:52 -07:00
Lars Brubaker
df84cce282 Made sure the reset connection does not leave the printer in a weird state. 
Made Stop always cancel slicing if required.
 2015-03-11 11:02:27 -07:00
Lars Brubaker
fdfd2dcca3 version of agg 2015-03-11 10:30:58 -07:00
Lars Brubaker
da5e8c4d4f Moving code around to make android work 2015-03-11 10:30:46 -07:00
Lars Brubaker
9729f5b03d Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development 2015-03-10 16:18:12 -07:00
Lars Brubaker
58aa7f5fb8 Put in a placeholder for a new client server pulgin. 2015-03-10 16:18:06 -07:00
Lars Brubaker
3aea04b4ea Merge pull request #199 from gregory-diaz/development 
Added new profile for MakerGear M2
 2015-03-10 15:55:57 -07:00
Gregory Diaz
2a4e2de6e5 Added new profile for MakerGear M2 2015-03-10 15:48:27 -07:00