nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Networked Printing enabled in MC

Browse source 
- Added properties to enable s3g coms, enable networked communication, store IP and port
 - updated Settings on Change to be a dictionary that stores what they are changing and how to do it
 - added handling in check box for SettingsOnChange
 - SerialPortIsAvailable returns true when networked printing is enabled
 - Engine mapping base updated for new properties
This commit is contained in:
Matt Moening 2016-07-29 14:48:41 -07:00
parent e78c013fdb
commit 60b3fe5133
7 changed files with 154 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
StaticData/SliceSettings/Layouts.txt
View file

@ -286,6 +286,8 @@ Advanced
auto_connect
baud_rate
com_port
ip_address
ip_port
Print Area
Size and Coordinates
bed_size
@ -309,6 +311,8 @@ Advanced
z_can_be_negative
heat_extruder_before_homing
extruders_share_temperature
enable_network_printing
enable_sailfish_communication
Firmware
gcode_flavor
use_relative_e_distances

95
StaticData/SliceSettings/Properties.json
View file

@ -1211,9 +1211,18 @@
}
],
"SetSettingsOnChange": [
"bottom_solid_layers",
"top_solid_layers",
"perimeters"
{
"TargetSetting": "bottum_solid_layers",
"Value": "[current_value]"
},
{
"TargetSetting": "top_solid_layers",
"Value": "[current_value]"
},
{
"TargetSetting": "perimeters",
"Value": "[current_value]"
}
],
"SlicerConfigName": "solid_shell",
"PresentationName": "Width",
@ -2483,7 +2492,7 @@
"DataEditType": "COM_PORT",
"ExtraSettings": "",
"ShowAsOverride": false,
"ShowIfSet": null,
"ShowIfSet": "!enable_network_printing",
"ResetAtEndOfPrint": false,
"DefaultValue": "",
"RebuildGCodeOnChange": false
@ -2554,6 +2563,84 @@
"DefaultValue": "0",
"RebuildGCodeOnChange": false
},
{
"QuickMenuSettings": [ ],
"SetSettingsOnChange": [
{
"TargetSetting": "driver_type",
"OnValue": "TCPIP",
"OffValue": "RepRap"
},
{
"TargetSetting": "enable_sailfish_communication",
"OnValue": "0"
}
],
"SlicerConfigName": "enable_network_printing",
"PresentationName": "Networked Printing",
"HelpText": "Sets MatterControl to attempt to connect to a printer over the network. (You must disconnect and reconnect for this to take effect)",
"DataEditType": "CHECK_BOX",
"ExtraSettings": "",
"ShowAsOverride": true,
"ShowIfSet": null,
"ResetAtEndOfPrint": false,
"DefaultValue": "0",
"RebuildGCodeOnChange": false,
"ReloadUiWhenChanged": true
},
{
"QuickMenuSettings": [ ],
"SetSettingsOnChange": [
{
"TargetSetting": "driver_type",
"OnValue": "X3G",
"OffValue": "RepRap"
},
{
"TargetSetting": "enable_network_printing",
"OnValue": "0"
}
],
"SlicerConfigName": "enable_sailfish_communication",
"PresentationName": "Sailfish Communication",
"HelpText": "Sets MatterControl to use s3g communication method. (You must disconnect and reconnect for this to take effect)",
"DataEditType": "CHECK_BOX",
"ExtraSettings": "",
"ShowAsOverride": true,
"ShowIfSet": null,
"ResetAtEndOfPrint": false,
"DefaultValue": "0",
"RebuildGCodeOnChange": false,
"ReloadUiWhenChanged": true
},
{
"QuickMenuSettings": [ ],
"SetSettingsOnChange": [ ],
"SlicerConfigName": "ip_address",
"PresentationName": "IP Address",
"HelpText": "IP Address of printer/printer controller",
"DataEditType": "STRING",
"ExtraSettings": "",
"ShowAsOverride": true,
"ShowIfSet": "enable_network_printing",
"ResetAtEndOfPrint": false,
"DefaultValue": "127.0.0.1",
"RebuildGCodeOnChange": false
},
{
"QuickMenuSettings": [ ],
"SetSettingsOnChange": [ ],
"SlicerConfigName": "ip_port",
"PresentationName": "Port",
"HelpText": "Port number to be used with IP Adress to connect to printer over the network",
"DataEditType": "INT",
"ExtraSettings": "",
"ShowAsOverride": true,
"ShowIfSet": "enable_network_printing",
"ResetAtEndOfPrint": false,
"DefaultValue": "23",
"RebuildGCodeOnChange": false
},
{
"QuickMenuSettings": [ ],
"SetSettingsOnChange": [ ],

53
StaticData/Translations/Master.txt
View file

@ -5263,24 +5263,33 @@ Translated:Sorry! Looks like an account already exists for that email address.
English:Settings History
Translated:Settings History
English:The amount that the perimeter will overlap itself when it completes its loop, as a percent of the Nozzle Diameter.
Translated:The amount that the perimeter will overlap itself when it completes its loop, as a percent of the Nozzle Diameter.
English:Allows the printer to attempt to connect to a printer over the network.
Translated:Allows the printer to attempt to connect to a printer over the network.
English:Start end Overlap
Translated:Start end Overlap
English:IP Address of printer/printer controller
Translated:IP Address of printer/printer controller
English:Select a printer.
Translated:Select a printer.
English:Port number to be used with IP Adress to connect to printer over the network
Translated:Port number to be used with IP Adress to connect to printer over the network
English:Unable to Connect
Translated:Unable to Connect
English:IP Address
Translated:IP Address
English:All extrusions are multiplied by this value. Increasing it above 1 will increase the amount of filament being extruded (1.1 is a good max value); decreasing it will decrease the amount being extruded (.9 is a good minimum value).
Translated:All extrusions are multiplied by this value. Increasing it above 1 will increase the amount of filament being extruded (1.1 is a good max value); decreasing it will decrease the amount being extruded (.9 is a good minimum value).
English:Port
Translated:Port
English:Enable Network Printing
Translated:Enable Network Printing
English:Determines the method of communication used to talk to your printer.
Translated:Determines the method of communication used to talk to your printer.
English:The layer(s) at which the print will pause, allowing for a change in filament. Leave blank to disable. To pause on multiple layers, separate the layer numbers with semicolons. For example: "16; 37".
Translated:The layer(s) at which the print will pause, allowing for a change in filament. Leave blank to disable. To pause on multiple layers, separate the layer numbers with semicolons. For example: "16; 37".
English:All extrusions are multiplied by this value. Increasing it above 1 will increase the amount of filament being extruded (1.1 is a good max value); decreasing it will decrease the amount being extruded (.9 is a good minimum value).
Translated:All extrusions are multiplied by this value. Increasing it above 1 will increase the amount of filament being extruded (1.1 is a good max value); decreasing it will decrease the amount being extruded (.9 is a good minimum value).
English:The distance that the perimeter will overlap itself when it completes its loop, expressed as a percentage of the Nozzle Diameter.
Translated:The distance that the perimeter will overlap itself when it completes its loop, expressed as a percentage of the Nozzle Diameter.
@ -5290,14 +5299,26 @@ Translated:Start End Overlap
English:Layer(s) To Pause:
Translated:Layer(s) To Pause:
English:Select Printers to Sync
Translated:Select Printers to Sync
English:Allows the printer to attempt to connect to a printer over the network. (You must disconnect and reconnect for this to take effect)
Translated:Allows the printer to attempt to connect to a printer over the network. (You must disconnect and reconnect for this to take effect)
English:Printers to Sync:
Translated:Printers to Sync:
English:Allows the printer to use the s3g communication method. (You must disconnect and reconnect for this to take effect)
Translated:Allows the printer to use the s3g communication method. (You must disconnect and reconnect for this to take effect)
English:Sync
Translated:Sync
English:Enable Sailfish Communication
Translated:Enable Sailfish Communication
English:Sets MatterControl to attempt to connect to a printer over the network. (You must disconnect and reconnect for this to take effect)
Translated:Sets MatterControl to attempt to connect to a printer over the network. (You must disconnect and reconnect for this to take effect)
English:Sets MatterControl to use s3g communication method. (You must disconnect and reconnect for this to take effect)
Translated:Sets MatterControl to use s3g communication method. (You must disconnect and reconnect for this to take effect)
English:Networked Printing
Translated:Networked Printing
English:Sailfish Communication
Translated:Sailfish Communication
English:The position (X and Y coordinates) of the center of the print bed, in millimeters. Normally this is 1/2 the bed size for Cartesian printers and 0, 0 for Delta printers.
Translated:The position (X and Y coordinates) of the center of the print bed, in millimeters. Normally this is 1/2 the bed size for Cartesian printers and 0, 0 for Delta printers.