Skip to content

Commit

Permalink
Merge pull request #224 from donovan6000/devel
Browse files Browse the repository at this point in the history
Devel
  • Loading branch information
donovan6000 authored Jun 1, 2017
2 parents 1da06ae + 2e6c659 commit 940e18d
Show file tree
Hide file tree
Showing 66 changed files with 19,383 additions and 14,339 deletions.
13 changes: 13 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
Changelog:

V1.19 June 1 2017

* Last slicer selected will be set as the default slicer so you dont have to keep reselecting it
* Model editor now updates the model's Y positions in real time when they are being rotated or scaled
* Profile editor and model editor can now save a copy of the profile/model that's currently being edited directly to the server
* Slicer profiles can be edited in OctoPrint's settings
* Slicer profiles can import a default profile that's provided by the slicer's plugin
* G-code and model files can be edited by clicking the edit buttons in the file list
* Fixed issue where connecting to a Micro 3D printer would hang while while responding with 'rs 0'
* Added M33 Fio announcements to OctoPrint's announcements plugin
* Made model editor's controls more intuitive
* Fixed issue where backlash calibration prints wouldn't print

V1.18 April 26 2017

* Fixed problems related to OS not having certain environmental variables
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
### Description
M33 Fio is a general purpose plugin for [OctoPrint](http://octoprint.org/) that extends its capabilities to include many useful feature like the ability to use a Micro 3D printer, modify a model before printing it, host a webcam stream, and much more.

The latest version of M33 Fio is V1.18 released on April 26th, 2017, and an entire changelog for it can be found [here](https://raw.githubusercontent.com/donovan6000/M33-Fio/master/Changelog).
The latest version of M33 Fio is V1.19 released on June 1st, 2017, and an entire changelog for it can be found [here](https://raw.githubusercontent.com/donovan6000/M33-Fio/master/Changelog).

### Features
* Adds a model viewer tab to OctoPrint's interface where any uploaded model can be viewed
Expand All @@ -17,6 +17,7 @@ The latest version of M33 Fio is V1.18 released on April 26th, 2017, and an enti
* Disables the hosts sleep functionality when printing
* Includes a slicer profile editor that allows customizing everything in the selected slicer profile before slicing
* Includes a model editor that allows modifying a model before slicing and can perform operations like moving, rotating, scaling, cutting, merging, clonging, and importing other models into the scene
* Allows editing G-code files

### Installation
There's installers available for [Windows](https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/Windows/install.zip), [macOS](https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/macOS/install.zip), and [Linux](https://raw.githubusercontent.com/donovan6000/M33-Fio/master/installers/Linux/install.zip) that install OctoPrint, M33 Fio, and device drivers for the Micro 3D printer and [Micro 3D compatible heatbed](https://www.kickstarter.com/projects/1668748285/the-micro-m3d-compatible-heated-print-bed). These installers all add OctoPrint as a startup program and create a shortcut on the desktop that allows accessing OctoPrint's user interface.
Expand Down
6 changes: 6 additions & 0 deletions installers/Linux/92-m3d-pro-local.rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Run the following commands to install this rule
# sudo cp ./92-m3d-pro-local.rules /etc/udev/rules.d/
# sudo udevadm control --reload-rules
# sudo udevadm trigger

ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a21e", GROUP="users", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1"
6 changes: 6 additions & 0 deletions installers/Linux/93-micro+-local.rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Run the following commands to install this rule
# sudo cp ./93-micro+-local.rules /etc/udev/rules.d/
# sudo udevadm control --reload-rules
# sudo udevadm trigger

ACTION=="add", SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="a21f", GROUP="users", MODE="0666", ENV{ID_MM_DEVICE_IGNORE}="1"
Binary file modified installers/Linux/install.zip
100755 → 100644
Binary file not shown.
Binary file modified installers/Linux/uninstall.zip
100755 → 100644
Binary file not shown.
Binary file removed installers/Windows/M3D.cat
Binary file not shown.
105 changes: 0 additions & 105 deletions installers/Windows/M3D.inf

This file was deleted.

Binary file added installers/Windows/M3D_v2.cat
Binary file not shown.
170 changes: 170 additions & 0 deletions installers/Windows/M3D_v2.inf
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
; Windows* setup file for M3D printer models ca. 2017.03
; *Intended for Windows versions 2000, XP, Vista, 7, 8 and 10 (x32 and x64)
; Copyright (c) 2014-2017 M3D

[Version]
Signature = "$Windows NT$"

Class = Ports
ClassGuid = {4D36E978-E325-11CE-BFC1-08002BE10318}
Provider = %ManufacturerName%

CatalogFile = M3D_v2.cat
; CatalogFile.NTx86 = M3D_v2_x86.cat
; CatalogFile.NTIA64 = M3D_v2_ia64.cat
; CatalogFile.NTAMD64 = M3D_v2_amd64.cat
DriverVer = 03/27/2017,6.2.0.0

;----------------------------------------------------------
; Targets
;----------------------------------------------------------
[Manufacturer]
%ManufacturerName%=PrinterModels,NT,NTAMD64,NTIA64,NTARM,NTARM64

[PrinterModels]
%DeviceName_M1%=Device_Install, USB\VID_03EB&PID_2404
%DeviceName_M2%=Device_Install, USB\VID_0483&PID_A21E
%DeviceName_M3%=Device_Install, USB\VID_0483&PID_A21F

[PrinterModels.NT]
%DeviceName_M1%=Device_Install.NT, USB\VID_03EB&PID_2404
%DeviceName_M2%=Device_Install.NT, USB\VID_0483&PID_A21E
%DeviceName_M3%=Device_Install.NT, USB\VID_0483&PID_A21F

[PrinterModels.NTAMD64]
%DeviceName_M1%=Device_Install.NTAMD64, USB\VID_03EB&PID_2404
%DeviceName_M2%=Device_Install.NTAMD64, USB\VID_0483&PID_A21E
%DeviceName_M3%=Device_Install.NTAMD64, USB\VID_0483&PID_A21F

[PrinterModels.NTIA64]
%DeviceName_M1%=Device_Install.NTIA64, USB\VID_03EB&PID_2404
%DeviceName_M2%=Device_Install.NTIA64, USB\VID_0483&PID_A21E
%DeviceName_M3%=Device_Install.NTIA64, USB\VID_0483&PID_A21F

[PrinterModels.NTARM]
%DeviceName_M1%=Device_Install.NTARM, USB\VID_03EB&PID_2404
%DeviceName_M2%=Device_Install.NTARM, USB\VID_0483&PID_A21E
%DeviceName_M3%=Device_Install.NTARM, USB\VID_0483&PID_A21F

[PrinterModels.NTARM64]
%DeviceName_M1%=Device_Install.NTARM64, USB\VID_03EB&PID_2404
%DeviceName_M2%=Device_Install.NTARM64, USB\VID_0483&PID_A21E
%DeviceName_M3%=Device_Install.NTARM64, USB\VID_0483&PID_A21F

[SourceDisksNames]
1 = %DiskName%

[SourceDisksFiles]
; usbser.sys = 1,7_8_10

;----------------------------------------------------------
; Windows (2000 and later) - 32bit
; Windows (XP and later) - 64bit
;----------------------------------------------------------
[Device_Install]
CopyFiles=FakeModemCopyFileSection
AddReg=Device_Install.NT.AddReg
Include=mdmcpq.inf

[Device_Install.NT]
CopyFiles=FakeModemCopyFileSection
AddReg=Device_Install.NT.AddReg
Include=mdmcpq.inf

[Device_Install.NTAMD64]
CopyFiles=FakeModemCopyFileSection
AddReg=Device_Install.NT.AddReg
Include=mdmcpq.inf

[Device_Install.NTIA64]
CopyFiles=FakeModemCopyFileSection
AddReg=Device_Install.NT.AddReg
Include=mdmcpq.inf

[Device_Install.NTARM]
CopyFiles=FakeModemCopyFileSection
AddReg=Device_Install.NT.AddReg
Include=mdmcpq.inf

[Device_Install.NTARM64]
CopyFiles=FakeModemCopyFileSection
AddReg=Device_Install.NT.AddReg
Include=mdmcpq.inf

[Device_Install.HW]
;

[Device_Install.NT.HW]
;

[Device_Install.NTAMD64.HW]
;

[Device_Install.NTIA64.HW]
;

[Device_Install.NTARM.HW]
;

[Device_Install.NTARM64.HW]
;

[Device_Install.NT.AddReg]
HKR,,DevLoader,,*ntkern
HKR,,NTMPDriver,,usbser.sys
HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"

; [Device_Install.NT.Copy]
; usbser.sys

[Device_Install.Services]
AddService = usbser, 0x00000002, WUDFRD_ServiceInstall

[Device_Install.NT.Services]
AddService = usbser, 0x00000002, WUDFRD_ServiceInstall

[Device_Install.NTAMD64.Services]
AddService = usbser, 0x00000002, WUDFRD_ServiceInstall

[Device_Install.NTIA64.Services]
AddService = usbser, 0x00000002, WUDFRD_ServiceInstall

[Device_Install.NTARM.Services]
AddService = usbser, 0x00000002, WUDFRD_ServiceInstall

[Device_Install.NTARM64.Services]
AddService = usbser, 0x00000002, WUDFRD_ServiceInstall

[WUDFRD_ServiceInstall]
DisplayName = %Serial.SvcDesc%
ServiceType = 1 ; SERVICE_KERNEL_DRIVER
StartType = 3 ; SERVICE_DEMAND_START
ErrorControl = 1 ; SERVICE_ERROR_NORMAL
ServiceBinary = %12%\usbser.sys
LoadOrderGroup = Base

;--
;
;--

[DestinationDirs]
DefaultDestDir=12 ; DIRID_DRIVERS
; Device_Install.Copy=12,UMDF
; Device_Install.NT.Copy=12,UMDF
; Device_Install.NTAMD64.Copy=12,UMDF
; Device_Install.NTIA64.Copy=12,UMDF
; Device_Install.NTARM.Copy=12,UMDF
; Device_Install.NTARM64.Copy=12,UMDF

;----------------------------------------------------------
; String
;----------------------------------------------------------

[Strings]
ManufacturerName = "M3D"
DeviceName_M1 = "The Micro 3D Printer"
DeviceName_M2 = "Pro"
DeviceName_M3 = "Micro+"
DiskName = "M3D Driver Installation Package"
Serial.SvcDesc = "USB Serial Emulation Driver"

Binary file modified installers/Windows/install.zip
100755 → 100644
Binary file not shown.
Loading

0 comments on commit 940e18d

Please sign in to comment.