Compare commits

..

221 Commits

Author SHA1 Message Date
c53504b14d Remove Sat 08:00-12:00 from Zone 3 (Yellow) 2024-10-29 15:32:19 +01:00
1a6c5836bc Revert to original versions 2024-08-08 12:23:14 +02:00
4e64df50d7 set 8:00-18:00 for 03.08 2024-08-01 12:38:27 +02:00
c4dd836ee3 Activate opkg_commands 2024-07-15 08:54:40 +02:00
cab404e238 opkg: none 2024-07-08 13:37:38 +02:00
84b2b1ca27 Set ex.rate to 365. 2024-07-05 09:40:22 +02:00
e245ae27a0 Set ex.rate to 365. 2024-07-05 09:31:39 +02:00
4f5fcfe7b5 re-commit: change of ISMAS settings 2024-06-25 08:36:21 +02:00
caa7030a97 ZoneId in tariff-files 2024-06-24 11:31:03 +02:00
3657e299b3
Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2 2024-06-07 08:15:14 +02:00
bad9bb1103
Tariff: add tariff-info aka "TARIFF_ID" 2024-06-07 08:11:51 +02:00
acc80f2c04 Remove all files except DC2C_cash/print22/print25/print28.json 2024-04-30 14:33:33 +02:00
503e355667 Repeat update procedure in Szeged for 145-148,171,172,159-161 2024-04-30 08:51:06 +02:00
6cad56650b Set exchange rate to 350. Add all other json-files from at-dat as provided by Thomas 2024-04-26 12:10:20 +02:00
6318b15756 Use empty file. 2024-04-18 16:09:50 +02:00
a523fe72c3 readd empty lines (just to be sure that files have been changed) 2024-03-28 12:09:45 +01:00
8fde0a4f4d added empty lines to restart download 2024-03-28 11:57:17 +01:00
cb7a17cdad even remove opkg update 2024-03-26 10:06:16 +01:00
2702208167 only install prepare-update script 2024-03-26 09:51:41 +01:00
2c0fd877ab Removed all holidays except thos for 2024 2024-03-26 09:40:11 +01:00
59cd4bfb7e tariff01 -> exact prize: 42
tarif 04/06 -> exact price: 163
2024-02-19 17:29:34 +01:00
0cfd6b7071 tariff01.json: set min-price: 165 / 4 -> 45
tariff02.json: set min-price: 260 / 4 -> 65
tariff03.json: set min-price: 360 / 4 -> 90
tariff04.json: set min-price: 650 / 4 -> 165
tariff05.json: set min-price: 360 / 4 -> 90
tariff06.json: set min-price: 650 / 4 -> 165
2024-02-15 14:26:37 +01:00
443961ca5d add libmobilisis-calc2 and activate upgrade step 2024-01-09 11:45:05 +01:00
c2c21df05a Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600 2024-01-08 15:43:35 +01:00
053d554c45 Set zone 'green mars' as 'green', 'yellow mars' as 'yello' 2024-01-08 10:59:14 +01:00
048ef21538 Update exchange rate to 352. 2023-12-31 08:16:57 +01:00
19b8b6ba28 turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days. 2023-12-31 08:08:07 +01:00
1e2b4bcc7d switch back to previous prices until 01.01.2024 2023-12-23 08:33:34 +01:00
aa32676431 set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650 2023-12-21 15:24:51 +01:00
a9b9fd75bf Remove dc-files (to be used later) 2023-12-20 13:55:56 +01:00
60a375a773 Change for szeged: do not install atbupdatetool and do not upgrade the machine 2023-12-20 12:50:58 +01:00
b4c50748ba Reset to previous prices keeping current holidays 2023-12-20 12:50:39 +01:00
c3c07329b6 Updated to use new prices. 2023-12-19 16:49:12 +01:00
d14dc38340 Replace year period id from 8 to 2 as the special days refer to it 2023-12-19 14:57:18 +01:00
ecabc589d8 delete all json files 2023-12-19 13:54:09 +01:00
6e756202d7 use opkg_commands file as used in schoenau (00332) 2023-12-19 11:56:39 +01:00
d478ce44ab switch back to previous prices, but keeping current holidays 2023-12-19 11:17:30 +01:00
1746b94678 tariff01:
new price: 165
    new daily price: 990
tariff02:
    new price: 260
    new daily price: 1560
tariff03:
    new price: 360
    new daily price: 2160
tariff04:
    new price: 650

Set new holidays starting from Dec. 2023.
2023-12-18 14:42:54 +01:00
1f54b1ec90 Fixed wrong comma after exchange rate 2023-10-11 14:13:59 +02:00
e1c39f1df6 set exchange rate to 360 2023-10-10 16:29:38 +02:00
2d65b9ba14
Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2 2023-09-18 17:18:26 +02:00
38386d7aed
Update test 20230811113644-00281 2023-09-18 17:16:56 +02:00
e9dc8f6e10 Remove ini-file (used for testing) and obsolete tariff.current file. 2023-08-11 12:44:07 +02:00
2cc7ec9dc7 Install ptu5-gitinstaller, atbupdatetool and atbqt. 2023-08-11 12:43:10 +02:00
25e9e014de set useLanguage 240 -> 248 2023-08-10 16:37:45 +02:00
0657b3ea27 install apism via opkg 2023-08-09 16:21:48 +02:00
5629444870 Appended a dateline. Set useLanguage 248 -> 240 2023-08-09 16:20:08 +02:00
9461dfafb0 add another line for testing 2023-08-09 10:20:38 +02:00
5a25611a39 240 -> 248 2023-08-09 10:16:51 +02:00
73f5bfd568 add another line for testing 2023-08-09 10:13:42 +02:00
4331c32dc5 Add file for testing. 248 -> 240 for useLanguage 2023-08-09 09:58:28 +02:00
23e5e1339e appended datelien for testing 2023-08-09 09:54:41 +02:00
5d9882c569 set daily cardprice to 2400 2023-08-03 15:44:06 +02:00
6ed893f3fc add json files for zones 5 and 6 2023-08-03 15:30:58 +02:00
69e3fbe55a use same tariff-file as branch for zone4 2023-07-26 14:48:20 +02:00
d72bafb8d7 Set max_time to 240 2023-07-25 10:15:11 +02:00
0b7614c2d9 Do not download anything. Only execute opkg-commands 2023-07-06 15:44:17 +02:00
de0b5a3e70 Update json-printer-files (provided by Dennis) 2023-07-06 15:10:50 +02:00
e9fa1e6dd5 remove file in wrong localtion 2023-07-06 15:10:14 +02:00
ee0a06ba0b remove handling og checkout_history file 2023-07-04 14:00:48 +02:00
96a1db1fba populate opkg_commands-file with valid opkg instructions 2023-07-04 12:17:23 +02:00
1071e8e762 Merge branch 'zg1/zone2' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone2 2023-07-04 12:14:20 +02:00
794c26ee97 use opgk_commands-file in repository rather than in global file-system 2023-07-04 12:14:13 +02:00
8211505d34
Revert last ATBQT.ini change 2023-06-30 15:42:20 +02:00
1c08df6da1
Fix: filename 2023-06-30 15:33:45 +02:00
031c9653f1
Update Test for ATBQT.ini 2023-06-30 15:28:33 +02:00
9643f36c1d
Add dc2c.4.33.bin for test 2023-06-30 15:13:31 +02:00
d6ef0ac4a6
Prevent updating atbqt 2023-06-30 15:12:13 +02:00
bf5bce2be8
DC Update Test 2023-06-30 15:10:13 +02:00
ef12748e72
Szeged Test 2023-06-30 14:37:52 +02:00
6a47b52c24
Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2 2023-06-30 14:36:47 +02:00
cebda53e85 return to normal workflow after testing 2023-06-30 10:51:32 +02:00
8b5f310464 Provide opkg commands for zone2 2023-06-29 14:30:39 +02:00
db54f86be9 dc2c.bin -> dc2c.4.35.bin 2023-06-27 16:21:37 +02:00
cf5b677bfe Adding device-controller firmware version 4.35 2023-06-27 16:21:28 +02:00
d25e6232e0 install same post-merge-hook as in branch zg1/zone1 2023-06-27 14:32:34 +02:00
8949d1850c install same post-checkout-hook as in branch zg1/zone1 2023-06-27 14:31:17 +02:00
22d1a9f8a1 Set daily_card_price to 2400 for zone4 2023-06-27 14:17:37 +02:00
ee70081ab3
Remove old deviceController firmware 2023-06-26 14:37:00 +02:00
a5f76131ff
Add correct tariff config files 2023-06-25 15:04:58 +02:00
7ed84450e2
Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2 2023-06-25 14:57:42 +02:00
8b58d78cd8
Remove invalid config files 2023-06-25 14:57:13 +02:00
fe7c8bf282
Merge branch 'zg1/zone2' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone2 2023-06-19 10:37:27 +02:00
8fdb94ac90
Merge branch 'zg1/zone1' into zg1/zone2 2023-06-19 10:32:20 +02:00
ad987e5be6
Update tariff configurations 2023-06-19 10:24:34 +02:00
1e629e5fea check for existence of opkg_commands-file (2) 2023-06-05 15:58:15 +02:00
7939f576a0 check for existence of opkg_commands-file 2023-06-05 15:52:30 +02:00
bbd39fbccb adding post-checkout hook ad for zone1 2023-06-05 15:46:25 +02:00
936e3f4dac
Remove old files 2023-06-01 17:12:22 +02:00
9566a0793c
Update tariff files for current Szeged testing 2023-06-01 16:10:14 +02:00
1ce636908f
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-06-01 16:04:42 +02:00
338e36c5e6 handle dc2c.bin as link to the real device controller file 2023-05-31 09:46:47 +02:00
279bcc009f Adding link to dc2c.4.22.bin 2023-05-31 09:37:20 +02:00
ac77c0d08a removed obsolete hex-file 2023-05-31 09:35:39 +02:00
db1b9ac700 removed downloading of tariff-files. removed downloading of dc.hex files (only dc.bin-files are downloaded) 2023-05-31 09:12:43 +02:00
8d8cc811c6 Add device controller version 4.22 2023-05-31 08:58:21 +02:00
bbdde459b6 Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1 2023-05-31 08:55:31 +02:00
94b9cec72c Adding device controller version 4.22 2023-05-31 08:55:22 +02:00
4a1bc704e5
Update to latest ATBAPP.ini 2023-05-30 10:33:10 +02:00
8766a0bd86 testing 2023-05-30 10:10:24 +02:00
fe56c2c73e Add date to each line in checkout_history-file 2023-05-26 09:57:22 +02:00
0e8aa33feb testing 2023-05-26 08:16:24 +02:00
6e7501e54c testing 2023-05-26 08:03:28 +02:00
c0deb2d4a0 testing 2023-05-25 17:39:10 +02:00
24f5ae1696 testing 2023-05-25 17:37:19 +02:00
609cf8bc3c testing 2023-05-25 17:32:39 +02:00
79e823df52 testing 2023-05-25 17:31:07 +02:00
74edb5e88a testing 2023-05-25 17:28:09 +02:00
f342d81db2 testing 2023-05-25 17:25:12 +02:00
2e09b19564 testing 2023-05-25 17:23:11 +02:00
7a0950e004 testing 2023-05-25 17:21:15 +02:00
faf1b68ce9 testing 2023-05-25 17:16:10 +02:00
47c6a9fdb0 testing 2023-05-25 17:06:12 +02:00
14b26aa8fa test for syntax errors 2023-05-25 17:04:23 +02:00
72ecd841df test for syntax errors 2023-05-25 17:03:11 +02:00
97abd39097 test for syntax errors 2023-05-25 16:59:12 +02:00
050deba0bd test for syntax errors 2023-05-25 16:54:25 +02:00
a7df379b6c test for syntax errors 2023-05-25 16:47:29 +02:00
70e3028978 test for syntax errors 2023-05-25 16:40:09 +02:00
103f66f044 test for syntax errors 2023-05-25 16:36:54 +02:00
8729683fca test for syntax errors 2023-05-25 16:32:08 +02:00
12d1458bcb Add handling for opkg-commands 2023-05-25 16:20:18 +02:00
7db36e8de4 Testing. Add known files to be downloaded/executed. 2023-05-25 15:31:02 +02:00
b6137a41f2 Testing. remove spaces from branch-name 2023-05-25 15:13:07 +02:00
5939060c69 Testing 2023-05-25 15:08:21 +02:00
e0d813b34a Testing 2023-05-25 15:04:51 +02:00
affc74e711 Testing 2023-05-25 15:01:15 +02:00
13942e34f3 Testing 2023-05-25 14:54:59 +02:00
d3847df593 Test: add an entry into update_log.csv 2023-05-25 14:51:42 +02:00
a9cb3b53f4 Use basename to get only the name of the repo 2023-05-25 14:41:04 +02:00
346247b88a extract branch info 2023-05-25 14:33:48 +02:00
5c89c49f08 Add debug message for branch name which is checked out 2023-05-25 14:10:43 +02:00
6b6313d429 testing 2023-05-24 16:33:31 +02:00
4d698ffb79 Adding new print-templates because of printing-problems on DC-side 2023-05-24 16:20:16 +02:00
e83e1589fb Adding dc-version 4.21 2023-05-24 16:19:39 +02:00
0aaeaa7350 Updated printer-templates (24/05/2023) because of printing problems on DC side 2023-05-24 16:17:22 +02:00
7d0cebe0ff Adding dc version 4.21 2023-05-24 12:32:37 +02:00
bf5709d053 Testing 2023-05-24 12:18:00 +02:00
b22b3b31ee Only test entry. 2023-05-24 12:15:02 +02:00
b4998ffe48 Fixed typo 2023-05-24 12:10:11 +02:00
c94b276be0 Added write_log_file() 2023-05-24 12:08:59 +02:00
505911ef5b Replaced __date by __datum 2023-05-24 12:06:01 +02:00
794229660c Minor change to check commit... 2023-05-24 12:01:28 +02:00
13cfbb4932 Use /opt/app/tools/atbupdate/update_log.csv as main-file for update-history. 2023-05-24 11:35:50 +02:00
4bf9efcf3a Updating print templates as of 11 May, 2023. 2023-05-18 12:15:37 +02:00
981dade375 Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1 2023-05-18 12:14:35 +02:00
3e1cf3c4e3 Updating printing templates as of May 11, 2023. 2023-05-18 12:13:25 +02:00
be84634d62
Update ATBQT.ini SysetemControl.ini for Szeged Test 2023-05-05 10:59:31 +02:00
f33d45d082
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-05-05 10:51:28 +02:00
a6862f566a
Update ATBQT.ini SysetemControl.ini for Szeged Test 2023-05-05 10:49:51 +02:00
64937d6fb4 Add tariff-file for zone 4 2023-05-04 10:55:28 +02:00
dc68633378 Add tariff-file for zone 4 2023-05-04 10:54:08 +02:00
61c9253239 test 2023-04-25 13:07:28 +02:00
6acc53275d Update as for branch zg1/zone1 2023-04-25 11:53:41 +02:00
378de9200c use a better name for file: git_changed_files_for_last_pull 2023-04-25 11:50:40 +02:00
4a3ac32724 test 2023-04-25 11:42:30 +02:00
0fbea3a260 use filename for getting commit, not the blob of the file 2023-04-25 11:41:49 +02:00
123291a2c2 test 2023-04-25 11:24:07 +02:00
cca3484256 debugging ... 2023-04-25 11:23:09 +02:00
5beba99abb test 2023-04-25 11:19:29 +02:00
13b3af1f92 debugging ... 2023-04-25 11:18:54 +02:00
6de220b8ba test 2023-04-25 11:14:34 +02:00
009b5c0170 removed changed_file_names 2023-04-25 11:12:26 +02:00
fb2d0cf506 test 2023-04-25 11:09:38 +02:00
22b1efd66e Try fo fix evaluating last-commit... 2023-04-25 11:09:17 +02:00
abf75d636b assum blob not empty 2023-04-25 11:01:22 +02:00
b6a999e014 test 2023-04-25 10:59:55 +02:00
dcc7397232 test 2023-04-25 10:56:43 +02:00
f248f3f85f try to use blob and commit for changed file 2023-04-25 10:50:10 +02:00
93ba8215b9 test 2023-04-25 10:39:48 +02:00
cd85b2c6e9 test 2023-04-25 10:34:17 +02:00
0f5c66fccc
Update ATBAPP config 2023-04-04 08:59:21 +02:00
58e833b3a6
Update gitignore 2023-04-04 08:58:45 +02:00
48a299002c
gitignore: do not track application default ini files 2023-04-04 08:04:54 +02:00
91130d96f0
SystemControl: Fix: config: AT_TASKS configuration 2023-04-03 14:50:59 +02:00
b115f3dfb8
SystemControl: config: add AT_TASKS configuration 2023-04-03 13:52:13 +02:00
76c4663d8f
TEST: change SystemControl.ini 2023-04-03 11:18:30 +02:00
7462ce9e12
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-04-03 11:17:50 +02:00
1480313fd0 add empty lines 2023-04-03 10:53:26 +02:00
a17bcb8b17
Updatetest 2023-04-03 10:26:22 +02:00
469ecbc482
Add initial SystemControl.ini 2023-04-03 09:54:08 +02:00
273e6a8422 datumseintrag 2023-04-03 08:51:28 +02:00
1bfbfbb670 Removed *.ini-Files. 2023-03-31 11:47:49 +02:00
87af143cbd Removed *.ini-Files. 2023-03-31 11:46:54 +02:00
4071d8ea14 Removed *ini-Files. 2023-03-31 11:42:27 +02:00
f383f8282e aset fsize only when file exists 2023-03-31 10:13:16 +02:00
2bcc19f9f6 rm test file 2023-03-31 10:09:10 +02:00
e46c1f272b Add .gitignore 2023-03-31 09:51:38 +02:00
094fc2ef9a removed 'local' keyword 2023-03-31 09:39:16 +02:00
ba690aea25 Add .gitignore file 2023-03-31 09:37:10 +02:00
5b57d0704c testing 2023-03-31 09:06:53 +02:00
cc75917193 Fixed typo 2023-03-31 09:01:13 +02:00
5f3a7608ba testing 2023-03-31 09:00:01 +02:00
b6b37ec0c0 testing 2023-03-31 08:57:17 +02:00
8a64c8bcdc testing 2023-03-31 08:55:27 +02:00
d0574c6574 testing 2023-03-31 08:50:06 +02:00
ef1b9e6add testing 2023-03-31 08:48:22 +02:00
ef5bb0e182 rm empty test binary 2023-03-31 07:58:31 +02:00
3c97eaf7d8 test 2023-03-30 13:13:12 +02:00
5293268086 Add empty test bin 2023-03-30 12:56:35 +02:00
73fbc3d5ad Add handling for binary dc-files 2023-03-30 12:48:33 +02:00
d96a34d875 Add handling for binary dc-files 2023-03-30 12:46:04 +02:00
4d48b9bcc3 Add binary device controller file (29/03/2023) 2023-03-30 12:37:29 +02:00
8c736577fe Update to version dc2c.4.11.hex 2023-03-30 09:31:23 +02:00
9b2d7c77f6 commit test 2023-03-28 16:05:28 +02:00
998c44fd5c Test for change of json 2023-03-28 15:28:13 +02:00
05fe40a2e6 test 2022-07-08 15:20:18 +02:00
040f15bc0e test 2022-07-08 15:16:19 +02:00
80e38a8482 test 2022-07-08 15:10:11 +02:00
731dfcf961 test 2022-07-08 15:07:34 +02:00
a668dfbe3f test 2022-07-08 15:06:42 +02:00
26d3c61c7d test 2022-07-08 15:02:42 +02:00
bbd6566772 test 2022-07-08 14:57:07 +02:00
ce9ecc509c Add tariff files for szeged 2023-04-24 12:43:46 +02:00
ad110349d8 Fixed JSON-typo 2023-04-17 12:41:33 +02:00
50c5549834 Fixed JSON-typo 2023-04-17 12:40:32 +02:00
59840c6db9 Update for Hungarian format 2023-04-13 16:38:41 +02:00
621a8ac361 Print the values of the passed parameters. 2023-04-12 15:59:57 +02:00
9ca0a00763 Adding get_blob, get_commit_for_blob, changed_file_names. 2023-04-12 15:28:39 +02:00
09633c3754 Add hook post-checkout 2023-04-12 14:49:55 +02:00
5c85a294d5 Adding git hook post-checkout. 2023-04-12 14:22:17 +02:00
4 changed files with 25 additions and 11 deletions

View File

@ -11,8 +11,10 @@ if [ -z $IFS ]; then
IFS=$'\n'
fi
GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
#TODO: use in UpdateController
get_blob () { # get the blob of the file(name) passed as $1
@ -27,6 +29,7 @@ get_commit_for_blob () {
grep -q $1 && echo -n {} && head -n 1")
}
write_log_file () {
local now=$(date +"%Y-%m-%dT%T")
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do

33
.gitignore vendored
View File

@ -1,16 +1,27 @@
# First, ignore everything
*
## Except
# Now, whitelist anything that's a directory
!*/
# And all the file types you're interested in
!.gitignore
!.githooks/post-merge
!.githooks/post-checkout
!**/.gitignore
!**/.githooks/post-merge
!/etc/*.ini
!/etc/atb/*.ini
!/etc/psa_config/*
!/etc/psa_update/*
!/etc/psa_tariff/*
!/etc/dc/dc2c.hex
!**/.githooks/post-checkout
!/opt/app/ATBAPP/*.ini
!/opt/app/sysconfig/*.ini
!/opt/app/ISMASMgr/*.ini
## Except
!etc/atb/*
!etc/psa_config/*
!etc/psa_update/*
!etc/psa_tariff/*
!etc/dc/*.hex
!etc/dc/*.bin
!*/etc/*.ini
!*/etc/atb/*
!*/etc/psa_config/*
!*/etc/psa_update/*
!*/etc/psa_tariff/*
!*/etc/dc/*.hex
!*/etc/dc/*.bin

0
etc/psa_config/DC2C_cash.json Executable file → Normal file
View File

Binary file not shown.