Commit f5962d18 authored by David's avatar David
Browse files

Updating so it should build

parent e7b61e6a
Pipeline #662 failed with stage
in 10 seconds
variables:
BUILDER: registry.dark.kow.is/kowis/openjdk-openjfx8:latest
BUILDER: registry.light.kow.is/kowis/openjfx-container
build:
image:
......
......@@ -116,7 +116,11 @@ dependencies {
//Using the snapshot version of pi4j, because it's the best
//Maybe I can get away without using the snapshot....
implementation 'com.pi4j:pi4j-core:1.2'
implementation 'com.pi4j:pi4j-core:1.4-SNAPSHOT'
//Pi4j 2 is hella immature, might have to figure out how to write some kind of rust wrapper to export local json or something
//implementation('com.pi4j:pi4j-plugin-raspberrypi:2.0-SNAPSHOT')
//Trying ikonili, because FontawesomeFX is being a pain
//TODO: update this to use a version variable
......
......@@ -3,13 +3,17 @@ Description=Desk Screen Application
[Service]
Environment="DISPLAY=:0"
User=pi
User=root
WorkingDirectory=/opt/deskscreen/data
ExecStart=/usr/bin/java -jar /opt/deskscreen/deskScreen-all.jar
ExecStart=/usr/bin/java \
-Dglass.platform=Monocle \
-Dprism.verbose=true \
--add-opens java.base/jdk.internal.misc=ALL-UNNAMED\
-jar /opt/deskscreen/deskScreen-all.jar
SuccessExitStatus=143
TimeoutStopSec=10
Restart=on-failure
RestartSec=5
[Install]
WantedBy=graphical.target
\ No newline at end of file
WantedBy=multi-user.target
deviceIp = 10.10.220.66
deviceIp = 10.10.220.80
jiraBaseUrl = https://www.example.com
username = nope
password = nope
......@@ -6,4 +6,4 @@ password = nope
redditUsername = nope
redditPassword = lol
redditClientId = huehuehueh
redditSecret = hahahaha
\ No newline at end of file
redditSecret = hahahaha
package `is`.kow.deskscreen
import `is`.kow.deskscreen.camera.CameraView
import `is`.kow.deskscreen.system.SystemView
import `is`.kow.deskscreen.views.DefaultView
import `is`.kow.deskscreen.wx.LoadingView
......@@ -21,7 +20,7 @@ class TransitionsController : Controller() {
private val loadingView: LoadingView by inject()
private val radarView: RadarView by inject()
private val infoView: SystemView by inject()
private val cameraView: CameraView by inject()
//private val cameraView: CameraView by inject()
private val currentView = AtomicReference<View>()
......@@ -48,10 +47,10 @@ class TransitionsController : Controller() {
setView(infoView)
}
fun showCameraView() {
logger.debug("Switching to camera view")
setView(cameraView)
}
// fun showCameraView() {
// logger.debug("Switching to camera view")
// setView(cameraView)
// }
private fun setView(thing: View) {
//TODO: there's something wrong here, I haven't done it right...
......@@ -61,4 +60,4 @@ class TransitionsController : Controller() {
fun showRadarView() {
setView(radarView)
}
}
\ No newline at end of file
}
......@@ -32,12 +32,12 @@ class NamePlateView : View() {
alignment = Pos.TOP_LEFT
hbox {
imageview("/corelogic/core-logic-hex.png"){
style {
paddingTop = 5
paddingLeft = 5
}
}
// imageview("/corelogic/core-logic-hex.png"){
// style {
// paddingTop = 5
// paddingLeft = 5
// }
// }
label("David Kowis") {
style {
paddingLeft = 5
......@@ -64,17 +64,18 @@ class NamePlateView : View() {
}
}
right = borderpane {
left = button("", FontIcon.of(FontAwesomeSolid.CAMERA, 30)) {
style {
baseColor = c("black")
}
action {
transitionsController.showCameraView()
}
}
right = temperatureView.root
}
right = temperatureView.root
// right = borderpane {
//// left = button("", FontIcon.of(FontAwesomeSolid.CAMERA, 30)) {
//// style {
//// baseColor = c("black")
//// }
//// action {
//// transitionsController.showCameraView()
//// }
//// }
// right =
// }
// bottom = hbox {
// style {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment