From fd3633655e0829010728e7467a00874d1ec7f68a Mon Sep 17 00:00:00 2001
From: Henry Pinkard <7969470+henrypinkard@users.noreply.github.com>
Date: Mon, 10 Mar 2025 15:37:52 -0700
Subject: [PATCH 1/2] add new core callback

---
 java/pom.xml                                  |  4 ++--
 .../remote/RemoteCoreCallback.java            | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/java/pom.xml b/java/pom.xml
index ae5abb19..3a8d1b96 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.micro-manager.pycro-manager</groupId>
     <artifactId>PycroManagerJava</artifactId>
-     <version>0.46.19</version>
+     <version>0.47.0</version>
     <packaging>jar</packaging>
     <name>Pycro-Manager Java</name>
     <description>The Java components of Pycro-Manager</description>
@@ -148,4 +148,4 @@
       </repository>
    </distributionManagement>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java b/java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java
index 3c62ee6c..584c2eae 100644
--- a/java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java
+++ b/java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java
@@ -24,6 +24,7 @@
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.function.Function;
 import mmcorej.CMMCore;
+import mmcorej.MMCoreJJNI;
 import mmcorej.MMEventCallback;
 import mmcorej.org.json.JSONArray;
 import mmcorej.org.json.JSONException;
@@ -262,4 +263,22 @@ public void onSLMExposureChanged(String deviceName, double exposure) {
       }
    }
 
+
+   public void onCameraEvent(String name, String eventName, int timestamp, int eventId, String data) {
+      try {
+         JSONObject message = new JSONObject();
+         message.put("name", "CameraEvent");
+         JSONArray args = new JSONArray();
+         args.put(eventName);
+         args.put(timestamp);
+         args.put(eventId);
+         args.put(data);
+         message.put("arguments", args);
+         eventList_.addLast(message);
+      } catch (JSONException e) {
+         e.printStackTrace();
+         core_.logMessage(e.toString());
+      }
+   }
+
 }
\ No newline at end of file

From 5c435cef741ad9814974fdc04f81aa11d3c806c6 Mon Sep 17 00:00:00 2001
From: Henry Pinkard <7969470+henrypinkard@users.noreply.github.com>
Date: Mon, 10 Mar 2025 16:06:58 -0700
Subject: [PATCH 2/2] change data type

---
 .../main/java/org/micromanager/remote/RemoteCoreCallback.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java b/java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java
index 584c2eae..9442dcac 100644
--- a/java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java
+++ b/java/src/main/java/org/micromanager/remote/RemoteCoreCallback.java
@@ -263,8 +263,7 @@ public void onSLMExposureChanged(String deviceName, double exposure) {
       }
    }
 
-
-   public void onCameraEvent(String name, String eventName, int timestamp, int eventId, String data) {
+   public void onCameraEvent(String name, String eventName, long timestamp, long eventId, String data) {
       try {
          JSONObject message = new JSONObject();
          message.put("name", "CameraEvent");
@@ -281,4 +280,5 @@ public void onCameraEvent(String name, String eventName, int timestamp, int even
       }
    }
 
+
 }
\ No newline at end of file