Couple more default layouts. Still getting pulse related crash on exi…

…t (when pulse hasn't been started yet).
bithatch · May 2, 2021 · d9ba920 · d9ba920
1 parent 647eb0d
commit d9ba920
Show file tree

Hide file tree

Showing 6 changed files with 173 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # 1.0.0-SNAPSHOT-${buildNumber}
 
+ * Added layout for Razer Base Station Chroma V2 .
+
+# 1.0.0-SNAPSHOT-173
+
  * Fails to start if `jscal` or `jstest-gtk` are not installed.
 
 # 1.0.0-SNAPSHOT-172

diff --git a/snake-dist/buildNumber.properties b/snake-dist/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Thu Apr 29 01:14:33 BST 2021
-buildNumber=174
+#Sun May 02 22:14:34 BST 2021
+buildNumber=175
diff --git a/...lib/src/main/resources/uk/co/bithatch/snake/lib/layouts/Razer Base Station V2 Chroma.json b/...lib/src/main/resources/uk/co/bithatch/snake/lib/layouts/Razer Base Station V2 Chroma.json
@@ -0,0 +1,143 @@
+{
+    "matrixHeight": 1,
+    "matrixWidth": 8,
+    "deviceType": "ACCESSORY",
+    "views": [
+        {
+            "desaturateImage": false,
+            "imageOpacity": 1.0,
+            "imageScale": 1.0,
+            "position": "TOP",
+            "elements": [
+                {
+                    "type": "AREA",
+                    "x": 0.487127,
+                    "y": 0.7528777,
+                    "label": "Base",
+                    "region": "CHROMA"
+                },
+                {
+                    "type": "LED",
+                    "x": 0.6308484,
+                    "y": 0.7460432,
+                    "matrixX": 0,
+                    "matrixY": 0
+                },
+                {
+                    "type": "LED",
+                    "x": 0.5374295,
+                    "y": 0.6884892,
+                    "matrixX": 1,
+                    "matrixY": 0
+                },
+                {
+                    "type": "LED",
+                    "x": 0.5823424,
+                    "y": 0.84136695,
+                    "matrixX": 2,
+                    "matrixY": 0
+                },
+                {
+                    "type": "LED",
+                    "x": 0.4691618,
+                    "y": 0.86474824,
+                    "matrixX": 3,
+                    "matrixY": 0
+                },
+                {
+                    "type": "LED",
+                    "x": 0.35777774,
+                    "y": 0.83417267,
+                    "matrixX": 4,
+                    "matrixY": 0
+                },
+                {
+                    "type": "LED",
+                    "x": 0.34699866,
+                    "y": 0.7352518,
+                    "matrixX": 5,
+                    "matrixY": 0
+                },
+                {
+                    "type": "LED",
+                    "x": 0.43323147,
+                    "y": 0.69028777,
+                    "matrixX": 6,
+                    "matrixY": 0
+                }
+            ]
+        },
+        {
+            "desaturateImage": false,
+            "imageOpacity": 1.0,
+            "imageScale": 1.0,
+            "position": "MATRIX",
+            "elements": [
+                {
+                    "type": "MATRIX_CELL",
+                    "x": 0.0,
+                    "y": 0.0,
+                    "region": "CHROMA",
+                    "matrixX": 0,
+                    "matrixY": 0
+                },
+                {
+                    "type": "MATRIX_CELL",
+                    "x": 0.0,
+                    "y": 0.0,
+                    "region": "CHROMA",
+                    "matrixX": 1,
+                    "matrixY": 0
+                },
+                {
+                    "type": "MATRIX_CELL",
+                    "x": 0.0,
+                    "y": 0.0,
+                    "region": "CHROMA",
+                    "matrixX": 2,
+                    "matrixY": 0
+                },
+                {
+                    "type": "MATRIX_CELL",
+                    "x": 0.0,
+                    "y": 0.0,
+                    "region": "CHROMA",
+                    "matrixX": 3,
+                    "matrixY": 0
+                },
+                {
+                    "type": "MATRIX_CELL",
+                    "x": 0.0,
+                    "y": 0.0,
+                    "region": "CHROMA",
+                    "matrixX": 4,
+                    "matrixY": 0
+                },
+                {
+                    "type": "MATRIX_CELL",
+                    "x": 0.0,
+                    "y": 0.0,
+                    "region": "CHROMA",
+                    "matrixX": 5,
+                    "matrixY": 0
+                },
+                {
+                    "type": "MATRIX_CELL",
+                    "x": 0.0,
+                    "y": 0.0,
+                    "region": "CHROMA",
+                    "matrixX": 6,
+                    "matrixY": 0
+                },
+                {
+                    "type": "MATRIX_CELL",
+                    "x": 0.0,
+                    "y": 0.0,
+                    "region": "CHROMA",
+                    "matrixX": 7,
+                    "matrixY": 0
+                }
+            ]
+        }
+    ]
+}
diff --git a/snake-lib/src/main/resources/uk/co/bithatch/snake/lib/layouts/Razer Kraken Ultimate.json b/snake-lib/src/main/resources/uk/co/bithatch/snake/lib/layouts/Razer Kraken Ultimate.json
@@ -0,0 +1,22 @@
+{
+    "matrixHeight": 0,
+    "matrixWidth": 0,
+    "deviceType": "HEADSET",
+    "views": [
+        {
+            "desaturateImage": false,
+            "imageOpacity": 1.0,
+            "imageScale": 0.59241706,
+            "position": "TOP",
+            "elements": [
+                {
+                    "type": "AREA",
+                    "x": 0.7875,
+                    "y": 0.7875,
+                    "label": "Lighting",
+                    "region": "CHROMA"
+                }
+            ]
+        }
+    ]
+}
diff --git a/snake-ui/pom.xml b/snake-ui/pom.xml
@@ -120,7 +120,7 @@
 		<dependency>
 			<groupId>uk.co.bithatch</groupId>
 			<artifactId>jimpulse</artifactId>
-			<version>1.1</version>
+			<version>1.2</version>
 		</dependency>
 		<dependency>
 			<groupId>uk.co.bithatch</groupId>

diff --git a/snake-ui/src/main/java/uk/co/bithatch/snake/ui/addons/AddOnManager.java b/snake-ui/src/main/java/uk/co/bithatch/snake/ui/addons/AddOnManager.java
@@ -383,7 +383,7 @@ public void start() {
 			try {
 				startDeviceEffects(effect);
 			} catch (Exception e) {
-				LOG.log(Level.ERROR, "Failed to start custom effects.", e);
+				LOG.log(Level.ERROR, String.format("Failed to start custom effect %s.", effect.getId()), e);
 			}
 		}
 		context.getBackend().addListener(this);