Compare commits

..

345 Commits

Author SHA1 Message Date
ce7b6e5f43 Remove Sat 08:00-12:00 from Zone 3 (Yellow) 2024-10-29 15:31:41 +01:00
8f41a7a5e5 Revert to original versions 2024-08-08 12:22:11 +02:00
7760bf1fbe set 8:00-18:00 for 03.08 2024-08-01 12:37:28 +02:00
1857a80885 Activate opkg_commands 2024-07-15 08:53:42 +02:00
f2ac2a6b5e opkg: none 2024-07-08 13:36:33 +02:00
3cb00ff9c7 Set ex.rate to 365. 2024-07-05 09:59:27 +02:00
829a27471b Set ex.rate to 365. 2024-07-05 09:29:23 +02:00
c49aec3a96 re-commit: change of ISMAS settings 2024-06-25 08:35:18 +02:00
bb73d8a5e5 Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1 2024-06-24 11:27:45 +02:00
f00d70e996 ZoneId in tariff-files 2024-06-24 11:25:02 +02:00
24899b5488
Tariff: add tariff-info aka "TARIFF_ID" 2024-06-07 08:08:04 +02:00
488a630ea2
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2024-06-07 08:01:36 +02:00
48cf2fc85d test 2024-05-03 09:35:23 +02:00
9642cc5809 Remove all files except DC2C_cash/print22/print25/print28.json 2024-04-30 14:33:12 +02:00
be74101f29 Repeat update procedure in Szeged for 145-148,171,172,159-161 2024-04-30 08:50:37 +02:00
60624ae29c Set exchange rate to 350. Add all other json-files from at-dat as provided by Thomas 2024-04-26 12:09:43 +02:00
98f9825259 Use empty file. 2024-04-18 16:09:10 +02:00
ad2915e1ae
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2024-04-18 14:10:01 +02:00
311fab1c5b readd empty lines (just to be sure that files have been changed) 2024-03-28 12:09:10 +01:00
a43c11462e added empty lines to restart download 2024-03-28 11:56:57 +01:00
8d6d458333 even remove opkg update 2024-03-26 10:05:57 +01:00
f2dbf1b426 only install prepare-update script 2024-03-26 09:51:18 +01:00
6b14fca1e1 Removed all holidays except thos for 2024 2024-03-26 09:39:27 +01:00
addb83bfd4 tariff01 -> exact prize: 42
tarif 04/06 -> exact price: 163
2024-02-19 17:28:54 +01:00
ba05e39541 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:25:50 +01:00
e338f6984a add libmobilisis-calc2 and activate upgrade step 2024-01-09 11:43:25 +01:00
68ab6c5ace Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600 2024-01-08 15:42:02 +01:00
605c12c220 Set zone 'green mars' as 'green', 'yellow mars' as 'yello' 2024-01-08 10:57:36 +01:00
8367af923a Update exchange rate to 352. 2023-12-31 08:16:20 +01:00
7c313acda3 turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days. 2023-12-31 08:07:42 +01:00
93db60bc2f switch back to previous prices until 01.01.2024 2023-12-23 08:33:04 +01:00
a717fccd62 set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650 2023-12-21 15:21:36 +01:00
b5151930f8 Add trailing lines for testing (800 lines by now) 2023-12-21 14:13:06 +01:00
98195ab2e2 remove until 01.01.2024 2023-12-21 14:11:44 +01:00
acaa419b81 set exchange rate to 352 2023-12-21 14:06:58 +01:00
7b21017b2d remove trailing empty lines for testing 2023-12-21 13:24:32 +01:00
07e8de5d3b add two empty trailing lines fro testing 2023-12-20 16:11:40 +01:00
3370171547 add two empty trailing lines fro testing 2023-12-20 14:33:46 +01:00
f690bccb3e remove tariling empty line for testing 2023-12-20 14:01:13 +01:00
faf4f043d2 Remove dc-files (to be used later) 2023-12-20 13:55:27 +01:00
e68c3379a5 Change for szeged: do not install atbupdatetool and do not upgrade the machine 2023-12-20 12:50:00 +01:00
cdbb82df3a Reset to previous prices keeping current holidays 2023-12-20 12:48:29 +01:00
a8d87e1c76 add empty line for testing 2023-12-19 17:15:10 +01:00
1348234792 Updated to use new prices. 2023-12-19 16:48:45 +01:00
e6a39ae7d0 Replace year period id from 8 to 2 as the special days refer to it 2023-12-19 14:56:33 +01:00
e52cd564c5 delete all json files 2023-12-19 13:53:36 +01:00
ed3032ab8b Remove some comment lines. 2023-12-19 11:53:51 +01:00
145955ad28 switch back to previous prices, but keeping current holidays 2023-12-19 11:17:01 +01:00
3c89ccd387 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:41:38 +01:00
eda0b41c56 Set new price: 260 (prev: 230).
Set new daily price: 1560 (prev: 1320).
Set new holidays from Dec. 2023 on.
2023-12-18 14:37:06 +01:00
d013bc6d80 Set new price: 165 (prev: 150)
Set new holidays starting from Dec. 2023.
2023-12-18 14:36:28 +01:00
589fc3dbd5 reset exchange rate set to 360 after testing 2023-11-07 10:58:58 +01:00
7bfcb482f2 re-test json-download with exchange rate set to 300 2023-11-07 10:50:43 +01:00
5333cc0915 set version for testing 2023-11-06 15:57:07 +01:00
feedf2dc7a set version for testing 2023-11-06 15:50:14 +01:00
f4556a8428 reset exchange rate to 360 2023-11-06 15:44:31 +01:00
614152e11c set version for testing 2023-11-06 15:31:18 +01:00
91821ef594 set version for testing 2023-11-06 14:57:31 +01:00
5a264d1104 set version for testing 2023-11-06 14:50:26 +01:00
a761aa4168 set exchange rate to 300 for testing 2023-11-06 14:41:42 +01:00
90ff3f43c3 set exchange rate to 360 again 2023-11-02 10:48:06 +01:00
74c34bcc10 Setting exchange rate to 300 for testing 2023-10-31 16:11:58 +01:00
c9fb420f5d activate upgrade commands for testing timeouts 2023-10-30 09:17:59 +01:00
69312ec586 add test (line) to trigger update 2023-10-17 16:15:46 +02:00
b915786387 update test especially for szeged 2023-10-16 09:50:05 +02:00
2b10c350bf Install atbupdatetool without removing/installing apism.
Do not upgrade in order to skip a possible timeout.
2023-10-13 12:44:58 +02:00
37779307a4 Install atbupdatetool after prepare-update packet. 2023-10-12 14:59:00 +02:00
b32f57dfa3 Fixed wrong comma after exchange rate 2023-10-11 14:12:18 +02:00
dfc3691510 use exchange-rates of 720,360 and 180 2023-10-10 15:49:25 +02:00
6883d994cb use exchange-rate of 360, instead of just 360 without comma 2023-10-10 15:39:51 +02:00
696392f23d set exchange rate to 360 2023-10-10 14:45:29 +02:00
02beaca057
Update opkg-commands for new update-test 2023-10-09 08:48:21 +02:00
a7fe7f1ba1
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-10-09 07:41:38 +02:00
97a5eb9b78 test: set version to 0.0.8 2023-10-06 12:37:39 +02:00
bf98e5c35f test: set version to 0.0.7 2023-10-06 12:23:39 +02:00
3a3a7a8084 Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1 2023-10-06 12:02:06 +02:00
0c4ac9f579 test: set version to 0.0.6 2023-10-06 11:59:45 +02:00
c1a3eec298
OPKG: remove / reinstall atb-accountingtool 2023-10-06 11:26:50 +02:00
5c040eddf0
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-10-06 11:24:14 +02:00
ce1583bfd4
OPKG: install package prepare-update 2023-10-05 17:26:52 +02:00
e8bac3140a
Update Test 2023-10-05 10:14:47 +02:00
58dd8e1b07
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-10-05 08:14:46 +02:00
8f30da3011
Updatetest 2 2023-09-27 14:15:46 +02:00
9c06b2e26b
Update test 2023-09-27 13:52:07 +02:00
8eb6eb2db8
Upate test: opkg with cachedir 2023-09-27 09:50:36 +02:00
99a2d0c8ae
Update test for image 20230925 2023-09-26 16:32:57 +02:00
d08e7d61dd
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-09-26 16:31:19 +02:00
d1067dbe1a
Fix: opkg-commands for update test 2023-09-18 17:20:15 +02:00
e988ea0c20
Update test 20230811113644-00281 2023-09-18 17:13:45 +02:00
4425d4aaa3
Update zg1/zone1 to image 20230811113644-00281 2023-09-18 08:48:34 +02:00
d284719d6d
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-09-18 08:46:48 +02:00
b04fc14d09 Install ptu5-gitinstaller, atbupdatetool and qtbqt. 2023-08-11 12:45:51 +02:00
ddf6902c73 Remove ini-file used for testing 2023-08-11 12:45:21 +02:00
7db30d94f2 append date line 2023-08-09 16:30:24 +02:00
3c4760abbf 240 -> 248 2023-08-09 16:29:48 +02:00
c47a02a06e install apism via opkg 2023-08-09 16:28:27 +02:00
c7c234b502 set 240 -> 248 and appended date string 2023-08-08 16:43:07 +02:00
96953b2a62 last checking was an error -> return to previous state 2023-08-04 09:02:00 +02:00
6b925ef6c8 append line at the end 2023-08-04 08:59:00 +02:00
43530a1bf3 set daily cardprice to 2400 2023-08-03 15:43:46 +02:00
ff10f57715 add json files for zones 5 and 6 2023-08-03 15:22:14 +02:00
0d5bc29d19 remove empty test tariffs 2023-08-03 15:04:03 +02:00
c87e12b788 add emtpy tariff-files 2023-08-03 14:52:26 +02:00
44e48dc141 Renamed to ChangeLog 2023-08-03 12:55:27 +02:00
dadcdc9c26 append date line for testing 2023-08-03 10:52:51 +02:00
a121bed893 append date line for testing 2023-08-03 10:49:27 +02:00
ac92369da5 use 4 langues for testing 2023-08-03 09:58:26 +02:00
61908d34f3 Added test last line 2023-08-03 08:57:42 +02:00
bc04b90c0c Added test last line 2023-08-03 08:54:48 +02:00
a4883dcca4 set use Language=248 for testing 2023-08-03 08:30:32 +02:00
fd5da4c466 set use Language=240 for testing 2023-08-03 08:22:54 +02:00
b1f010f4a7 supply production version 2023-08-03 08:10:56 +02:00
294c25a785 set use Language=248 for testing 2023-08-03 08:04:09 +02:00
e168ccbf61 append date line 2023-08-02 17:35:45 +02:00
62aa6415d8 XXXX 2023-08-02 17:20:18 +02:00
fd1196cad6 use same tariff-file as branch for zone4 2023-07-26 14:48:07 +02:00
32a615313c Set max_time to 240 2023-07-25 10:14:55 +02:00
781cc71b37 re-test update 2023-07-21 08:55:46 +02:00
0f2ecf85e1 Set 'use language=240' instead of 248 2023-07-20 16:59:15 +02:00
234d1dec25 test via service-menu 2023-07-20 10:21:28 +02:00
de5cddbfb1 test 1 fuer YOCTO-ATBUpdateTool 2023-07-20 10:04:40 +02:00
099de28509 Added 'opkg info atbupdatetool' 2023-07-20 08:35:40 +02:00
cd262e5ddb remove absolete file 2023-07-19 17:30:54 +02:00
2b08f11131 remove test file to be on the save side 2023-07-19 17:30:15 +02:00
00a73df4cf ATBUpdateTest 2023-07-19 17:16:18 +02:00
139244f5b1 test 14 2023-07-18 16:56:21 +02:00
5c38ced7dd test 13 2023-07-18 16:44:15 +02:00
b7c6d156ce test 12 2023-07-18 16:40:33 +02:00
d81f29b8c4 test 11 2023-07-18 16:34:20 +02:00
5fa099933a test 10 2023-07-18 16:28:10 +02:00
23df87ad28 test 9 2023-07-18 16:24:57 +02:00
8314e27e66 test 8 2023-07-18 16:17:20 +02:00
1a3ea80760 test 7 2023-07-18 15:54:28 +02:00
ced6ab3185 test 6 2023-07-18 15:50:58 +02:00
a5709d2465 test 5 2023-07-18 15:45:57 +02:00
e1536716e5 test 4 2023-07-18 15:40:09 +02:00
0782c029b2 test 3 2023-07-18 15:37:05 +02:00
17b5e9d806 set version to 0.0.5 2023-07-18 15:20:23 +02:00
b6eebb5107 set version to 0.0.4 2023-07-18 14:58:09 +02:00
d66f1b640e set version to 0.0.3 2023-07-18 14:53:51 +02:00
fdf2ae8a69 set version to 0.0.2 2023-07-18 14:43:27 +02:00
0185eeddbe set version to 0.0.1 2023-07-18 14:42:57 +02:00
b8b843eb7c set version to 0.0.1 2023-07-18 14:40:41 +02:00
d466c0c2dc test 2 2023-07-18 14:36:28 +02:00
a4e4cb63d5 test 1 2023-07-18 14:15:31 +02:00
fd4117b3be config settings for git. Copied by ATBUpdateTool into .git/config 2023-07-17 12:22:26 +02:00
952ef0ed11 test 1 for upload-tool 2023-07-17 12:11:54 +02:00
2ce7cf2caa Do not download anything. Only execute opkg-commands 2023-07-06 15:43:33 +02:00
793e8efebb remove renamed file 2023-07-06 15:08:34 +02:00
09e7c378c9 Update json-printer-files (provided by Dennis). 2023-07-06 15:07:39 +02:00
a66d4232c5 set link to point to dc2c.04.36.bin 2023-07-04 14:25:45 +02:00
62134fdf8b renamed to reflect naming inside the bin-file 2023-07-04 14:24:59 +02:00
ee7e2ca8bf reset link to dc 2023-07-04 14:23:58 +02:00
e66ca83b34 remove handling og checkout_history file 2023-07-04 13:54:23 +02:00
1698e0bebb reset link dc2c.bin to point to 4.36 2023-07-04 12:29:40 +02:00
6e9afe0d06 Add device controller version 4.36 2023-07-04 12:28:06 +02:00
dd0818943b Add commands for opkg 2023-07-04 12:06:59 +02:00
b87072bb0a removed debug-output 2023-07-04 12:05:40 +02:00
5c63c5d985 Add some debug output. Use repository path for opkg_commnds-file 2023-07-04 12:00:44 +02:00
46a8a8f0e3 Add some debug output. Use repository path for opkg_commnds-file 2023-07-04 11:06:29 +02:00
df1634e17c Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1 2023-07-04 11:02:05 +02:00
bb0f8a18bf Add some debug output. Use repository path for opkg_commnds-file 2023-07-04 11:01:54 +02:00
033f8ac838 prevent any opkg command 2023-07-02 16:29:09 +02:00
af66a5e11e
Prevent atbqt update 2023-06-30 15:14:29 +02:00
8a3507eab1
Update Test in Szeged 2023-06-30 14:28:16 +02:00
5433e72198
Update Test in Szeged 2023-06-30 13:37:53 +02:00
31a7ceebe9
Update Test in Szeged 2023-06-30 13:21:22 +02:00
ed2bd852c2
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-06-30 13:19:32 +02:00
ac2f0fcdfa return to normal workflow after testing 2023-06-30 10:50:50 +02:00
14d3cfd0c5 removed <opkg info vim> 2023-06-30 10:31:01 +02:00
6bb71dd857 post-merge-test-2: added <opkg info vim> 2023-06-30 10:18:36 +02:00
185e4d9e10 post-merge-test-1 2023-06-30 09:52:07 +02:00
7ae5791dd0
test-post-merge-step (11) 2023-06-29 15:59:12 +02:00
22cc6dc479
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-06-29 15:52:18 +02:00
a2b7d86ba2 test-post-merge-step (10) 2023-06-29 14:28:42 +02:00
be803b3298 test-post-merge-step (9) 2023-06-29 14:23:11 +02:00
280ad0b23a test-post-merge-step (8) 2023-06-29 14:19:38 +02:00
dfff2abe01 test post-merge-step of update-process (7) 2023-06-29 12:11:23 +02:00
76796c4d26 test post-merge-step of update-process (6) 2023-06-29 11:55:17 +02:00
8f291b6877 test post-merge-step of update-process (5) 2023-06-29 11:29:09 +02:00
ec2d604705 test post-merge-step of update-process (4) 2023-06-29 11:17:04 +02:00
fac68e2a2c test post-merge-step of update-process (3) 2023-06-29 11:14:19 +02:00
22f157c699 test post-merge-step of update-process (2) 2023-06-29 10:52:37 +02:00
fd99d95dd2 test post-merge-step of update-process: added opkg info atbqtw 2023-06-29 10:49:39 +02:00
626e9e239c test post-merge-step of update-process 2023-06-29 10:40:06 +02:00
515f541ffd 28.06.2023 - test post-merge-step 2023-06-28 15:11:24 +02:00
0a9a515fd6
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-06-27 17:21:19 +02:00
b349e9ac59 dc2c.bin -> dc2c.4.35.bin 2023-06-27 16:19:27 +02:00
a8aefba58c delete link before reset 2023-06-27 16:18:51 +02:00
ae05d76db0 Adding device-controller firmware version 4.35 2023-06-27 16:17:38 +02:00
ef3c2ae212 Set daily_card_price to 2400 for zone4 2023-06-27 14:19:03 +02:00
5c312820bb
opkg install ptu5-gitinstaller 2023-06-27 12:13:26 +02:00
d98794f6bf
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-06-27 11:59:54 +02:00
19b84dc37d
Force update opkg 2023-06-22 19:13:00 +02:00
0ddc9a3c5d
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-06-22 19:11:19 +02:00
fd6798cbc0 Add all DC2C_print*.json files for Szeged.
Add DC2C_conf/cash/device.json.
2023-06-22 12:11:26 +02:00
c9748ad177 made non-executable 2023-06-22 12:10:19 +02:00
34838567ae delete unused files 2023-06-22 12:09:31 +02:00
c934e6b341 deleted obsolete file 2023-06-22 12:07:29 +02:00
01c063e3e4 deleted file as in the wrong location 2023-06-22 12:06:59 +02:00
046d16651a Update json configuration files. 2023-06-22 12:01:35 +02:00
5c170821fc Add new DC2C config file for device configuration 2023-06-22 11:59:00 +02:00
bac8368079 create link dc2c.bin -> dc2c.4.33.bin 2023-06-21 08:55:41 +02:00
6ee9d22e6e delete link, reset as next step 2023-06-21 08:54:53 +02:00
8fbae9e16d Add device controller firmware dc2c.4.33.bin 2023-06-21 08:52:08 +02:00
7a790e442f Write $line to checkout_history-file only once 2023-06-20 16:06:33 +02:00
68d5205530 re-test post-merge-hook 2023-06-20 15:26:38 +02:00
d1cffff1ba test for post-merge-hook 2023-06-20 12:36:01 +02:00
7c77f1fe11 Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1 2023-06-19 17:10:36 +02:00
2b10e4df93 add new opkg commands: install atbqt, atb-plugin-cc-iself, atb-plugin-dc, libdevicecontroller 2023-06-19 17:10:28 +02:00
9528fa5ffc
Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1 2023-06-19 10:38:53 +02:00
ad987e5be6
Update tariff configurations 2023-06-19 10:24:34 +02:00
1780e75ac9 testing 16:03 2023-06-05 16:03:41 +02:00
d71556abba testing 16:00 2023-06-05 16:00:49 +02:00
e6342a1e8f check for existence of opkg_commands-file (2) 2023-06-05 15:58:01 +02:00
72e9e645a1 check for existence of opkg_commands-file 2023-06-05 15:51:30 +02:00
530327e20d testing 15:39 2023-06-05 15:39:28 +02:00
0a3bfde486 testing 15:26 2023-06-05 15:26:16 +02:00
94bde10396 testing 15:22 2023-06-05 15:23:07 +02:00
b66848bb75 use the link dc2c.bin and do not add timestamp into file 2023-06-05 15:20:18 +02:00
42317e7660 testing 15:11 2023-06-05 15:11:49 +02:00
605461897e testing new update_psa 2023-06-05 13:59: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
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
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
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
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
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
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
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
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
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 50 additions and 11 deletions

28
.gitconfig Normal file
View File

@ -0,0 +1,28 @@
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
symlinks = true
[remote "origin"]
url = https://git.mimbach49.de/GerhardHoffmann/customer_999.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
[branch "zg1/zone1"]
remote = origin
merge = refs/heads/zg1/zone1
[branch "zg1/zone2"]
remote = origin
merge = refs/heads/zg1/zone2
[branch "zg1/zone3"]
remote = origin
merge = refs/heads/zg1/zone3
[branch "zg1/zone4"]
remote = origin
merge = refs/heads/zg1/zone4
[pull]
rebase = false
[push]
autoSetupRemote = true

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