P2 Pro camera support (#9)

* fix the warning about compiled library not being 16k aligned

* ignore local.properties file

* support p2pro camera

* unit pedantry

* fix hacked logic so infiray cameras continue to work

* ignore temp file

* fix min and max temperature not working with locked range

Author: DangerousElectrician

.gitignore

@@ -2,4 +2,5 @@
 .gradle
 build/
 /app/release
-
+local.properties
+temp

app/src/main/java/be/ntmn/inficam/MainActivity.java

@@ -91,6 +91,7 @@ public class MainActivity extends BaseActivity {
 	private int imgQuality;
 
 	private boolean raw_cam = false;
+    private boolean p2Pro = false;
 	private boolean first_connect = false;
 
 	private Bitmap imgCompressBitmap;
@@ -164,11 +165,13 @@ public void onDeviceFound(UsbDevice dev) {
 			 *   and subclass are checked because older android versions don't filter for us.
 			 */
 			if (device != null || dev.getDeviceClass() != 239 || dev.getDeviceSubclass() != 2 ||
-					(dev.getVendorId() != 0x1514 && dev.getVendorId() != 0x4B4 && dev.getVendorId() != 0x3474))
+					(dev.getVendorId() != 0x1514 && dev.getVendorId() != 0x4B4 && dev.getVendorId() != 0x3474 && dev.getVendorId() != 0xBDA))
 				return;
 
 			raw_cam = (dev.getVendorId() == 0x4B4) || (dev.getVendorId() == 0x3474);	// For T2S+ A2 raw sensor
 
+            p2Pro = (dev.getVendorId() == 0xBDA); // flag for P2 Pro
+
 			device = dev;
 			/* Connecting to a UVC device needs camera permission. */
 			askPermission(Manifest.permission.CAMERA, granted -> {
@@ -185,6 +188,7 @@ public void onConnected(UsbDevice dev, UsbDeviceConnection conn) {
 						disconnecting = false;
 						earlyFrame = 0;
 						try {
+                            infiCam.setP2Pro(p2Pro); // need to set p2Pro flag before connecting otherwise the resolution does not get set properly
 							infiCam.connect(conn.getFileDescriptor());
 							infiCam.setRawSensor(raw_cam);
 							/* Size is only important for cubic interpolation. */
@@ -331,7 +335,31 @@ public void onFrame(InfiCam.FrameInfo fi, float[] temp) {
 						fi.max_y = mma.max_y;
 						rangeMax = mma.max;
 					}
-				}
+				} else if (p2Pro) {
+                    // p2Pro does not report min and max through registers so use zoom logic to find min and max
+                    float lost = (1.0f - 1.0f / scale) / 2.0f;
+                    Overlay.mmaRect(mma, temp,
+                            (int) (lost * fi.width),
+                            (int) (lost * fi.height),
+                            (int) ((1.0f - lost) * fi.width),
+                            (int) ((1.0f - lost) * fi.height),
+                            fi.width);
+
+                    fi.min = mma.min;
+                    fi.min_x = mma.min_x;
+                    fi.min_y = mma.min_y;
+                    if (isNaN(rangeMin)) {
+                        rangeMin = mma.min;
+                    }
+
+                    fi.max = mma.max;
+                    fi.max_x = mma.max_x;
+                    fi.max_y = mma.max_y;
+                    if (isNaN(rangeMax)) {
+                        rangeMax = mma.max;
+                    }
+                }
+
 
 				infiCam.applyPalette(rangeMin, rangeMax);
 				handler.post(handleFrameRunnable);

app/src/main/java/be/ntmn/inficam/Util.java

@@ -199,9 +199,9 @@ public static void formatTemp(StringBuilder sb, float temp, int tempunit) {
 		if (tempunit == TEMPUNIT_FAHRENHEIT)
 			sb.append("°F");
 		else if (tempunit == TEMPUNIT_KELVIN)
-			sb.append("°K");
+			sb.append("K"); // Fun Fact: Kelvin does not use degrees
 		else if (tempunit == TEMPUNIT_RANKINE)
-			sb.append("°R");
+			sb.append("°R"); // Funner Fact: Rankine does use degrees
 		else sb.append("°C");
 	}
 

libinficam/src/main/java/be/ntmn/libinficam/InfiCam.java

@@ -126,6 +126,7 @@ public native void setParams(float corr, float t_ref, float t_air, float humi, f
 	public native void calibrate();
 	public native void closeShutter();
 	public native void setRawSensor(boolean raw);
+    public native void setP2Pro(boolean p2Pro);
 
 	private native int nativeSetPalette(int[] palette); /* Length must be paletteLen. */
 	public void setPalette(int[] palette) {

libinficam/src/main/jni/Application.mk

@@ -2,3 +2,4 @@ APP_PLATFORM := android-16
 APP_ABI := armeabi-v7a arm64-v8a x86_64 x86
 APP_OPTIM := release
 APP_STL := c++_static
+APP_SUPPORT_FLEXIBLE_PAGE_SIZES := true

libinficam/src/main/jni/InfiCam/InfiCam.cpp

@@ -16,9 +16,11 @@
 
 
 void InfiCam::uvc_callback(uvc_frame_t *frame, void *user_ptr) {
+    // This function gets called every time a new frame is ready
 	InfiCam *p = (InfiCam *) user_ptr;
 	if (frame->data_bytes < p->dev.width * p->dev.height * 2)
 		return;
+
     if(p->calibrating) {
         size_t frame_size = p->dev.width * (p->dev.height - InfiCam::DATA_ROWS);    // We don't want to calibrate out the data rows
 
@@ -72,7 +74,13 @@ void InfiCam::uvc_callback(uvc_frame_t *frame, void *user_ptr) {
     if (p->intermediary_buffer == nullptr) {
         p->intermediary_buffer = new uint16_t[frame_size];
     }
-    memcpy(p->intermediary_buffer, frame->data, frame_size * sizeof(uint16_t));
+
+    if (p->p2_pro) {
+        memcpy(p->intermediary_buffer, (uint16_t *) frame->data + 256*192, 256*192 * sizeof(uint16_t)); // use only the half of the image with the thermal data
+    } else {
+        memcpy(p->intermediary_buffer, frame->data, frame_size * sizeof(uint16_t));
+    }
+
 
     // Apply calibration and dead pixel correction in a single pass
     if(p->raw_sensor && p->calibrated) {
@@ -141,6 +149,7 @@ void InfiCam::uvc_callback(uvc_frame_t *frame, void *user_ptr) {
         p->infi.update_table(p->intermediary_buffer);
         p->table_invalid = 0;
     } else p->infi.update(p->intermediary_buffer);
+
     p->infi.temp(p->intermediary_buffer, p->frame_temp);
 
 	/* Unlock before the callback so if it decides to call a function that locks the this callback
@@ -173,15 +182,15 @@ int InfiCam::connect(int fd) {
 	 */
 	if (pthread_mutex_init(&frame_callback_mutex, NULL))
 		return 1;
-	if (dev.connect(fd)) {
+	if (dev.connect(fd, p2_pro)) {
 		pthread_mutex_destroy(&frame_callback_mutex);
 		return 2;
 	}
-	if (infi.init(dev.width, dev.height)) {
-		dev.disconnect();
-		pthread_mutex_destroy(&frame_callback_mutex);
-		return 3;
-	}
+    if (infi.init(dev.width, dev.height)) {
+        dev.disconnect();
+        pthread_mutex_destroy(&frame_callback_mutex);
+        return 3;
+    }
 	dev.set_zoom_abs(CMD_MODE_TEMP);
 	connected = 1;
 	set_range(infi.range);

libinficam/src/main/jni/InfiCam/InfiCam.h

@@ -27,6 +27,7 @@ class InfiCam {
     pthread_cond_t calibration_cond;
 	int connected = 0, streaming = 0, table_invalid;
     bool raw_sensor = false;
+    bool p2_pro;
     bool calibrating = false;
     bool calibrated = false;
     bool* dead_pixel_mask = nullptr;
@@ -102,6 +103,7 @@ class InfiCam {
 	void set_params(float corr, float t_ref, float t_air, float humi, float emi, float dist);
 	void store_params(); /* Store user memory to camera so values remain when reconnecting. */
     void set_raw_sensor(bool raw) { raw_sensor = raw; };
+    void set_p2_pro(bool p2_pro_dev) { p2_pro = p2_pro_dev; };
 
 	void update_table();
 	void calibrate();

libinficam/src/main/jni/InfiCam/InfiCamJNI.cpp

@@ -353,7 +353,15 @@ JNIEXPORT void Java_be_ntmn_libinficam_InfiCam_setRawSensor(JNIEnv *env, jobject
     InfiCam *cam = getObject(env, self);
     if (cam != NULL) {
         cam->set_raw_sensor(raw);
-        cam->infi.raw_sensor = true;
+        cam->infi.raw_sensor = raw;
+    }
+}
+
+JNIEXPORT void Java_be_ntmn_libinficam_InfiCam_setP2Pro(JNIEnv *env, jobject self, jboolean p2_pro) {
+    InfiCam *cam = getObject(env, self);
+    if (cam != NULL) {
+        cam->set_p2_pro(p2_pro);
+        cam->infi.p2_pro = p2_pro;
     }
 }
 
@@ -415,3 +423,4 @@ JNIEXPORT void Java_be_ntmn_libinficam_InfiCam_applyPalette(JNIEnv *env, jobject
 }
 
 } /* extern "C" */
+

libinficam/src/main/jni/InfiCam/InfiFrame.cpp

@@ -43,8 +43,13 @@ static inline float atmt(float h, float t_atm, float d) {
 }
 
 int InfiFrame::init(int width, int height) {
-	this->width = width;
-	this->height = height - 4;
+    if (p2_pro) {
+        this->width = 256;
+        this->height = 192; //384
+    } else {
+        this->width = width;
+        this->height = height - 4;
+    }
 	s1_offset = width * (height - 4);
 
 	cal_00_offset = 390.0;
@@ -119,16 +124,8 @@ void InfiFrame::update(uint16_t *frame) {
 	float cal_03 = read_float(frame + s2_offset, 7);
 	float cal_04 = read_float(frame + s2_offset, 9);
 	float cal_05 = read_float(frame + s2_offset, 11);
-    if(!raw_sensor) {
-        temp_max_x = read_u16(frame + s1_offset, 2);
-        temp_max_y = read_u16(frame + s1_offset, 3);
-        temp_max = read_u16(frame + s1_offset, 4);
-        temp_min_x = read_u16(frame + s1_offset, 5);
-        temp_min_y = read_u16(frame + s1_offset, 6);
-        temp_min = read_u16(frame + s1_offset, 7);
-        temp_avg = read_u16(frame + s1_offset, 8);
-        temp_center = read_u16(frame + s1_offset, 12);
-    }else{
+
+    if (raw_sensor) {
         temp_max = 0;
         temp_min = UINT16_MAX;
         uint32_t sum = 0;
@@ -162,6 +159,17 @@ void InfiFrame::update(uint16_t *frame) {
         }
 
         temp_avg = sum / (height * width);
+    } else if (p2_pro) {
+        temp_center = frame[96 * width + 128]>>2;
+    } else {
+        temp_max_x = read_u16(frame + s1_offset, 2);
+        temp_max_y = read_u16(frame + s1_offset, 3);
+        temp_max = read_u16(frame + s1_offset, 4);
+        temp_min_x = read_u16(frame + s1_offset, 5);
+        temp_min_y = read_u16(frame + s1_offset, 6);
+        temp_min = read_u16(frame + s1_offset, 7);
+        temp_avg = read_u16(frame + s1_offset, 8);
+        temp_center = read_u16(frame + s1_offset, 12);
     }
 	temp_user[0] = read_u16(frame + s1_offset, 13);
 	temp_user[1] = read_u16(frame + s1_offset, 14);
@@ -191,10 +199,15 @@ float InfiFrame::temp_single(uint16_t x) {
 	/* Temperatures below what we can calculate result in sqrt of a negative number, the absolute
 	 *   lowest temperature we can calculate is the one we get if we set n to 0.
 	 */
-	float n = sqrtf(((float) (x - table_offset) * cal_d + cal_c) / cal_01 + cal_b);
-	float wtot = powf((isfinite(n) ? n : 0.0) - cal_a + zeroc, 4);
-	float ttot = powf((wtot - numerator_sub) / denominator, 0.25) - zeroc;
-	return ttot + (distance_adjusted * 0.85 - 1.125) * (ttot - temp_air) / 100.0 + correction;
+
+    if (p2_pro) {
+        return ((float) x )/16.0f-273.15f;
+    } else {
+        float n = sqrtf(((float) (x - table_offset) * cal_d + cal_c) / cal_01 + cal_b);
+        float wtot = powf((isfinite(n) ? n : 0.0) - cal_a + zeroc, 4);
+        float ttot = powf((wtot - numerator_sub) / denominator, 0.25) - zeroc;
+        return ttot + (distance_adjusted * 0.85 - 1.125) * (ttot - temp_air) / 100.0 + correction;
+    }
 }
 
 void InfiFrame::update_table(uint16_t *frame) {
@@ -209,23 +222,33 @@ void InfiFrame::temp(uint16_t *input, float *output) {
 
 void InfiFrame::temp(uint16_t *input, float *output, size_t len) {
 	for (size_t i = 0; i < len; ++i)
-		output[i] = temp(input[i]);
+		output[i] = temp(input[i]>>2);
 }
 
 void InfiFrame::read_params(uint16_t *frame) {
 	/* Presumeably this is just a 128 byte ram+eeprom area. */
-    if(!raw_sensor) {
-        correction = read_float(frame + s2_offset, 127);
-        /* NOTE Original Infiray software uses a uint16 for distance. */
-        distance = read_float(frame + s2_offset, 137);
-    }else{
-        // TODO: Handling of theve vraibles and user input should be done within the app because writing to these doesn't work on the T2S+ A2
-        distance = (float)read_u16(frame + s2_offset, 137);
+    if (p2_pro) {
+        correction = 0;
+        distance = 0;
+        temp_reflected = 0;
+        temp_air = 0;
+        humidity = 0;
+        emissivity = 1.0;
+    } else {
+        if (!raw_sensor) {
+            correction = read_float(frame + s2_offset, 127);
+            /* NOTE Original Infiray software uses a uint16 for distance. */
+            distance = read_float(frame + s2_offset, 137);
+        } else {
+            // TODO: Handling of theve vraibles and user input should be done within the app because writing to these doesn't work on the T2S+ A2
+            distance = (float) read_u16(frame + s2_offset, 137);
+        }
+        temp_reflected = read_float(frame + s2_offset, 129);
+        temp_air = read_float(frame + s2_offset, 131);
+        humidity = read_float(frame + s2_offset, 133);
+        emissivity = read_float(frame + s2_offset, 135);
     }
-	temp_reflected = read_float(frame + s2_offset, 129);
-	temp_air = read_float(frame + s2_offset, 131);
-	humidity = read_float(frame + s2_offset, 133);
-	emissivity = read_float(frame + s2_offset, 135);
+
 }
 
 void InfiFrame::read_version(uint16_t *frame, char *product, char *serial, char *fw_version) {
@@ -264,7 +287,7 @@ void InfiFrame::palette_appy(float *input, uint32_t *output, size_t len) {
 	palette_appy(input, output, len, temp(temp_min), temp(temp_max));
 }
 
-void InfiFrame::palette_appy(float *input, uint32_t *output, float min, float max) {
+void InfiFrame::palette_appy(float *input, uint32_t *output, float min, float max) { // TODO this palette_appy gets used
 	palette_appy(input, output, width * height, min, max);
 }
 

libinficam/src/main/jni/InfiCam/InfiFrame.h

@@ -21,6 +21,8 @@ class InfiFrame {
 public:
     /* Defines if the camera reports raw sensor readings such as the T2S+ A2 version. */
     bool raw_sensor = false;
+    /* Defines if the camera is the P2 Pro. */
+    bool p2_pro = false;
 	/* Dimensions of actual thermographic image, set by init(). */
 	int width = 0, height = 0; /* And set here too for predictability. */