remotebuzzer: bugfix for hardware button to trigger collage mode

andi34 · Dec 12, 2021 · d0444d6 · d0444d6
1 parent 08a04d1
commit d0444d6
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 8 deletions.
diff --git a/src/js/core.js b/src/js/core.js
@@ -470,6 +470,10 @@ const photoBooth = (function () {
 
                     $('.loaderImage').show();
 
+                    photoboothTools.console.logDev(
+                        'Taken collage photo number: ' + (result.current + 1) + ' / ' + result.limit
+                    );
+
                     if (config.collage.continuous) {
                         if (result.current + 1 < result.limit) {
                             setTimeout(() => {
@@ -490,33 +494,35 @@ const photoBooth = (function () {
                         }
                     } else {
                         // collage with interruption
-                        remoteBuzzerClient.collageWaitForNext();
-
                         if (result.current + 1 < result.limit) {
                             $(
-                                '<a class="btn rotaryfocus" href="#">' +
+                                '<a class="btn rotaryfocus" href="#" id="btnCollageNext">' +
                                     photoboothTools.getTranslation('nextPhoto') +
                                     '</a>'
                             )
                                 .appendTo('.loading')
                                 .click((ev) => {
                                     ev.stopPropagation();
                                     ev.preventDefault();
+
                                     $('.loaderImage').css('background-image', 'none');
                                     imageUrl = '';
                                     $('.loaderImage').css('display', 'none');
                                     api.thrill('collage');
                                 });
+
+                            remoteBuzzerClient.collageWaitForNext();
                         } else {
                             $(
-                                '<a class="btn rotaryfocus" href="#">' +
+                                '<a class="btn rotaryfocus" href="#" id="btnCollageProcess">' +
                                     photoboothTools.getTranslation('processPhoto') +
                                     '</a>'
                             )
                                 .appendTo('.loading')
                                 .click((ev) => {
                                     ev.stopPropagation();
                                     ev.preventDefault();
+
                                     $('.loaderImage').css('background-image', 'none');
                                     imageUrl = '';
                                     $('.loaderImage').css('display', 'none');
@@ -525,7 +531,10 @@ const photoBooth = (function () {
 
                                     api.processPic(data.style, result);
                                 });
+
+                            remoteBuzzerClient.collageWaitForProcessing();
                         }
+
                         $(
                             '<a class="btn rotaryfocus" style="margin-left:2px" href="#">' +
                                 photoboothTools.getTranslation('retakePhoto') +

diff --git a/src/js/remotebuzzer_client.js b/src/js/remotebuzzer_client.js
@@ -56,6 +56,15 @@ function initRemoteBuzzerFromDOM() {
                             buttonController.takeCollage();
                             break;
 
+                        case 'collage-next':
+                            // Need to handle collage process in button handler
+                            if (buttonController.waitingToProcessCollage) {
+                                buttonController.processCollage();
+                            } else {
+                                buttonController.takeCollageNext();
+                            }
+                            break;
+
                         case 'print':
                             buttonController.print();
                             break;
@@ -116,6 +125,14 @@ function initRemoteBuzzerFromDOM() {
             }
         };
 
+        api.collageWaitForProcessing = function () {
+            buttonController.waitingToProcessCollage = true;
+
+            if (this.enabled()) {
+                this.emitToServer('collage-wait-for-next');
+            }
+        };
+
         api.startPicture = function () {
             if (this.enabled()) {
                 this.emitToServer('start-picture');
@@ -159,6 +176,7 @@ function initRemoteBuzzerFromDOM() {
     buttonController = (function () {
         // vars
         const api = {};
+        api.waitingToProcessCollage = false;
 
         api.init = function () {
             // nothing to init
@@ -182,10 +200,20 @@ function initRemoteBuzzerFromDOM() {
         api.takeCollage = function () {
             if (this.enabled() && config.collage.enabled) {
                 $('.resultInner').removeClass('show');
+                this.waitingToProcessCollage = false;
                 photoBooth.thrill('collage');
             }
         };
 
+        api.takeCollageNext = function () {
+            $('#btnCollageNext').trigger('click');
+        };
+
+        api.processCollage = function () {
+            this.waitingToProcessCollage = false;
+            $('#btnCollageProcess').trigger('click');
+        };
+
         api.print = function () {
             if ($('#result').is(':visible')) {
                 $('.printbtn').trigger('click');

diff --git a/src/js/remotebuzzer_server.js b/src/js/remotebuzzer_server.js
@@ -62,6 +62,11 @@ function photoboothAction(type) {
             ioServer.emit('photobooth-socket', 'start-collage');
             break;
 
+        case 'collage-next':
+            log('Photobooth COLLAGE : [ photobooth-socket ]  => [ All Clients ]: command [ collage-next ]');
+            ioServer.emit('photobooth-socket', 'collage-next');
+            break;
+
         case 'completed':
             triggerArmed = true;
             collageInProgress = false;
@@ -188,6 +193,11 @@ if (config.remotebuzzer.usegpio) {
 
 /* BUTTON SEMAPHORE HELPER FUNCTION */
 function buttonActiveCheck(gpio, value) {
+    /*
+     * value = 0 : button is pressed (connected to GND - pulled down)
+     * value = 1 : button is not pressed (pull-up)
+     */
+
     /* init */
     if (typeof buttonActiveCheck.buttonIsPressed == 'undefined') {
         buttonActiveCheck.buttonIsPressed = 0;
@@ -219,12 +229,13 @@ function buttonActiveCheck(gpio, value) {
 
     /* error state - do nothing */
     log(
-        'buttonActiveCheck error state - requested GPIO ',
+        'buttonActiveCheck WARNING - requested GPIO ',
         gpio,
         ', for value ',
         value,
         'but buttonIsPressed:',
-        buttonActiveCheck.buttonIsPressed
+        buttonActiveCheck.buttonIsPressed,
+        ' Please consider to add an external pull-up resistor to all your input GPIOs, this might help to eliminate this warning. Regardless of this warning, Photobooth should be fully functional.'
     );
 
     return true;
@@ -296,6 +307,10 @@ const watchPictureGPIOwithCollage = function watchPictureGPIOwithCollage(err, gp
             /* Start Picture */
             log('GPIO', config.remotebuzzer.picturegpio, '- Picture button released - normal -', timeElapsed, ' [ms] ');
             photoboothAction('picture');
+        } else if (collageInProgress) {
+            /* Next Collage Picture*/
+            log('GPIO', config.remotebuzzer.picturegpio, '- Picture button released - long -', timeElapsed, ' [ms] ');
+            photoboothAction('collage-next');
         } else {
             /* Start Collage */
             log('GPIO', config.remotebuzzer.picturegpio, '- Picture button released - long -', timeElapsed, ' [ms] ');
@@ -358,8 +373,11 @@ const watchCollageGPIO = function watchCollageGPIO(err, gpioValue) {
         if (timeElapsed) {
             log('GPIO', config.remotebuzzer.collagegpio, '- Collage button released ', timeElapsed, ' [ms] ');
 
-            /* Start Collage */
-            if (!collageInProgress) {
+            /* Collage Trigger Next */
+            if (collageInProgress) {
+                photoboothAction('collage-next');
+            } else {
+                /* Start Collage */
                 photoboothAction('collage');
             }
         } else {