sony testing

timelapseplus · Mar 8, 2019 · 231ecb2 · 231ecb2
1 parent 076378a
commit 231ecb2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/camera/ptp/worker.js b/camera/ptp/worker.js
@@ -410,7 +410,7 @@ function capture(options, callback) {
         if (!err && photo) {
             errCount = 0;
             var cameraFileIsJpeg = info && info.slice(-4) == '.jpg';
-            if (options.thumbnail && supports.thumbnail || cameraFileIsJpeg) {
+            if ((options.thumbnail && supports.thumbnail) || cameraFileIsJpeg) {
                 sdWriting = false;
                 //if (!options.index) options.index = 0;
                 if(options.calculateEv) {
@@ -1031,15 +1031,15 @@ function getConfig(noEvent, cached, cb) {
                             //console.log("processing item", item);
                             if (item == 'shutterspeed' && data.status && manufacturer == 'Sony Corporation') {
                                 console.log("WORKER: manually adding shutter speed list (" + (halfsUsed ? 'halfs' : 'thirds') + ")", data[section].children[item].choices);
-                                //supports.thumbnail = false; // sony USB doesn't support thumbnail-only capture
+                                supports.thumbnail = false; // sony USB doesn't support thumbnail-only capture
                                 var l = halfsUsed ? LISTS.shutterHalfs : LISTS.shutter;
                                 data[section].children[item].choices = [];
                                 for (var j = 0; j < l.length; j++) {
                                     if(l[j].values.length > 1 && l[j].ev >= -11) data[section].children[item].choices.push(l[j].values[0]); // sony doesn't report available shutter speeds, so define them here
                                 }
                             }  else if (item == 'f-number' && data.status && manufacturer == 'Sony Corporation') {
                                 console.log("WORKER: manually adding aperture value list (" + (halfsUsed ? 'halfs' : 'thirds') + ")", data[section].children[item].choices);
-                                //supports.thumbnail = false; // sony USB doesn't support thumbnail-only capture
+                                supports.thumbnail = false; // sony USB doesn't support thumbnail-only capture
                                 var l = halfsUsed ? LISTS.apertureHalfs : LISTS.aperture;
                                 data[section].children[item].choices = [];
                                 for (var j = 0; j < l.length; j++) {

diff --git a/lib/libgphoto2_ptp2_updates/library.c b/lib/libgphoto2_ptp2_updates/library.c
@@ -7480,8 +7480,8 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
 			((ob->oi.ObjectFormat != PTP_OFC_CANON_MOV)) &&
 			((ob->oi.ObjectFormat != PTP_OFC_CANON_MOV2)) &&
 			((ob->oi.ObjectFormat != PTP_OFC_CANON_CRW3)) &&
-			((ob->oi.ObjectFormat != PTP_OFC_CANON_CRW4)) &&
-			((ob->oi.ObjectFormat != PTP_OFC_SONY_RAW))
+			((ob->oi.ObjectFormat != PTP_OFC_CANON_CRW4))/* &&
+			((ob->oi.ObjectFormat != PTP_OFC_SONY_RAW))*/
 		))
 			return GP_ERROR_NOT_SUPPORTED;