Merge pull request #310 from WesGilster/master

Bug and functionality release
area515 · Mar 15, 2017 · 07f2884 · 07f2884
2 parents efbc4df + da46ab5
commit 07f2884
Show file tree

Hide file tree

Showing 112 changed files with 5,024 additions and 524 deletions.
diff --git a/host/build.gradle b/host/build.gradle
@@ -26,6 +26,10 @@ dependencies {
     exclude module: 'jsr311-api'
   }
 
+  //compile 'org.slf4j:log4j-over-slf4j:1.7.22'
+  //compile 'org.slf4j:jul-to-slf4j:1.7.22'
+  compile 'com.pi4j:pi4j-core:1.1'
+  compile 'net.java.dev.jna:jna:4.2.2'
   compile 'org.apache.xmlgraphics:xmlgraphics-commons:1.5'
   compile 'org.apache.xmlgraphics:batik-transcoder:1.8'
   compile 'com.sun.mail:javax.mail:1.5.5'
@@ -48,12 +52,14 @@ dependencies {
   compile 'org.eclipse.jetty:jetty-server:9.3.7.v20160115'
   compile 'org.eclipse.jetty:jetty-servlet:9.3.7.v20160115'
   compile 'org.eclipse.jetty:jetty-rewrite:9.3.7.v20160115'
+  compile 'org.jboss.weld.servlet:weld-servlet-core:2.4.1.Final'
   compile 'org.eclipse.jetty.websocket:javax-websocket-server-impl:9.3.7.v20160115'
 
   compile 'com.jcraft:jsch:0.1.53'
   compile 'org.scream3r:jssc:2.8.0'
-  compile 'org.apache.logging.log4j:log4j-api:2.5'
-  compile 'org.apache.logging.log4j:log4j-core:2.5'
+  compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.8'
+  compile 'org.apache.logging.log4j:log4j-api:2.8'
+  compile 'org.apache.logging.log4j:log4j-core:2.8'
 
   compile 'org.apache.james:apache-mime4j:0.6.1'
 
@@ -73,7 +79,7 @@ dependencies {
   compile 'org.powermock:powermock-module-junit4:1.6.4'
   compile 'org.powermock:powermock-api-mockito:1.6.4'
 
-  compile 'junit:junit:4.12'
+  compile 'junit:junit:4.12'   
 
   compile fileTree(dir: 'libs', include: '**/*.jar')
   compile files('conf')

diff --git a/host/conf/config.properties b/host/conf/config.properties
@@ -1,5 +1,4 @@
 fakeserial=true
-fakedisplay=true
 removeJobOnCompletion=false
 printerHostPort=9091
 #hostGUI=resources
@@ -29,6 +28,11 @@ printFileProcessor.org.area515.resinprinter.printphoto.ImagePrintFileProcessor=t
 printFileProcessor.org.area515.resinprinter.text.TextFilePrintFileProcessor=true
 printFileProcessor.org.area515.resinprinter.printphoto.SVGImagePrintFileProcessor=true
 
+displayDevice.org.area515.resinprinter.display.dispmanx.RaspberryPiMainLCDScreen=true
+displayDevice.org.area515.resinprinter.display.dispmanx.RaspberryPiForceTVScreen=true
+displayDevice.org.area515.resinprinter.display.LastAvailableDisplay=true
+displayDevice.org.area515.resinprinter.display.SimulatedDisplay=true
+
 #Only enable this when there is at least one admin user!!!  
 #useAuthentication=false
 UserManagementFeatureImplementation=org.area515.resinprinter.security.keystore.KeystoreLoginService
@@ -57,6 +61,8 @@ NetworkManagerImplementation=org.area515.resinprinter.network.LinuxNetworkManage
 #connectToWifiSSIDCommand=netsh wlan connect name={1}
 #discoverSSIDCommand=powershell -Command "netsh wlan show profiles interface=Wi-Fi | %'{ $_.Split('':'')[1].trim(); }'"
 #discoverNetworkInterfaceCommand=blank for windows
+#fakedisplay=true
+
 
 #0=x(width), 1=y(height)
 imagingCommand=["raspistill", "-t", "1", "-n", "-w", "{0}", "-h", "{1}", "-o", "-"]
@@ -110,4 +116,4 @@ username=username
 password=password
 smtpServer=smtp.googlemail.com
 smtpPort=587
-mail.smtp.starttls.enable=true
+mail.smtp.starttls.enable=true
diff --git a/host/conf/eclipselog4j2.properties b/host/conf/eclipselog4j2.properties
@@ -16,7 +16,7 @@ appender.console.name=STDOUT
 appender.console.layout.type=PatternLayout
 appender.console.layout.pattern=[%t] %m%n
 
-loggers=hex,serial,printer,media,slicer,scan,customizer,stlfileprocessor
+loggers=hex,serial,printer,media,slicer,scan,customizer,stlfileprocessor,servlet
 #loggers=customizer,stlfileprocessor
 
 #We need to define each of the loggers that we listed in the previous line
@@ -46,22 +46,25 @@ logger.slicer.additivity=false
 logger.slicer.appenderRefs=rolling
 logger.slicer.appenderRef.rolling.ref=STDOUT
 logger.scan.name=org.area515.resinprinter.slice.ScanlineFillPolygonWork
-logger.scan.level=info
+logger.scan.level=debug
 logger.scan.additivity=false
 logger.scan.appenderRefs=rolling
 logger.scan.appenderRef.rolling.ref=STDOUT
-
 logger.customizer.name=org.area515.resinprinter.services.CustomizerService
 logger.customizer.level=debug
 logger.customizer.additivity=false
 logger.customizer.appenderRefs=consoleRef
 logger.customizer.appenderRef.consoleRef.ref=STDOUT
-
 logger.stlfileprocessor.name=org.area515.resinprinter.job.STLFileProcessor
 logger.stlfileprocessor.level=debug
 logger.stlfileprocessor.additivity=false
 logger.stlfileprocessor.appenderRefs=consoleRef
 logger.stlfileprocessor.appenderRef.consoleRef.ref=STDOUT
+logger.servlet.name=org.eclipse.jetty.servlet.ServletHandler
+logger.servlet.level=debug
+logger.servlet.additivity=false
+logger.servlet.appenderRefs=consoleRef
+logger.servlet.appenderRef.rolling.ref=STDOUT
 
 #Default logger
 rootLogger.level=info

diff --git a/host/conf/log4j2.properties b/host/conf/log4j2.properties
@@ -26,7 +26,7 @@ appender.rolling.policies.size.size=20MB
 appender.rolling.strategy.type=DefaultRolloverStrategy
 appender.rolling.strategy.max=5
 
-loggers=hex,serial,printer,media,cleanupCWS,cleanupZip
+loggers=hex,serial,printer,media,cleanupCWS,cleanupZip,printerDisplay,dispManX
 
 #We need to define each of the loggers that we listed in the previous line
 logger.media.name=org.area515.resinprinter.services.MediaService
@@ -64,7 +64,21 @@ logger.cleanupCWS.level=debug
 logger.cleanupCWS.additivity=false
 logger.cleanupCWS.appenderRefs=rolling
 logger.cleanupCWS.appenderRef.rolling.ref=RollingFile
-
+logger.printerDisplay.name=org.area515.resinprinter.display.PrinterDisplayFrame
+logger.printerDisplay.level=debug
+logger.printerDisplay.additivity=false
+logger.printerDisplay.appenderRefs=rolling
+logger.printerDisplay.appenderRef.rolling.ref=RollingFile
+logger.dispManX.name=org.area515.resinprinter.display.dispmanx.DispManXDevice
+logger.dispManX.level=debug
+logger.dispManX.additivity=false
+logger.dispManX.appenderRefs=rolling
+logger.dispManX.appenderRef.rolling.ref=RollingFile
+logger.servlet.name=org.eclipse.jetty.servlet.ServletHandler
+logger.servlet.level=debug
+logger.servlet.additivity=false
+logger.servlet.appenderRefs=rolling
+logger.servlet.appenderRef.rolling.ref=RollingFile
 
 #Default logger
 rootLogger.level=info

diff --git a/host/images/PhotonicSplash.xcf b/host/images/PhotonicSplash.xcf
diff --git a/host/jwrapper/Photonic3dClient.xml b/host/jwrapper/Photonic3dClient.xml
@@ -0,0 +1,41 @@
+<jwrapper>
+<BuildOutputFolder>C:\Users\wgilster\Desktop\compiles\JWrapper\PhotonicJWrapperBuild</BuildOutputFolder>
+<BundleName>Photonic3D</BundleName>
+<SplashPNG>C:\Users\wgilster\git\Creation-Workshop-Host\host\src\main\resources\PhotonicSplash.png</SplashPNG>
+<BundleLogoPNG>C:\Users\wgilster\git\Creation-Workshop-Host\host\resourcesnew\favicon\android-icon-48x48.png</BundleLogoPNG>
+<InstallType>NoInstall</InstallType>
+<App>
+  <Name>Photonic3D</Name>
+  <LogoPNG>C:\Users\wgilster\git\Creation-Workshop-Host\host\resourcesnew\favicon\android-icon-48x48.png</LogoPNG>
+  <MainClass>org.area515.resinprinter.client.Main</MainClass>
+  <Param>-w</Param>
+  <Param>PhotonicSplash.png</Param>
+</App>
+<SupportedLanguages>en</SupportedLanguages>
+<Windows32JRE>C:\Users\wgilster\Desktop\compiles\JWrapper\jwrapperJREs\win32\jre1.8.0_111</Windows32JRE>
+<Windows64JRE>C:\Users\wgilster\Desktop\compiles\JWrapper\jwrapperJREs\win64\jre1.8.0_111</Windows64JRE>
+<Linux32JRE>C:\Users\wgilster\Desktop\compiles\JWrapper\jwrapperJREs\linux\jre1.8.0_111</Linux32JRE>
+<Linux64JRE>C:\Users\wgilster\Desktop\compiles\JWrapper\jwrapperJREs\linuxx64\jre1.8.0_111</Linux64JRE>
+<Mac64JRE>C:\Users\wgilster\Desktop\compiles\JWrapper\jwrapperJREs\macos64\jre1.8.0_111.jre</Mac64JRE>
+<NoStripJREs>true</NoStripJREs>
+<WindowsElevation>None</WindowsElevation>
+<WindowsElevationUiAccess>true</WindowsElevationUiAccess>
+<File classpath='yes'>C:/Users/wgilster/.gradle/caches/modules-2/files-2.1/com.fasterxml.jackson.core/jackson-core/2.4.5/6fb96728ee26edb19fe329d94f3bd4df1a97652a/jackson-core-2.4.5.jar</File>
+<File classpath='yes'>C:/Users/wgilster/.gradle/caches/modules-2/files-2.1/com.jcraft/jsch/0.1.53/658b682d5c817b27ae795637dfec047c63d29935/jsch-0.1.53.jar</File>
+<File classpath='yes'>C:/Users/wgilster/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient/4.3.3/18f4247ff4572a074444572cee34647c43e7c9c7/httpclient-4.3.3.jar</File>
+<File classpath='yes'>C:/Users/wgilster/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpcore/4.3.2/31fbbff1ddbf98f3aa7377c94d33b0447c646b6e/httpcore-4.3.2.jar</File>
+<File classpath='yes'>C:/Users/wgilster/.gradle/caches/modules-2/files-2.1/org.fourthline.cling/cling-core/2.0.1/c588b1493c6f92f3e63755c9b763c740546f805a/cling-core-2.0.1.jar</File>
+<File classpath='yes'>C:/Users/wgilster/.gradle/caches/modules-2/files-2.1/org.fourthline.cling/cling-support/2.0.1/3be864b366ec15b075a936ecaeec731d8c62eba3/cling-support-2.0.1.jar</File>
+<File classpath='yes'>C:/Users/wgilster/.gradle/caches/modules-2/files-2.1/org.seamless/seamless-http/1.1.0/463012d16bcb06a623d3b931a6cfe19e4beace63/seamless-http-1.1.0.jar</File>
+<File classpath='yes'>C:/Users/wgilster/.gradle/caches/modules-2/files-2.1/org.seamless/seamless-swing/1.1.0/9ceae59cb0b977a4103d9a52b5e777d2e259678b/seamless-swing-1.1.0.jar</File>
+<File classpath='yes'>C:/Users/wgilster/.gradle/caches/modules-2/files-2.1/org.seamless/seamless-util/1.1.0/ef025cdbb79c4a031148b20a6d59db89c72ea0a3/seamless-util-1.1.0.jar</File>
+<File classpath='yes'>C:/Users/wgilster/.gradle/caches/modules-2/files-2.1/org.seamless/seamless-xml/1.1.0/497f05ee745c564e0ab5c26e66e60d4f7502fba3/seamless-xml-1.1.0.jar</File>
+<File classpath='yes'>C:\Users\wgilster\.gradle\caches\modules-2\files-2.1\commons-cli\commons-cli\1.2\2bf96b7aa8b611c177d329452af1dc933e14501c\commons-cli-1.2.jar</File>
+<File classpath='yes'>C:\Users\wgilster\Desktop\compiles\photonic3d.jar</File>
+<JvmOptions>
+<JvmOption>-splash:PhotonicSplash.png</JvmOption>
+</JvmOptions>
+<!-- IMPORTANT place custom content BELOW this comment for compatibility with JW App -->
+
+
+</jwrapper>