diff --git a/README.md b/README.md index fc3bfc7..984ec0b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ Mousse ====== -Mousse is a project for a Web-based control interface for CNC machines ( 3D printers, laser cutters, CNC mills etc ) +Mousse is a project for a Web-based control interface for CNC machines ( 3D printers, laser cutters, CNC mills, etc ) This is initially intended to be used with Smoothieboard using it's on-board Ethernet connector. However, future plans include support for other boards, and an executable serving the interface. @@ -9,10 +9,10 @@ This is initially intended to be used with Smoothieboard using it's on-board Eth ## Project goals -* Universal controller interface for 3D printers, Lasers and CNC mills +* Universal controller interface for 3D printers, Lasers, and CNC mills * Incorporate design tools and G-Code generation -* Oriented towards easy use and ergonomy -* Ability to fully redegin/configure the interface, and design vendor-specific interfaces +* Oriented towards ease of use and ergonomy +* Ability to fully redesign/configure the interface, and design vendor-specific interfaces * Wizards for everything * Fully modular code ( on the model of the Smoothie firmware ) to make it as easy as possible to contribute * Dashboard @@ -46,4 +46,3 @@ GPL v3 Contact the Smoothie community or wolf.arthur@gmail.com Contributions are very welcome ! - diff --git a/dev.html b/dev.html index d626f77..ea36389 100644 --- a/dev.html +++ b/dev.html @@ -57,19 +57,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -91,10 +119,16 @@ + + + + + + @@ -125,6 +159,8 @@ + + @@ -165,26 +201,66 @@ + var printstatuswidget = new Printstatuswidget(); + kernel.add_module( "printstatuswidget", printstatuswidget ); + + + var robot = new Robot(); kernel.add_module( "robot", robot ); + var temperaturecontrolwidget = new Temperaturecontrolwidget(); + kernel.add_module( "temperaturecontrolwidget", temperaturecontrolwidget ); + + + + var temperaturewidget = new Temperaturewidget(); + kernel.add_module( "temperaturewidget", temperaturewidget ); + + + var updater = new Updater(); kernel.add_module( "updater", updater ); + var widgetcontroller = new Widgetcontroller(); + kernel.add_module( "widgetcontroller", widgetcontroller ); + + + + var consolewidget = new Consolewidget(); + kernel.add_module( "consolewidget", consolewidget ); + + + var dropboxclient = new Dropboxclient(); kernel.add_module( "dropboxclient", dropboxclient ); + var extrusionwidget = new Extrusionwidget(); + kernel.add_module( "extrusionwidget", extrusionwidget ); + + + + var fancontrolwidget = new Fancontrolwidget(); + kernel.add_module( "fancontrolwidget", fancontrolwidget ); + + + var gui = new Gui(); kernel.add_module( "gui", gui ); + var joggingwidget = new Joggingwidget(); + kernel.add_module( "joggingwidget", joggingwidget ); + + + var navigation = new Navigation(); kernel.add_module( "navigation", navigation ); @@ -319,19 +395,87 @@ + +
+ + + printstatuswidget-status + +
+ +
+ + + temperaturecontrolwidget-control + +
-
+
- gui-navigation + temperaturewidget-temperature + +
+ + + + + + + +
+ + + consolewidget-console + +
+ + + + + +
+ + + extrusionwidget-control + +
+ + + +
+ + + fancontrolwidget-control + +
+ + + +
+ + + gui-body
@@ -353,6 +497,15 @@
+
+ + + gui-main + +
+
- gui-main + gui-basic_panel
@@ -380,30 +533,75 @@ -
+
- gui-basic_panel + gui-control
-
+
- gui-files + gui-control
-
+
- gui-thumbnail + gui-status + +
+ +
+ + + gui-console + +
+ +
+ + + gui-temperature + +
+ +
+ + + gui-control + +
+ +
+ + + gui-control + +
+ +
+ + + gui-control
@@ -416,21 +614,41 @@
-
+
- gui-control + gui-thumbnail
-
+
- gui-body + gui-files + +
+ +
+ + + gui-navigation + +
+ + + +
+ + + joggingwidget-control
@@ -468,18 +686,72 @@ controlscreen-control
- - -
+
- explorescreen-thumbnail + controlscreen-control
+
+ + + controlscreen-status + +
+ +
+ + + controlscreen-console + +
+ +
+ + + controlscreen-temperature + +
+ +
+ + + controlscreen-control + +
+ +
+ + + controlscreen-control + +
+ +
+ + + controlscreen-control + +
+ + +
- filesscreen-files + explorescreen-thumbnail
-
+
- machineconfigurationscreen-motion_panel + filesscreen-files
+ +
@@ -520,12 +792,12 @@
-
+
- machineconfigurationscreen-wizard_calculator + machineconfigurationscreen-motion_panel
@@ -537,6 +809,15 @@ machineconfigurationscreen-basic_panel
+ +
+ + + machineconfigurationscreen-wizard_calculator + +
diff --git a/fonts/glyphicons-halflings-regular.eot b/fonts/glyphicons-halflings-regular.eot new file mode 100644 index 0000000..b93a495 Binary files /dev/null and b/fonts/glyphicons-halflings-regular.eot differ diff --git a/fonts/glyphicons-halflings-regular.svg b/fonts/glyphicons-halflings-regular.svg new file mode 100644 index 0000000..94fb549 --- /dev/null +++ b/fonts/glyphicons-halflings-regular.svg @@ -0,0 +1,288 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/glyphicons-halflings-regular.ttf b/fonts/glyphicons-halflings-regular.ttf new file mode 100644 index 0000000..1413fc6 Binary files /dev/null and b/fonts/glyphicons-halflings-regular.ttf differ diff --git a/fonts/glyphicons-halflings-regular.woff b/fonts/glyphicons-halflings-regular.woff new file mode 100644 index 0000000..9e61285 Binary files /dev/null and b/fonts/glyphicons-halflings-regular.woff differ diff --git a/fonts/glyphicons-halflings-regular.woff2 b/fonts/glyphicons-halflings-regular.woff2 new file mode 100644 index 0000000..64539b5 Binary files /dev/null and b/fonts/glyphicons-halflings-regular.woff2 differ diff --git a/index.html b/index.html index 97e6c03..c6339aa 100644 --- a/index.html +++ b/index.html @@ -9603,6 +9603,8 @@ @@ -9989,7 +9988,7 @@ get_configuration: function(){ // Retrieve the configuration from the machine, parse it and store it this.parent_machine.interface.get_file({ - file: "/sd/config", + file: "/sd/config.", done: this.parse_config_file, caller: this }); @@ -10073,6 +10072,9 @@ + + + + @@ -10318,6 +10378,94 @@ + + + + + + + + + @@ -10404,8 +10552,18 @@ result.progress.playing = false; }else{ result.progress.playing = true; + result.progress.percent_complete = result.progress.string.match(/[^%]*/i)[0].replace(/\s/g, '')+"%"; + + // Get the seconds and convert them to HH:MM:SS + var time_elapsed = result.progress.string.split("elapsed time:").pop().split("s").shift().replace(/ /g, ''); + var estimated_time = result.progress.string.split("est time:").pop().split("s").shift().replace(/ /g, ''); + var time = new Date(null); + time.setSeconds(time_elapsed) + result.progress.time_elapsed = time.toISOString().substr(11, 8); + time.setSeconds(estimated_time-time_elapsed); + result.progress.est_time = time.toISOString().substr(11, 8); } - + // We have extracted all the info we need, we can call the event to inform all modules interrested of the information we found kernel.call_event("on_value_update", result); @@ -10426,6 +10584,82 @@ + + + + + + + + + @@ -10604,20 +10838,84 @@ + + + + + + + + +