2.0.15v

coreAPI/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>net.java.jinput</groupId>
     <artifactId>jinput-parent</artifactId>
-    <version>2.0.14v</version>
+    <version>2.0.15v</version>
   </parent>
 
   <artifactId>coreapi</artifactId>
@@ -16,11 +16,56 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
       </plugin>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
       </plugin>
     </plugins>
   </build>
-</project>
+
+  <repositories>
+    <repository>
+      <id>jitpack.io</id>
+      <url>https://jitpack.io</url>
+    </repository>
+  </repositories>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>5.10.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.github.umjammer</groupId>
+      <artifactId>vavi-commons</artifactId>
+      <version>1.1.9</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-commons</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

coreAPI/src/main/java/net/java/games/input/AbstractController.java

@@ -210,13 +210,13 @@ protected void fireOnInput(InputEvent event) {
         listeners.forEach(l -> l.onInput(event));
     }
 
-    /** */
+    /** data structure to output */
     public interface Report {
 
-        /** */
+        /** set value for each rumbler from this report class fields */
         void cascadeTo(Rumbler[] rumblers);
     }
 
-    /** */
+    /** do output */
     public abstract void output(Report report) throws IOException;
 }

coreAPI/src/main/java/net/java/games/input/Component.java

@@ -895,31 +895,9 @@ public String getName() {
         }
 
         /**
-         * KeyIDs for standard PC (LATIN-1) keyboards
+         * for write
          */
-        enum Output implements Identifier {
-            SMALL_RUMBLE("smallRumble"),
-            BIG_RUMBLE("bigRumble"),
-            LED_RED("ledRed"),
-            LED_GREEN("ledGreen"),
-            LED_BLUE("ledBlue"),
-            FLASH_LED1("flashLed1"),
-            FLASH_LED2("flashLed2");
-
-            final String name;
-
-            @Override
-            public String getName() {
-                return name;
-            }
-
-            /**
-             * Protected constructor
-             */
-            Output(String name) {
-                this.name = name;
-            }
-        }
+        interface Output extends Identifier {}
     }
 
     /**

coreAPI/src/main/java/net/java/games/input/WrappedComponent.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2024 by Naohide Sano, All rights reserved.
+ *
+ * Programmed by Naohide Sano
+ */
+
+package net.java.games.input;
+
+
+/**
+ * WrappedComponent.
+ *
+ * @author <a href="mailto:umjammer@gmail.com">Naohide Sano</a> (nsano)
+ * @version 0.00 2024-01-24 nsano initial version <br>
+ */
+public interface WrappedComponent<T> {
+
+    /** */
+    T getWrappedObject();
+}

coreAPI/src/main/java/net/java/games/input/plugin/DualShock4PluginBase.java

@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2024 by Naohide Sano, All rights reserved.
+ *
+ * Programmed by Naohide Sano
+ */
+
+package net.java.games.input.plugin;
+
+import java.io.PrintStream;
+import java.util.Collection;
+import java.util.Collections;
+
+import net.java.games.input.Component;
+import net.java.games.input.Controller;
+import net.java.games.input.DeviceSupportPlugin;
+import net.java.games.input.usb.HidController;
+import net.java.games.input.usb.HidRumbler;
+import vavi.util.ByteUtil;
+
+
+/**
+ * DualShock4PluginBase.
+ *
+ * @author <a href="mailto:umjammer@gmail.com">Naohide Sano</a> (nsano)
+ * @version 0.00 2024-01-28 nsano initial version <br>
+ */
+public abstract class DualShock4PluginBase implements DeviceSupportPlugin {
+
+    // TODO should have report id???
+    public enum DualShock4Output implements Component.Identifier.Output {
+        SMALL_RUMBLE("smallRumble"),
+        BIG_RUMBLE("bigRumble"),
+        LED_RED("ledRed"),
+        LED_GREEN("ledGreen"),
+        LED_BLUE("ledBlue"),
+        FLASH_LED1("flashLed1"),
+        FLASH_LED2("flashLed2");
+
+        final String name;
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        /**
+         * Protected constructor
+         */
+        DualShock4Output(String name) {
+            this.name = name;
+        }
+    }
+
+    /** TODO for bluetooth */
+    protected static final int BASE_OFFSET = 0;
+
+    /** Represents report id 5 data */
+    public static class Report5 extends HidController.HidReport {
+        private final byte[] data = new byte[31];
+
+        public int smallRumble;
+        public int bigRumble;
+        public int ledRed;
+        public int ledGreen;
+        public int ledBlue;
+        public int flashLed1;
+        public int flashLed2;
+
+        public Report5() {
+            data[0] = (byte) 255;
+        }
+
+        @Override public int getReportId() {
+            return 5;
+        }
+
+        @Override public byte[] getData() {
+            return data;
+        }
+
+        @Override protected void cascadeTo(HidRumbler rumbler) {
+            float value = switch ((DualShock4Output) rumbler.getOutputIdentifier()) {
+                case SMALL_RUMBLE -> smallRumble;
+                case BIG_RUMBLE -> bigRumble;
+                case LED_RED -> ledRed;
+                case LED_GREEN -> ledGreen;
+                case LED_BLUE -> ledBlue;
+                case FLASH_LED1 -> flashLed1;
+                case FLASH_LED2 -> flashLed2;
+            };
+            rumbler.setValue(value);
+        }
+    }
+
+    /**
+     * @param data includes the first byte (report id)
+     * @see "https://www.psdevwiki.com/ps4/DS4-USB"
+     */
+    public static void display(byte[] data, PrintStream pr) {
+        int l3x = data[1] & 0xff;
+        int l3y = data[2] & 0xff;
+        int r3x = data[3] & 0xff;
+        int r3y = data[4] & 0xff;
+
+        boolean tri	= (data[5] & 0x80) != 0;
+        boolean cir	= (data[5] & 0x40) != 0;
+        boolean x = (data[5] & 0x20) != 0;
+        boolean sqr = (data[5] & 0x10) != 0;
+        int dPad = data[5] & 0x0f;
+
+        enum Hat {
+            N("↑"), NE("↗"), E("→"), SE("↘"), S("↓"), SW("↙"), W("←"), NW("↖"), Released(" "); final String s; Hat(String s) { this.s = s; }
+        }
+
+        boolean r3 = (data[6] & 0x80) != 0;
+        boolean l3 = (data[6] & 0x40) != 0;
+        boolean opt = (data[6] & 0x20) != 0;
+        boolean share = (data[6] & 0x10) != 0;
+        boolean r2 = (data[6] & 0x08) != 0;
+        boolean l2 = (data[6] & 0x04) != 0;
+        boolean r1 = (data[6] & 0x02) != 0;
+        boolean l1 = (data[6] & 0x01) != 0;
+
+        int counter = (data[7] >> 2) & 0x3f;
+        boolean tPad = (data[7] & 0x02) != 0;
+        boolean ps = (data[7] & 0x01) != 0;
+
+        int lTrigger = data[8] & 0xff;
+        int rTrigger = data[9] & 0xff;
+
+        int timeStump = ByteUtil.readLeShort(data, 10) & 0xffff;
+        int batteryLevel = data[12] & 0xff;
+
+        int gyroX = ByteUtil.readLeShort(data, 13) & 0xffff;
+        int gyroY = ByteUtil.readLeShort(data, 15) & 0xffff;
+        int gyroZ = ByteUtil.readLeShort(data, 17) & 0xffff;
+
+        int accelX = ByteUtil.readLeShort(data, 19) & 0xffff;
+        int accelY = ByteUtil.readLeShort(data, 21) & 0xffff;
+        int accelZ = ByteUtil.readLeShort(data, 23) & 0xffff;
+
+        boolean headphone = (data[30] & 0x40) != 0;
+        boolean mic = (data[30] & 0x20) != 0;
+
+        int touch1X = (data[36] & 0xff) | ((data[37] & 0x0f) << 8);
+        int touch1Y = ((data[38] & 0xff) << 4) | (data[37] & 0xf);
+
+        int touch2X = (data[40] & 0xff) | ((data[41] & 0x0f) << 8);
+        int touch2Y = ((data[42] & 0xff) << 4) | (data[41] & 0xf);
+
+        pr.printf("L3 x: %02x%n", l3x);
+        pr.printf("L3 y: %02x%n", l3y);
+        pr.printf("R3 x: %02x%n", r3x);
+        pr.printf("R3 y: %02x%n", r3y);
+        pr.printf("hat: %s%n", Hat.values()[dPad].s);
+
+        pr.printf("counter: %d%n", counter);
+
+        pr.printf("▲: %s%n", tri ? "●" : "◯");
+        pr.printf("●: %s%n", cir ? "●" : "◯");
+        pr.printf("✖: %s%n", x ? "●" : "◯");
+        pr.printf("■: %s%n", sqr ? "●" : "◯");
+
+        pr.printf("L1: %s%n", l1 ? "●" : "◯");
+        pr.printf("R1: %s%n", r1 ? "●" : "◯");
+        pr.printf("L2: %s%n", l2 ? "●" : "◯");
+        pr.printf("R2: %s%n", r2 ? "●" : "◯");
+        pr.printf("Share: %s%n", share ? "●" : "◯");
+        pr.printf("Opt: %s%n", opt ? "●" : "◯");
+        pr.printf("L3: %s%n", l3 ? "●" : "◯");
+        pr.printf("R3: %s%n", r3 ? "●" : "◯");
+
+        pr.printf("T-PAD: %s%n", tPad ? "●" : "◯");
+        pr.printf("PS: %s%n", ps ? "●" : "◯");
+
+        pr.printf("lTrigger: %02x%n", lTrigger);
+        pr.printf("rTrigger: %02x%n", rTrigger);
+
+        pr.printf("timeStump: %04x%n", timeStump);
+        pr.printf("batteryLevel: %d%n", batteryLevel);
+
+        pr.printf("\uD83C\uDFA7: %s%n", headphone ? "●" : "◯");
+        pr.printf("🎤: %s%n", mic ? "●" : "◯");
+
+        pr.printf("gyro x: %04x%n", gyroX);
+        pr.printf("gyro y: %04x%n", gyroY);
+        pr.printf("gyro z: %04x%n", gyroZ);
+
+        pr.printf("accel x: %04x%n", accelX);
+        pr.printf("accel y: %04x%n", accelY);
+        pr.printf("accel z: %04x%n", accelZ);
+
+        pr.printf("touch1 x: %d%n", touch1X);
+        pr.printf("touch1 y: %d%n", touch1Y);
+
+        pr.printf("touch2 x: %d%n", touch2X);
+        pr.printf("touch2 y: %d%n", touch2Y);
+        pr.println();
+    }
+}