Merge pull request #1218 from RafaelTaranto/chore/gsr50-build

fix: update gsr50 on sencha
lamassu · Nov 12, 2024 · b8ceeb3 · b8ceeb3
2 parents f1d401c + 5d1edb8
commit b8ceeb3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/deploy/codebase/lamassu-machine-manager.js b/deploy/codebase/lamassu-machine-manager.js
@@ -140,6 +140,17 @@ function restartWatchdogService (cb) {
   })
 }
 
+function updateGSR50 (cb) {
+  LOG("Updating GSR50")
+  if (machineCode !== 'aveiro') return cb()
+  return async.series([
+    async.apply(command, `cp ${applicationParentFolder}/lamassu-machine/lib/gsr50/binaries/* /opt/FujitsuGSR50/`),
+  ], function(err) {
+    if (err) throw err;
+    cb()
+  });
+}
+
 function updateAcpChromium (cb) {
   LOG("Updating ACP Chromium")
   if (hardwareCode !== 'aaeon') return cb()
@@ -182,10 +193,7 @@ function installDeviceConfig (cb) {
       newDeviceConfig.billDispenser.cassettes = currentDeviceConfig.billDispenser.cassettes
     }
     if (currentDeviceConfig.billValidator) {
-      newDeviceConfig.billValidator.deviceType = currentDeviceConfig.billValidator.deviceType
-      if (currentDeviceConfig.billValidator.rs232) {
-        newDeviceConfig.billValidator.rs232.device = currentDeviceConfig.billValidator.rs232.device
-      }
+      newDeviceConfig.billValidator = currentDeviceConfig.billValidator
     }
     if (currentDeviceConfig.kioskPrinter) {
       newDeviceConfig.kioskPrinter.model = currentDeviceConfig.kioskPrinter.model
@@ -229,6 +237,7 @@ const upgrade = () => {
     async.apply(updateSupervisor),
     async.apply(updateSystemd),
     async.apply(updateUdev),
+    async.apply(updateGSR50),
     async.apply(updateAcpChromium),
     async.apply(report, null, 'finished.'),
     async.apply(restartWatchdogService),

diff --git a/lib/gsr50/binaries/FujitsuGSR50 b/lib/gsr50/binaries/FujitsuGSR50
diff --git a/lib/gsr50/binaries/FujitsuGSR50.dll b/lib/gsr50/binaries/FujitsuGSR50.dll
diff --git a/lib/gsr50/gsr50.js b/lib/gsr50/gsr50.js
@@ -298,6 +298,7 @@ Gsr50.prototype.setDeviceCashUnits = function setDeviceCashUnits (cassettes, rec
             }
           })
         },
+        {},
         _.range(0, this.numberOfCashboxes)
       )
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
               })
             },
+            {},
             _.range(0, this.numberOfCashboxes)
           )
@@ Expand Down @@