94a658ce8aAdd some IMPORTANT comments about the format of JSON files to be downloaded.Gerhard Hoffmann2024-05-15 15:02:10 +02:00
9d9865e3c7downloadJson(): continue update-process even when downloading of some JSON file fails.Gerhard Hoffmann2024-05-15 15:01:16 +02:00
a7d5a8f5cdDeclaration of getInstalledJsonVersions() with default parameter.Gerhard Hoffmann2024-05-15 14:59:08 +02:00
cafd16a744Read versions of JSON files installed on PSA (DC!). If version is available, use as blob-value to be visible in ISMAS.Gerhard Hoffmann2024-05-15 14:57:15 +02:00
5876c50a32Make sure that SEND-LAST-VERSION is executed exactly once.Gerhard Hoffmann2024-05-15 14:56:41 +02:00
3b2200c0bfMake sure that SEND-LAST-VERSION is executed exactly once.Gerhard Hoffmann2024-05-15 14:55:55 +02:00
90e4e21391System::getJsonFilesOnUsbStick(): return list of JSON files for configured directory under mount path.Gerhard Hoffmann2024-05-14 12:49:28 +02:00
4536284f34getUSBMountPath(): check for directory 'dirPathUnderMountPath' under mount path.Gerhard Hoffmann2024-05-14 12:48:19 +02:00
a3a4c09c7fcheckForUSBStick(): look for etc/psa_config in mountpath-directory.Gerhard Hoffmann2024-05-14 12:46:38 +02:00
a5dd9af29aAdd System::allowedJsonFiles to name default JSON file names.Gerhard Hoffmann2024-05-14 12:45:43 +02:00
5124e1cca6Use return value of type std::optional<QString> for checkForUSBStick() and getUSBMountPath(). Add getJsonFilesOnUsbStick().Gerhard Hoffmann2024-05-14 12:43:46 +02:00
fc75585de3Parse psa-config-directory and psa-tariff-directory.Gerhard Hoffmann2024-05-14 12:40:32 +02:00
1964b08349doUpdate(): use parameter 'usbStickDetected' to use the correct JSON filenames.Gerhard Hoffmann2024-05-14 12:38:31 +02:00
c0d014644cUpdate (conf) JSON-Files using USB stick. When plugged in, look for JSON-files in directory psa-config-directory and load them to the PSA. Note: these files are overwritten during a usual ISMAS-update if not checked in into the customer repository.Gerhard Hoffmann2024-05-14 12:35:18 +02:00
b24c50c572Parse psa-config-directory and psa-tariff-directory settings.Gerhard Hoffmann2024-05-14 12:33:40 +02:00
bbdadc9063Include psa_config_directory and psa_tariff_directory settings.Gerhard Hoffmann2024-05-14 12:32:26 +02:00
1d64769094Fix: shift jsonNr by 1 in checkDownloadedJsonVersions(); print-templates start now with 6 instead of 5.Gerhard Hoffmann2024-05-08 16:17:28 +02:00
2e3af64c02getFileVersion(): use only 16 byte of buffer filled by DC with version-info of JSON-file.Gerhard Hoffmann2024-05-08 16:16:13 +02:00
f8472a3b87call update.checkJsonVersions(filesToUpdate) after doUpdate().Gerhard Hoffmann2024-05-08 16:10:20 +02:00
698cf74516doUpdate(): re-check again if there are valid data form the device-controller.Gerhard Hoffmann2024-04-11 16:23:08 +02:00
20681b0d6cIf we have pull a new remote branch, the behave as if the customer-repo did not exist before: especially download all json-files inside the new local branch.Gerhard Hoffmann2024-04-11 16:20:46 +02:00
763647c145If customer-repo is already existent (i.e. not cloned), then check for the existence of remote branch (zg/zone<zone-number of psa>). If it exists remotely, but not locally, then execute 'git pull' (could also be 'git pull origin zg1/zone<zone-number>'). A follwing 'git checkout zg1/zone<zone-number>' will switch to the now local branch.Gerhard Hoffmann2024-04-11 16:16:34 +02:00
24f2ba7c44Move rsyncing the customer-repository after filesToUpdate(), as the repository is pulled in filesToUpdate().
v1.4.4
Gerhard Hoffmann2024-04-09 14:56:25 +02:00
2ed6768953Minor: remove ismasTriggerValue-(debug)-message, as it was too confusing.Gerhard Hoffmann2024-04-09 14:55:45 +02:00
8d18ae10fedownLoadJson(): add more debug-output (visible in ISMAS as well) to see what actuelly went wrong when downloading json-Files.Gerhard Hoffmann2024-04-09 14:51:54 +02:00
175b8fd3a1If the update-trigger (aka WAIT-button) is empty and we have an automatic update (i.e. time is 0:00 - 4:00 am), then do not inform ISMAS with an U0003 error signal, but send an U0002 (setting the trigger-value to "OK").Gerhard Hoffmann2024-03-19 12:41:42 +01:00