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

6369 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Lewin
e882f925ed Fix failing MatterControlRuns test 
- Switch control to validate from 'SettingsAndControls' to 'Library Tab'
 2017-05-20 15:50:17 -07:00
John Lewin
8c926db5d3 Add missing project to public solution file 2017-05-20 15:13:28 -07:00
John Lewin
b67a29d32d Latest agg-sharp 2017-05-20 08:37:20 -07:00
John Lewin
03a593f1b5 Move to new library model and view 
- Add new listview control for library content
- Migrate library providers to containers
  - Cloud, Sqlite, Directories, Queue, History
- Migrate SideBar components to containers
  - Primatives, Text, Braille, ImageConverter
- Create new library container types
  - Zip files, Calibration parts, Printer SDCards
- Reduce leftnav to Library, Settings, Controls, Options
- Add DragDrop support for image content
 2017-05-20 00:41:02 -07:00
Lars Brubaker
b0b249e0c3 Merge pull request #2075 from larsbrubaker/design_tools 
Fixed CancelingNormalPrintTurnsHeatAndFanOff
 2017-05-19 17:26:50 -07:00
Lars Brubaker
8ef9da90b9 Fixed CancelingNormalPrintTurnsHeatAndFanOff 2017-05-19 17:18:21 -07:00
johnlewin
4aa73a5933 Merge pull request #2074 from larsbrubaker/design_tools 
merge 1.7.1
 2017-05-19 15:57:26 -07:00
Lars Brubaker
9f3f1d9303 first run after commit 2017-05-19 15:14:59 -07:00
Lars Brubaker
352eb792f1 Merge branch 'smash_1.7.1' into design_tools 
# Conflicts:
#	PartPreviewWindow/View3D/View3DWidget.cs
#	SlicerConfiguration/SliceSettingsWidget.cs
#	SlicerConfiguration/SlicingQueue.cs
#	StaticData/SliceSettings/Properties.json
 2017-05-19 14:57:04 -07:00
Lars Brubaker
a1e1c48d90 All new 1.7.1 changes 2017-05-19 14:39:57 -07:00
Lars Brubaker
9a98840c7e Merge pull request #2033 from larsbrubaker/design_tools 
Design tools
 2017-04-14 15:35:21 -07:00
Lars Brubaker
3f03481d9e Merge pull request #2032 from larsbrubaker/1.7 
new notification messages
 2017-04-14 13:01:31 -07:00
Lars Brubaker
c4f6228942 Merge branch '1.7' into 1.7 2017-04-14 12:54:45 -07:00
Lars Brubaker
b8760de3fa Merge branch '1.7' into design_tools 2017-04-14 12:51:27 -07:00
Lars Brubaker
bc9d9ca9c0 Merge remote-tracking branch 'origin/1.7' into design_tools 
# Conflicts:
#	StaticData/SliceSettings/Properties.json
 2017-04-14 12:51:17 -07:00
Lars Brubaker
235eef4a9f new notification messages 2017-04-14 12:45:47 -07:00
Lars Brubaker
43d86b7dcc Merge pull request #2030 from larsbrubaker/1.7 
Made the cursor keys able to help with print leveling
 2017-04-14 10:01:23 -07:00
Lars Brubaker
8349891061 Made the cursor keys able to help with print leveling 2017-04-14 09:53:13 -07:00
Lars Brubaker
2e15844242 Merge pull request #2029 from larsbrubaker/1.7 
Added ability to sample multiple times on same point.
 2017-04-13 17:11:24 -07:00
Lars Brubaker
214e25f188 Added ability to sample multiple times on same point. 2017-04-13 17:04:42 -07:00
Lars Brubaker
3acaedd605 Adding more filament run out code 2017-04-13 16:32:32 -07:00
Lars Brubaker
e1374ece9d Putting in support for filament runout sensor 
writing support for sms message on filament run out and pause
 2017-04-13 14:25:46 -07:00
Lars Brubaker
df75772296 Merge pull request #2028 from larsbrubaker/design_tools 
Design tools
 2017-04-13 09:34:51 -07:00
Lars Brubaker
3fc69a7e81 Merge branch '1.7' into design_tools 
# Conflicts:
#	StaticData/Translations/Master.txt
 2017-04-12 18:28:16 -07:00
Lars Brubaker
a02f049395 latest agg 2017-04-12 18:27:10 -07:00
Lars Brubaker
8044d8d258 latest agg 2017-04-12 18:22:52 -07:00
Lars Brubaker
2565874b22 Merge pull request #2027 from larsbrubaker/1.7 
Changed the string we are looking for.
 2017-04-12 17:36:52 -07:00
Lars Brubaker
5660307716 Changed the string we are looking for. 2017-04-12 17:30:58 -07:00
Lars Brubaker
d8ba59d4c5 Merge pull request #2026 from larsbrubaker/1.7 
Fixed for smoothie probe math
 2017-04-12 15:22:44 -07:00
Lars Brubaker
ffc0ea296e Fixed for smoothie probe math 2017-04-12 15:17:55 -07:00
Lars Brubaker
a368c0ee1e Merge pull request #2025 from larsbrubaker/1.7 
Read G30 values correctly on smoothie.
 2017-04-12 14:37:09 -07:00
Lars Brubaker
d6b8b2c8c6 Merge branch '1.7' into 1.7 2017-04-12 14:32:52 -07:00
Lars Brubaker
ad5238e5df Read G30 values correctly on smoothie. 2017-04-12 14:32:15 -07:00
Lars Brubaker
ba0160a6c6 Merge pull request #2024 from larsbrubaker/1.7 
Put in auto-calibration measuring if G30 is available
 2017-04-12 13:32:57 -07:00
Lars Brubaker
30f8a838ec Put in default value for use_g30_for_bed_probe 2017-04-12 12:47:40 -07:00
Lars Brubaker
91ac989bf4 New leveling strings 2017-04-12 12:34:42 -07:00
Lars Brubaker
c0a7331579 Merge branch '1.7' into design_tools 
# Conflicts:
#	SlicerConfiguration/Settings/SettingsHelpers.cs
#	StaticData/SliceSettings/Properties.json
#	StaticData/Translations/Master.txt
 2017-04-12 12:29:31 -07:00
Lars Brubaker
101d547823 latest agg 2017-04-12 12:27:08 -07:00
Lars Brubaker
1165414dd8 Latest agg 
plugin finder update
 2017-04-12 12:18:13 -07:00
Lars Brubaker
d180a0780f Made the ability to probe the be with G30 on printers with probe 
Fixed bug with extrusion multiplier layout
Made leveling wizard strings in common class
 2017-04-12 12:12:11 -07:00
Lars Brubaker
4c9d976c56 Put in auto-calibration measuring if G30 is available 2017-04-11 17:49:23 -07:00
Lars Brubaker
c8c1009560 Merge pull request #2023 from larsbrubaker/design_tools 
Merge 1.7 position request updates
 2017-04-11 13:53:01 -07:00
Lars Brubaker
c983b29b48 Removed new grid work from design tools (put in own branch) 2017-04-11 13:43:40 -07:00
Lars Brubaker
aa7445b618 Merge remote-tracking branch 'origin/1.7' into design_tools 
# Conflicts:
#	StaticData/Translations/Master.txt
 2017-04-11 13:25:42 -07:00
Lars Brubaker
24b01b24f1 Merge pull request #2022 from larsbrubaker/1.7 
Fixed the library print test to not hang
 2017-04-11 12:09:34 -07:00
Lars Brubaker
f5b2ba6357 Request temp rate should be 1 second 2017-04-11 12:05:24 -07:00
Lars Brubaker
ec7ad5ca1a Fixed the library print test to not hang 2017-04-11 11:51:21 -07:00
Lars Brubaker
7ec2061be5 Merge pull request #2021 from larsbrubaker/1.7 
Fixed code related to position reads
 2017-04-11 10:51:29 -07:00
Lars Brubaker
b2515aa2ac Fixed code related to position reads 
Make sure we don't send a 105 while waiting for position
Make sure we send a M114 immediately after G28, G29, G30
Better error timing for sending commands (less resend issues)
 2017-04-11 10:41:46 -07:00
Lars Brubaker
fb925df5c4 Merge pull request #2020 from larsbrubaker/1.7 
Put in firmware update options.
 2017-04-10 18:07:07 -07:00