upgrade to latest AIS-catcher engine

jvde-github · Jul 10, 2023 · 1067a12 · 1067a12
1 parent 7565580
commit 1067a12
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.jvdegithub.aiscatcher"
         minSdk 22
         targetSdk 32
-        versionCode 29
-        versionName '0.29'
+        versionCode 30
+        versionName '0.30'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {

diff --git a/app/src/main/java/com/jvdegithub/aiscatcher/Settings.java b/app/src/main/java/com/jvdegithub/aiscatcher/Settings.java
@@ -222,7 +222,8 @@ static public int getCGFSetting(Context context)
     {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
         String set = preferences.getString("oCGF_WIDE", "Default");
-        if(set.equals("Default")) return 0;
+        if(set.equals("Default")) return 1;
+        if(set.equals("Narrow")) return 0;
         return 1;
     }
 

diff --git a/app/src/main/jni/AIS-catcher b/app/src/main/jni/AIS-catcher
diff --git a/app/src/main/jni/CMakeLists.txt b/app/src/main/jni/CMakeLists.txt
@@ -44,10 +44,14 @@ add_library( # Sets the name of the library.
         ./airspyhf/libairspyhf/src/airspyhf.c
         ./airspyhf/libairspyhf/src/iqbalancer.c
 
-        ./AIS-catcher/Device/AIRSPYHF.cpp ./AIS-catcher/Device/FileWAV.cpp ./AIS-catcher/Device/RTLSDR.cpp ./AIS-catcher/Device/SDRPLAY.cpp ./AIS-catcher/IO/Network.cpp
-        ./AIS-catcher/DSP/Demod.cpp ./AIS-catcher/DSP/Model.cpp ./AIS-catcher/Library/AIS.cpp ./AIS-catcher/Device/FileRAW.cpp ./AIS-catcher/Library/JSONAIS.cpp ./AIS-catcher/Library/Message.cpp
-        ./AIS-catcher/Device/HACKRF.cpp ./AIS-catcher/Device/RTLTCP.cpp ./AIS-catcher/Device/ZMQ.cpp ./AIS-catcher/Library/Utilities.cpp ./AIS-catcher/Library/JSON.cpp
-        ./AIS-catcher/Device/AIRSPY.cpp ./AIS-catcher/Device/SpyServer.cpp ./AIS-catcher/DSP/DSP.cpp ./AIS-catcher/IO/IO.cpp ./AIS-catcher/Library/TCP.cpp
+        ./AIS-catcher/Application/Receiver.cpp ./AIS-catcher/Application/Config.cpp ./AIS-catcher/Ships/DB.cpp ./AIS-catcher/DBMS/PostgreSQL.cpp
+        ./AIS-catcher/Device/AIRSPYHF.cpp ./AIS-catcher/Device/FileWAV.cpp ./AIS-catcher/Device/RTLSDR.cpp ./AIS-catcher/Device/SDRPLAY.cpp ./AIS-catcher/DSP/Demod.cpp ./AIS-catcher/DSP/Model.cpp
+        ./AIS-catcher/Library/AIS.cpp ./AIS-catcher/Library/JSONAIS.cpp ./AIS-catcher/Library/Keys.cpp
+        ./AIS-catcher/Device/FileRAW.cpp ./AIS-catcher/Device/HACKRF.cpp ./AIS-catcher/Device/UDP.cpp ./AIS-catcher/Device/RTLTCP.cpp
+        ./AIS-catcher/Device/ZMQ.cpp ./AIS-catcher/Device/SoapySDR.cpp ./AIS-catcher/Device/SpyServer.cpp ./AIS-catcher/Library/Message.cpp ./AIS-catcher/Library/NMEA.cpp
+        ./AIS-catcher/Library/Utilities.cpp ./AIS-catcher/Library/TCP.cpp ./AIS-catcher/JSON/JSON.cpp ./AIS-catcher/IO/Network.cpp ./AIS-catcher/IO/Server.cpp
+        ./AIS-catcher/JSON/StringBuilder.cpp ./AIS-catcher/JSON/Parser.cpp ./AIS-catcher/Device/AIRSPY.cpp ./AIS-catcher/Device/Serial.cpp
+        ./AIS-catcher/DSP/DSP.cpp  ./AIS-catcher/IO/IO.cpp
 
         JNI/AIScatcherNDK.cpp)
 
@@ -56,7 +60,7 @@ include_directories(
         ./rtl-sdr/include
         ./airspyone_host/libairspy/src
         ./airspyhf/libairspyhf/src
-        ./AIS-catcher ./AIS-catcher/Application ./AIS-catcher/IO ./AIS-catcher/Library ./AIS-catcher/DSP ./AIS-catcher/Device)
+        ./AIS-catcher ./AIS-catcher/Application ./AIS-catcher/IO ./AIS-catcher/Library ./AIS-catcher/Ships ./AIS-catcher/DBMS ./AIS-catcher/DSP ./AIS-catcher/Device)
 
 add_definitions(-DHASRTLSDR -DHASRTLSDR_BIASTEE -DHASRTL_ANDROID -DHASAIRSPY -DHASAIRSPY_ANDROID -D HASAIRSPYHF -DHASAIRSPYHF_ANDROID -DHASRTLSDR_TUNERBW)
 

diff --git a/app/src/main/jni/JNI/AIScatcherNDK.cpp b/app/src/main/jni/JNI/AIScatcherNDK.cpp
@@ -235,8 +235,13 @@ RAWcounter rawcounter;
 Device::Device *device = nullptr;
 AIS::Model *model = nullptr;
 
+
 bool stop = false;
 
+void StopRequest() {
+    stop = true;
+}
+
 extern "C"
 JNIEXPORT jint JNICALL
 Java_com_jvdegithub_aiscatcher_AisCatcherJava_InitNative(JNIEnv *env, jclass instance) {
@@ -245,7 +250,7 @@ Java_com_jvdegithub_aiscatcher_AisCatcherJava_InitNative(JNIEnv *env, jclass ins
     javaVersion = env->GetVersion();
     javaClass = (jclass) env->NewGlobalRef(instance);
 
-    callbackConsole(env, "AIS-Catcher " VERSION "-29\n");
+    callbackConsole(env, "AIS-Catcher " VERSION "-30\n");
     memset(&statistics, 0, sizeof(statistics));
 
     return 0;
@@ -261,8 +266,7 @@ Java_com_jvdegithub_aiscatcher_AisCatcherJava_isStreaming(JNIEnv *, jclass) {
 
 extern "C"
 JNIEXPORT jint JNICALL
-Java_com_jvdegithub_aiscatcher_AisCatcherJava_applySetting(JNIEnv *env, jclass, jstring dev,
-                                                           jstring setting, jstring param) {
+Java_com_jvdegithub_aiscatcher_AisCatcherJava_applySetting(JNIEnv *env, jclass, jstring dev, jstring setting, jstring param) {
 
     try {
         jboolean isCopy;
@@ -315,7 +319,8 @@ Java_com_jvdegithub_aiscatcher_AisCatcherJava_Run(JNIEnv *env, jclass) {
         callbackConsole(env, "Creating output channels\n");
         UDP_connections.resize(UDPhost.size());
         for (int i = 0; i < UDPhost.size(); i++) {
-            UDP_connections[i].openConnection(UDPhost[i], UDPport[i]);
+            UDP_connections[i].Set("host",UDPhost[i]).Set("port",UDPport[i]);
+            UDP_connections[i].Start();
             model->Output() >> UDP_connections[i];
         }
 
@@ -350,9 +355,9 @@ Java_com_jvdegithub_aiscatcher_AisCatcherJava_Run(JNIEnv *env, jclass) {
     try {
         device->Stop();
 
-        model->Output().out.Clear();
+        model->Output().out.clear();
 
-        for (auto u: UDP_connections) u.closeConnection();
+        for (auto &u: UDP_connections) u.Stop();
         UDP_connections.clear();
         UDPport.clear();
         UDPhost.clear();
@@ -428,7 +433,7 @@ Java_com_jvdegithub_aiscatcher_AisCatcherJava_createReceiver(JNIEnv *env, jclass
     }
 
     try {
-        device->out.Clear();
+        device->out.clear();
         device->OpenWithFileDescriptor(fd);
         device->setFrequency(162000000);
     }

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -29,7 +29,7 @@
     </string-array>
 
     <string-array name="cgf_array">
-        <item>Default</item><item>Wide</item>
+        <item>Default</item><item>Wide</item> <item>Narrow</item>
     </string-array>
 
 </resources>