Compare commits
1438 Commits
Author | SHA1 | Date | |
---|---|---|---|
136968bd71 | |||
6badbb033c | |||
fda8568f97 | |||
423c6bf77f | |||
21847afbe5 | |||
df87e70fd8 | |||
20b3d8915e | |||
a848baadf8 | |||
e7e793cc3a | |||
49c00bb0ca | |||
5e3a25e07d | |||
b3bded3efd | |||
2ed9a8b75b | |||
008d9973d2 | |||
084a1d2ae5 | |||
505f1f4f6f | |||
f547cd65e0 | |||
12956eb962 | |||
de5eb66b6d | |||
e2613c8fc1 | |||
86f0a41d63 | |||
33ef82aa4c | |||
15a920c2c9 | |||
9a538298a2 | |||
6947c28fa1 | |||
99195d72d6 | |||
af5cfbe1ab | |||
fa2007645c | |||
c93b3e90e7 | |||
6378247871 | |||
aee3463e88 | |||
bb077bd31f | |||
d1eca31fee | |||
3fb99a8a32 | |||
6168c4f5d2 | |||
2b73f8e5f3 | |||
d92176ab2b | |||
21e9e68397 | |||
a24ee0d122 | |||
2fe9ee6e78 | |||
13efafe221 | |||
3aa884c772 | |||
92a5e23517 | |||
45abce5db5 | |||
50897f602e | |||
95226a41fa | |||
74a2776b11 | |||
e60372d4e5 | |||
cc5bbd0e8b | |||
ce6adc198c | |||
5dc389a358 | |||
5cb3afb2ac | |||
b1f7ad2b8c | |||
aa0087b70b | |||
9ae6d25444 | |||
0785fc84e2 | |||
bf00d75745 | |||
2bc5c25f8e | |||
cd97d76ad8 | |||
c26c3d7e3d | |||
5bf4e42399 | |||
9c8531c157 | |||
822fffe7ec | |||
b83ee46243 | |||
564caff872 | |||
c717b8ce32 | |||
a251f9ce9d | |||
fd1c222ce4 | |||
fd5273ce78 | |||
b5298508c6 | |||
9b842d8140 | |||
e9a8aba1b1 | |||
64fff708ab | |||
649a6f56a8 | |||
f88feb852b | |||
9356e648c1 | |||
a54cb6744d | |||
3b7b420635 | |||
2f70af5fd4 | |||
6ff97cb8c9 | |||
14153fcaeb | |||
e68aee1814 | |||
e8584c271c | |||
7b342c7442 | |||
442cd82c57 | |||
aa00fc7c7f | |||
935fd5100a | |||
bc9f697536 | |||
62167bf8d8 | |||
5273e14c11 | |||
78e6e6ec0f | |||
1567f52a23 | |||
242cfd7696 | |||
6d12eab377 | |||
a56b203123 | |||
3d0356e3dd | |||
7cbd32d2c6 | |||
493fef794c | |||
d54bf921b5 | |||
4ab382aff8 | |||
b95ed959a4 | |||
69af21e814 | |||
6a8cf9a01e | |||
8115169367 | |||
b6b18cc4d6 | |||
4ed250a0ec | |||
82f38db84d | |||
f418301fd6 | |||
8bb2f7b74b | |||
0521d85710 | |||
21255b45b9 | |||
90c39d78b0 | |||
93ada3ffb1 | |||
0377adcda2 | |||
ba4c4e53bd | |||
e7aaa87377 | |||
8de04ea25a | |||
4a3f6377e7 | |||
2e56a98bd1 | |||
f60ff573b3 | |||
8895676e9f | |||
31d5956b36 | |||
c87b5512b1 | |||
afc1376f70 | |||
68faa73d8d | |||
0d5b67874f | |||
571deb5ab5 | |||
abb718416e | |||
e1e656ef6e | |||
85bf6af597 | |||
6b655ce4b3 | |||
d65891c359 | |||
6365c844b0 | |||
cf394dc772 | |||
6582c7625c | |||
8d1675ae2d | |||
d2cac4502f | |||
6739613058 | |||
11da88c0c6 | |||
915f4e0418 | |||
a8f54656e7 | |||
0fa25668ff | |||
db4253297b | |||
71496ad4a5 | |||
00400ae837 | |||
62899f60d0 | |||
eaef4ff40f | |||
4d62b4b52a | |||
f669d22a8f | |||
338effd89a | |||
a07335f316 | |||
dd6f1dfd2d | |||
b607b65639 | |||
321f401833 | |||
992f93e3b0 | |||
94e2d69f63 | |||
c686a416de | |||
15ae71f97e | |||
ae31783e3d | |||
f769193824 | |||
c3c367d84f | |||
76b9f62642 | |||
4fff4d2d99 | |||
c7963e9552 | |||
a6fbbc992a | |||
d45893739d | |||
d7e27b0266 | |||
5016f22a3d | |||
96f8e05c30 | |||
176ea64d80 | |||
064fe2a365 | |||
18588cc334 | |||
3679c717d8 | |||
e1a37d81c5 | |||
a6b2f78cff | |||
6418261911 | |||
d9b4535034 | |||
e0ad251932 | |||
6b469787fb | |||
871a812d06 | |||
6d95348e83 | |||
362ce5f04a | |||
1260b5693d | |||
52090a6f43 | |||
877cb9463c | |||
1ae4d3df21 | |||
9b3145c097 | |||
8a946e646d | |||
6604981cdf | |||
6ee2668acb | |||
3ce95895cc | |||
e836e27fa3 | |||
fcb110bcbc | |||
4807ad2368 | |||
c04442ee86 | |||
859735cf92 | |||
256ec1dfaa | |||
50c67a50ce | |||
122c359730 | |||
1168803406 | |||
241fbddb0c | |||
464497019f | |||
0d4f28e1d5 | |||
992149ca4a | |||
6a84b74ee8 | |||
1130d69dd1 | |||
0b1c8cc2b3 | |||
e619683f84 | |||
0f53e264f3 | |||
dd9031ec9c | |||
56a69d21c3 | |||
6a07b79458 | |||
ef2aee1bf6 | |||
2dc298373b | |||
306555fccd | |||
d4d700537a | |||
fc085f7eda | |||
549c8d326d | |||
4e36b0b636 | |||
1b3cbafb3a | |||
351f642bba | |||
515900ba26 | |||
df70b99ec1 | |||
a24085c375 | |||
0da34a0985 | |||
770942ce92 | |||
ce6c110e5f | |||
15485002da | |||
75b6aa3ea6 | |||
ee2595b957 | |||
f7b0b3da19 | |||
c469115b46 | |||
52571d8153 | |||
960a1c0beb | |||
87dd6e8514 | |||
b4bd6c1ee1 | |||
bd8c657f7b | |||
c3e29d38b8 | |||
1047d87ae2 | |||
1c5b4d21aa | |||
38731701ee | |||
3c5eb56089 | |||
1c8a6e5c25 | |||
dfcf9d6368 | |||
d999684fd7 | |||
e41ff924a2 | |||
c59d4d54fa | |||
705c53ea69 | |||
c405e34576 | |||
4366cbdf7b | |||
34806baa33 | |||
4a60f78b13 | |||
3ba75b0489 | |||
10a3268a3d | |||
5ed05fb761 | |||
28a9aca81d | |||
4a1ab7fac0 | |||
d7ae3a26eb | |||
a63d0ef6ca | |||
8ca0040a70 | |||
d4f258267a | |||
c4aade6ae9 | |||
e9c1af0768 | |||
17f5b95d5e | |||
f66bad0f36 | |||
3009928740 | |||
a800ec0996 | |||
faacac8dfe | |||
e72075651d | |||
f692abcfd2 | |||
9b4b6884fd | |||
e1b1474dfc | |||
ecd3a84c95 | |||
4fef04e1f1 | |||
60c4d427ce | |||
34d879ef36 | |||
1aaf45cfeb | |||
c93f450153 | |||
b20c773d26 | |||
6ca5ecdc8b | |||
7c28799b01 | |||
2df8c4a320 | |||
276b0f10bf | |||
c26b7107b4 | |||
aaf916fd3f | |||
83a1038df0 | |||
6d303dd640 | |||
3084211919 | |||
02f4645198 | |||
08bf8575fc | |||
0f3829d657 | |||
c5ea6343f4 | |||
584cd4af3e | |||
903d07fa34 | |||
e0abff831c | |||
e0a79b7fe5 | |||
27c02559ed | |||
5bcb2682a5 | |||
0f4f209c44 | |||
ae673503dd | |||
e2963f90d5 | |||
4e6687492a | |||
e5f0d61f2d | |||
e894bf2bc5 | |||
d15d7f2448 | |||
7fc5a88265 | |||
c540e716c5 | |||
74edc9a109 | |||
2735c0a6dc | |||
6f169a043d | |||
353e991c90 | |||
6f8eb3b4e5 | |||
f70111dde7 | |||
1830d7e3f4 | |||
f5869ba226 | |||
2c69a520a8 | |||
f088abd9e1 | |||
68327ba309 | |||
cbce9b6716 | |||
0615f2a18c | |||
90a9d4e337 | |||
905bba6591 | |||
9f5d1bdcc7 | |||
ee689644e2 | |||
3701f3fbb3 | |||
3300075ef7 | |||
683f51c4e4 | |||
92a53a812f | |||
c85cf037c0 | |||
5e9426c9e8 | |||
3b6bca0888 | |||
b01199ccd9 | |||
8abdb2e276 | |||
a4f27e2fe1 | |||
0494a578fb | |||
75aba6292f | |||
46c7ba78ad | |||
861e9d09e6 | |||
440632d190 | |||
92e7a3cf9d | |||
9080b086fc | |||
ce59d52444 | |||
3b1f793ae7 | |||
3fa9c9adc4 | |||
6cbe0fc511 | |||
7108d343f3 | |||
e754bfdafe | |||
5f7103c81c | |||
e282f3ef5a | |||
81bbb170d8 | |||
c3c989b46b | |||
53a40f48f9 | |||
650b30e6a1 | |||
9b7e94a9db | |||
1bfb83e01f | |||
337d771824 | |||
aea7ec3e40 | |||
ff42471601 | |||
3d05c39b17 | |||
0c046e486d | |||
2958a55d15 | |||
4e1708bb72 | |||
abaed2ecb5 | |||
b16e7a17c2 | |||
5b6d99e593 | |||
0449f9c84b | |||
2ec89d5a5d | |||
9a04fdfd37 | |||
32952be3df | |||
fd33f8ff07 | |||
a148bd56d6 | |||
e54d6447e6 | |||
13eba5f7a1 | |||
1a7e34d882 | |||
e13b30e554 | |||
f95e645330 | |||
3c0b3ec4ec | |||
32bb61a867 | |||
49a5b16d0f | |||
105c8aa65e | |||
370f19c40f | |||
c44d897397 | |||
0e60b27460 | |||
83754b351b | |||
f096e6f1e5 | |||
8dd264050e | |||
31c61e2cdc | |||
fcc9149c38 | |||
fd50c6353e | |||
db2d98612c | |||
b7bf896900 | |||
660db81825 | |||
33604ff6a0 | |||
5dc0c79692 | |||
5b90cb0be5 | |||
a7a64a7143 | |||
7c8c01b4f4 | |||
6ab9f91331 | |||
c3fe3c4b63 | |||
5bd967ac3b | |||
89f8810457 | |||
f12998527e | |||
36ce775017 | |||
6685102829 | |||
63ca6d42bf | |||
39ae34dc55 | |||
e0553c2e9f | |||
079adc7517 | |||
30ae1f92ca | |||
820afc3a7c | |||
94def93b45 | |||
fc14fd6489 | |||
058b07ba0c | |||
cf2a2f1799 | |||
49a0a34b10 | |||
c9f0848fd1 | |||
4f93c90c34 | |||
d9ad02c65e | |||
693566a87b | |||
2c61cecded | |||
893637b7ce | |||
0d7e39776e | |||
1afeed063a | |||
2487f13002 | |||
9b77b5dc27 | |||
6697ec6d65 | |||
8ab9262660 | |||
bf7d4f13f1 | |||
8fa6a1fbf9 | |||
b55b3c260f | |||
0a5c5f7125 | |||
9c06ae2734 | |||
10c91af21a | |||
981ffac2f5 | |||
b3490d2ef5 | |||
fb2448dc46 | |||
e1868b6646 | |||
5354a6247c | |||
9ca911e4c5 | |||
e6a1e08e14 | |||
c46c6fe29d | |||
a606504cca | |||
3415968d20 | |||
94378be14a | |||
0dd040500f | |||
6c0d3cf028 | |||
2dcf9c1a09 | |||
593539f201 | |||
c05cd545f8 | |||
62429b87f9 | |||
4a1857a433 | |||
129d63a0bc | |||
bcf9b59f63 | |||
f1ba2f8d9c | |||
2dd3045d63 | |||
9e8cc96eb7 | |||
ba2aee9ade | |||
676e1bd3a4 | |||
5a13306139 | |||
099e41bb31 | |||
c355b5783c | |||
f63688cf1e | |||
604f7d5d0f | |||
ca1189bda7 | |||
e391bdcf45 | |||
509a59f247 | |||
dad86d4654 | |||
e32480d80a | |||
740c5621c1 | |||
9d964fa52a | |||
dd2e5d2594 | |||
15ed880ab2 | |||
a0395c308b | |||
a164158761 | |||
3b4af1237d | |||
0941b7af66 | |||
f65abd7eb7 | |||
ff5a74807d | |||
3cf437f7d0 | |||
18da3d55e2 | |||
8f773355f4 | |||
17aececb38 | |||
569e782d3b | |||
9e014c72f0 | |||
b299638886 | |||
bf965cdf2d | |||
6f34fd0aa2 | |||
9faaa06250 | |||
c15f5281d7 | |||
820d3f76ef | |||
445beafa67 | |||
2b3106ad49 | |||
fb36df6026 | |||
e70fec4be2 | |||
0915343f89 | |||
5bd7bef16a | |||
32793d34f0 | |||
839b5649ce | |||
c0772e52f8 | |||
c4bff47a3a | |||
21798cf4dc | |||
ef99459052 | |||
5db31806e6 | |||
b4952ebea9 | |||
db879d6d3e | |||
ae6d6e1890 | |||
1047e47f68 | |||
ad6d02ce67 | |||
e0d88b99d9 | |||
1e5bb68d26 | |||
b64360a8dc | |||
cf43c3970b | |||
a14567cd5b | |||
25b7e1bce6 | |||
88b95fbbd8 | |||
a6281b95d0 | |||
6c6e3dc201 | |||
efdd6eb2f5 | |||
6b5d34add0 | |||
e242474944 | |||
f26d31725e | |||
ac3f5b4c64 | |||
941dd848a9 | |||
ce4c125cba | |||
a402180c95 | |||
b7da2f51e0 | |||
c94eaf55b7 | |||
ce7140fe97 | |||
9454a809f6 | |||
1ff75d4a53 | |||
13da19509e | |||
5a3cad773b | |||
0ce44e0879 | |||
8a797d4228 | |||
6b1b25f3df | |||
55081ce18f | |||
a1774434d3 | |||
06b18712c9 | |||
794446b2b4 | |||
eb474fa7db | |||
98aa58f01a | |||
8aa9e0efe3 | |||
70ba741f43 | |||
e814a659d2 | |||
17d7cf7c23 | |||
19f17e2d2c | |||
0726480bf8 | |||
343fed875a | |||
dba7cb0ded | |||
8975d815f4 | |||
ada9d15246 | |||
5893ba677a | |||
e7c576d03b | |||
5bd091e8bc | |||
719cb29609 | |||
3f66069015 | |||
7740d6fc3a | |||
2384d0641a | |||
492eeb70cb | |||
6f42240994 | |||
db78c0f3fa | |||
f5f67a159d | |||
c9b2cdf63e | |||
00587d374f | |||
796a28c8bb | |||
79f053334f | |||
0ba18da15b | |||
0a13fa7b84 | |||
4364f94dd6 | |||
fa221c758c | |||
f4e4fd37a9 | |||
ac6498cf69 | |||
9ef1de5376 | |||
bc28fbc701 | |||
40ba446cd0 | |||
606373ec20 | |||
6572b19b91 | |||
77504035dc | |||
2c727daddf | |||
640612a2a9 | |||
69031df654 | |||
9ced3f0448 | |||
5437e398e0 | |||
dac4648d46 | |||
a0cbb0df61 | |||
68990b36f9 | |||
fd798e3018 | |||
9502491bb6 | |||
1392f0b5b9 | |||
06d0d3bbc9 | |||
b47e0c59a4 | |||
89bb579c9c | |||
3d08a1224b | |||
4d5dd24342 | |||
3728598437 | |||
1d3b0e0d16 | |||
b8c7aff668 | |||
b829e296b9 | |||
08ed0125fb | |||
28c04c93b0 | |||
8290a34b99 | |||
b35b54fa04 | |||
ee05de9310 | |||
46947e49cd | |||
f98c906542 | |||
a8aac27025 | |||
66efb30de3 | |||
8613ba1de4 | |||
41708468c5 | |||
1d27b787cc | |||
c16bc1a963 | |||
03e99d17dd | |||
6bc0cab0f2 | |||
e3b1a9df3a | |||
1ab1ecea88 | |||
1d911669ae | |||
121c01aebd | |||
e46fb4123c | |||
8ba8a3fc22 | |||
667e353a7a | |||
5609d9f628 | |||
a67e2cc889 | |||
2a2b4c88da | |||
10a359ee3f | |||
1a25bf1779 | |||
bf9a4544f8 | |||
eacc03d7f4 | |||
016a7866fa | |||
10478473bc | |||
7818f3a0ee | |||
981a71b139 | |||
5c8f69feec | |||
624e8b72d7 | |||
386caed49c | |||
ff5a848b7e | |||
f49dde9463 | |||
0f64f7af52 | |||
e920987508 | |||
c6f3e9f4f4 | |||
39e4e1cd1a | |||
de2ea7d39b | |||
8c0935c3d0 | |||
93a607c48d | |||
da871e5cdb | |||
e05fb5ecec | |||
638936e9d5 | |||
59423d91a2 | |||
ba7228ed33 | |||
fbc5fdbf62 | |||
d945f25c4a | |||
0cff2501df | |||
32e54766f8 | |||
a014f9616a | |||
a22dceb653 | |||
444ac0b939 | |||
db5e597758 | |||
4ee77c8969 | |||
ffb1603824 | |||
4615d83840 | |||
76cd8ba5e4 | |||
a47491c5b3 | |||
20ef0ecb60 | |||
bcdc637053 | |||
b875b11cfe | |||
1226c35741 | |||
a4a935a8da | |||
200277c2d9 | |||
51c8367bca | |||
a2b4c1fdb7 | |||
9de864f36d | |||
0450f220d5 | |||
725f4ad298 | |||
cedc8530c6 | |||
d2f8f7eeef | |||
e761ddcb9c | |||
fddd1c1631 | |||
a2dde04c89 | |||
77bd9e58cc | |||
306037924c | |||
6e452db662 | |||
68e598ced3 | |||
8b2ec79bc1 | |||
963692fcfa | |||
ba94314769 | |||
728ca03748 | |||
c148ff6713 | |||
d7929e1268 | |||
927beef433 | |||
58d9b82871 | |||
7c1f4019ca | |||
278bd40447 | |||
cad1c57a0a | |||
92f7635a95 | |||
71197dd4c9 | |||
716f1c2d8f | |||
c909de9541 | |||
b968faf468 | |||
d0e8c4981e | |||
35dcfe1100 | |||
cc97c87177 | |||
00dd1abf8a | |||
00f05b9523 | |||
af60a8dcb0 | |||
4eb79231e9 | |||
6aec2f6a7a | |||
41ba72ecb2 | |||
e9ae371684 | |||
679f3243f7 | |||
315ccf52b9 | |||
29370fdc1c | |||
796d8490b8 | |||
0996e729fa | |||
574b60aec5 | |||
8f503e3da5 | |||
2bb826e3e8 | |||
bcd4def605 | |||
cd38c4bc6a | |||
baf4eb5626 | |||
c99f5232f3 | |||
0a838d1985 | |||
3502cb9a4c | |||
38ebcfae65 | |||
28e8736525 | |||
552ea0a985 | |||
067205570c | |||
fce0c32a86 | |||
3067eed0e0 | |||
0115ccde4b | |||
a8fe9c0635 | |||
0478bd748a | |||
50d977269f | |||
ab73859416 | |||
eaadd1c6b7 | |||
1f278d0f8d | |||
927bbd3fb9 | |||
544ece0349 | |||
d4d608e913 | |||
a69dfec5be | |||
970f747365 | |||
f5490897ea | |||
410f1b11ff | |||
0b0262d8c2 | |||
9eebba0d17 | |||
06420a751e | |||
5f10235f38 | |||
8bcb86b75e | |||
807e5c54bd | |||
9d9bfad025 | |||
2c6cbd8891 | |||
5c714c35ba | |||
02dee4fe7f | |||
536aa735c3 | |||
23978f2956 | |||
809d153897 | |||
1ef42deb20 | |||
cd9160c0d9 | |||
9f4f0966ad | |||
49ada8d3c4 | |||
ad47136311 | |||
3c235435e6 | |||
1ef2f7a2ad | |||
d3d7b8c67a | |||
5cc2e00665 | |||
cca265e5b8 | |||
7165685f59 | |||
491ddbc004 | |||
30028833fe | |||
999b92f0c0 | |||
1d4eeba1fc | |||
61bb1b9561 | |||
fac8266f0c | |||
2643de9216 | |||
6d8a40eeed | |||
514421233a | |||
e59fb816b1 | |||
0f5aa1ce73 | |||
c13e99bd72 | |||
325fdac0ef | |||
acaa0aed29 | |||
df629cc0ef | |||
df4bb7d21f | |||
08e2f0b40e | |||
ce33ae3345 | |||
61b849962c | |||
4199b3ae4a | |||
d274ef2947 | |||
433381d0ff | |||
42c4776417 | |||
afb56392ef | |||
e67b1fb3fc | |||
ead8b1a733 | |||
db448d5cf6 | |||
4ead818fba | |||
d99c3ebd6a | |||
8ec665063e | |||
5ca718078c | |||
9f2c409cc5 | |||
d5eddb023e | |||
0fa774b9ef | |||
f598597478 | |||
e89fb1a722 | |||
d303e01290 | |||
5ac6d5bcd3 | |||
bceff7f7d8 | |||
fd476b4102 | |||
4c12d145ff | |||
58a3076a63 | |||
df2800f389 | |||
a3591ef955 | |||
d17623ab98 | |||
001cc6c0c3 | |||
e01ff7e765 | |||
3b49ae42d4 | |||
45d8446e4a | |||
ae786774ab | |||
6ef781b341 | |||
935dde8c8b | |||
f43d9282e2 | |||
67d164fc1f | |||
2b2c7c97a1 | |||
eb7ae3115d | |||
cca4e1788b | |||
5be619c35c | |||
3f127d6a1a | |||
6287d4641d | |||
ff04064574 | |||
8e7d317e09 | |||
8e42bb331e | |||
7e650a362e | |||
99d40fbc1f | |||
32da6124d3 | |||
b092dac66c | |||
58e018f69d | |||
d942d171e5 | |||
ebc788a8d1 | |||
3a7a452ca8 | |||
295ceb6f60 | |||
82e55ad3a9 | |||
1368035214 | |||
4e02f6ce57 | |||
42512b36b3 | |||
70342888a5 | |||
59077b3253 | |||
be18f27258 | |||
1fdce0edd0 | |||
d0dedc7331 | |||
5f6044a1cf | |||
15e5c4430c | |||
86da1d29d4 | |||
37df0b9fcc | |||
71ed7c9f83 | |||
064747b9c2 | |||
179e31cec8 | |||
2dac6119a8 | |||
923fb876e3 | |||
8d1fe8b97b | |||
8d37d5b7ba | |||
428da44c17 | |||
98ab530c3a | |||
1b21c50d9d | |||
bd703a8954 | |||
5f53cdedab | |||
77526c8747 | |||
b3b7343f6d | |||
ebd91d14e8 | |||
b1564155d5 | |||
d5d8c10d20 | |||
5a8d8fbe77 | |||
7171bf393b | |||
122a80ecc0 | |||
b832663b0f | |||
185cbde378 | |||
4b7af2f8c4 | |||
8764e74c37 | |||
6a56bc9f10 | |||
ad1f50467e | |||
e3c49176cd | |||
ad858e8c5b | |||
b259e4f91a | |||
b424bb06e7 | |||
a525eb050f | |||
7fba283c94 | |||
3a5506eee8 | |||
cf9028c9df | |||
25644d1090 | |||
18596a7d50 | |||
b85369ec90 | |||
92d38db50d | |||
7c4d6d4db8 | |||
72e975e711 | |||
4127bbf3f3 | |||
ccc408d4ab | |||
3c37974e03 | |||
4d6d2cf3f9 | |||
9755b4146f | |||
8e0ec23c77 | |||
74af26348e | |||
364a892bce | |||
052f689cde | |||
e3be530e36 | |||
ac7a021ca0 | |||
99b72a732d | |||
057c17897e | |||
d35414ed7b | |||
fba035b3ea | |||
2a43bc9fe8 | |||
ee4bf52f34 | |||
374086ce0b | |||
bba328e41a | |||
c8b4971b9a | |||
67e9129e29 | |||
213bdef44b | |||
545e380823 | |||
bb31338b0a | |||
a9f5477b3b | |||
c75b7eddc0 | |||
f96b1b3934 | |||
3845085a42 | |||
ba58c28494 | |||
c8ef678d5a | |||
9286ae2736 | |||
fdbc06b9a5 | |||
b1ac66752e | |||
a92b8138af | |||
cb8a526f36 | |||
8c030c01e6 | |||
609baf941e | |||
6bfffecd99 | |||
e7f1bfcd91 | |||
aecff86e99 | |||
2604cf08d6 | |||
95f818b3bd | |||
a2c4cef408 | |||
71e4398800 | |||
4eb5fbf84f | |||
bb8b66c431 | |||
c228b4d927 | |||
476098904f | |||
02c81e701d | |||
059904ec01 | |||
a9ceba377a | |||
d26109d183 | |||
c8cb79ac66 | |||
255e2ad11e | |||
0fbd93981f | |||
c052dea91a | |||
790b97b57c | |||
b5ac265dde | |||
a251ee7d71 | |||
3e1fa4f879 | |||
f6e06e3bdb | |||
442864480d | |||
04d5ee08e1 | |||
ff55a3a53c | |||
dde0b858c1 | |||
31f04c0f80 | |||
4fe9fc1752 | |||
06feb2e2cb | |||
de0e6211df | |||
77dea1e04a | |||
6f2bdb5d79 | |||
e295e1cf69 | |||
b91aedfaab | |||
0ad8774375 | |||
6afe64b906 | |||
180cb4ac30 | |||
1815b04ac1 | |||
0aaab4f544 | |||
dbd937d09c | |||
e8dec9e0b6 | |||
07519d0439 | |||
c02da2f3ac | |||
3833472bfa | |||
61c187013c | |||
c8613c0080 | |||
a27ba41203 | |||
6c3da8f908 | |||
0db842d50b | |||
03a9393241 | |||
9a9ca3a0fd | |||
c429827942 | |||
1cc5eef1d0 | |||
11531d0d1d | |||
4b414d8317 | |||
85183cd5fe | |||
7ceb31d66c | |||
2872b28c98 | |||
3709889b79 | |||
605153fcd0 | |||
12b237b25c | |||
cbedb9335c | |||
03b9ebdf22 | |||
4393579f2f | |||
e7d34eceb3 | |||
f597514404 | |||
8f9af85aac | |||
884478833c | |||
7c97a29407 | |||
39275becb9 | |||
aff8d7c674 | |||
a8c6557a14 | |||
207fa9c3e2 | |||
08e8baf738 | |||
3e31f2726e | |||
7a70a4bb9e | |||
0bf01b0da6 | |||
29a8aee5ac | |||
8b24991215 | |||
5fc8f25bb6 | |||
e325bd3779 | |||
3c5cf6205a | |||
46ebd588f2 | |||
2d08769235 | |||
0b1c3faf79 | |||
b8753ef03a | |||
d1fff5e1e4 | |||
4468d96321 | |||
0ad8af4265 | |||
cbfbadbfeb | |||
526e49089c | |||
dd2415e0b1 | |||
232d525b47 | |||
9047aed326 | |||
7950a4b733 | |||
63af92da61 | |||
54164a698e | |||
52e84e4e06 | |||
3bdfa20b26 | |||
1d71d9cfc5 | |||
2c53248633 | |||
c63c4b59f4 | |||
1407ce11fe | |||
34e24f1ee7 | |||
5bc416d09b | |||
439394df19 | |||
c82e80cf31 | |||
b350d0bf3c | |||
61b12f05e2 | |||
f444228d54 | |||
68d2111a68 | |||
9ad4769ba1 | |||
0f9f8d02d2 | |||
1913c9e428 | |||
707e5f28c5 | |||
95479cc97b | |||
8c33985fb7 | |||
a40a197a7a | |||
20941c5c8f | |||
f30f203c07 | |||
462b847830 | |||
ecf65d1d18 | |||
038efeaafa | |||
41bea69aea | |||
6e86127c09 | |||
32b3186f67 | |||
0d48cdabe0 | |||
d5a419cd0c | |||
86dcf8549d | |||
0de2bad7d7 | |||
42b97e22d2 | |||
f01b9f4d73 | |||
9fa4d1dd6a | |||
1a85e8e1ed | |||
0c2102eb04 | |||
d2c546bb0f | |||
f865699694 | |||
1a4830d9ed | |||
dccf145d97 | |||
599ed5ec03 | |||
31e7b6b8b4 | |||
0acec1779e | |||
50089c7c6e | |||
d22686e4f7 | |||
5ea0146fa3 | |||
ffdb018f21 | |||
6ea44220a5 | |||
5f5833d3d8 | |||
58805c9784 | |||
e18de4a130 | |||
b9cda3a9e4 | |||
481457b5e6 | |||
1f1e1f98d9 | |||
15b4869e30 | |||
1edb66b1ea | |||
f9e90332b0 | |||
c13e60bba2 | |||
f906e584df | |||
2d7217cfdc | |||
5c62c5b490 | |||
aaebff07bd | |||
b2fe137ad6 | |||
bc5be1a9ab | |||
2cf79f6552 | |||
7c0b72625b | |||
f00324ae64 | |||
0f79fb4f32 | |||
200d2d7ac1 | |||
2c0adc5cce | |||
b5c030212d | |||
eb96b1b635 | |||
fc0cec06dc | |||
cd4000c05f | |||
30a6677a07 | |||
923124741c | |||
4d605488e4 | |||
50c01fcfe9 | |||
edc15f28e7 | |||
7323d3cfda | |||
fae274eed6 | |||
becdb0ebda | |||
1028feb3ff | |||
c5ffaeaeae | |||
97a02a6991 | |||
d8b6436d50 | |||
51cdf8fa43 | |||
461986cb75 | |||
83c276f4a4 | |||
43ec532560 | |||
43b3f358fe | |||
d8fb639d00 | |||
dc4a120f88 | |||
7f7c1611ed | |||
c5a624e0ca | |||
0ba699ae7a | |||
c78f27213c | |||
849de63fb4 | |||
bf983faab4 | |||
31471973b5 | |||
bda15d78a4 | |||
f0937610d3 | |||
f902dc94bc | |||
57fa9a250a | |||
9da44bc815 | |||
181a1427a6 | |||
cee12c778e | |||
f54db6aac5 | |||
0cfd9f5082 | |||
7e82af790e | |||
fd10453c86 | |||
864ff41fb7 | |||
a31f263c39 | |||
18494276e4 | |||
a7e58d9b75 | |||
67d1387f85 | |||
4165a86d5b | |||
581a5f8a96 | |||
57b9f0da49 | |||
52435be3f4 | |||
4c4a1ed208 | |||
1140a421e6 | |||
7cd72d3722 | |||
415634271b | |||
97741e99ff | |||
5e00b9c266 | |||
1d50ceae7e | |||
dbcc3a951c | |||
7902a3235d | |||
6e2bedf50e | |||
a14c8e2d5a | |||
903fbb95c3 | |||
95d626a5e5 | |||
753b7b80ee | |||
16f1b31d5c | |||
b1151d2d98 | |||
1a41461edd | |||
710f85876a | |||
c609a0df69 | |||
7ffc4dcbe3 | |||
58de913825 | |||
36b8dd52fa | |||
2163523bf2 | |||
428f084cba | |||
90ea515825 | |||
e356fc8dd5 | |||
bc9546ae02 | |||
0a6d569c93 | |||
dd3707213b | |||
a32590d25b | |||
1abed84efe | |||
d797d06346 | |||
e4b3b1630e | |||
154dfee717 | |||
f965a52e45 | |||
f9ab3f9216 | |||
6c4315c498 | |||
4a3c4ac212 | |||
536800da08 | |||
2a4b17eaeb | |||
9a9e7330e7 | |||
3f1919a32e | |||
3505d23357 | |||
56faa10172 | |||
271e68d57b | |||
5f30773bbe | |||
9958e33788 | |||
b10f22fd34 | |||
7e2b95cf42 | |||
91fe33119a | |||
03d61da174 | |||
108f3bb90f | |||
bb11e6463d | |||
2d57fd508f | |||
219875d391 | |||
086ef33ef7 | |||
5b7772fb31 | |||
58becf376d | |||
2164506a3a | |||
f8242a673d | |||
f94778b7dd | |||
117959e006 | |||
e279e55c72 | |||
3c6d637ed5 | |||
76db1a16cd | |||
7c23894ec2 | |||
7fcc60af49 | |||
61dddc20c5 | |||
db66799f67 | |||
a2009248fb | |||
fbfff8eb25 | |||
5cfe0a5355 | |||
fb3d41eb32 | |||
3618d20532 | |||
03fa5b74b3 | |||
a2733ce379 | |||
f471eb5ebb | |||
149da22262 | |||
179d01985c | |||
305ae7384c | |||
8be76aa3f8 | |||
4ba400717a | |||
d2098bebc2 | |||
5ded2d3a71 | |||
980108b0ee | |||
2d4508bfa7 | |||
13b656f26c | |||
dcddcb429c | |||
303b0878b0 | |||
7393a62346 | |||
634b071606 | |||
e5a7d61e6c | |||
b39c42696b | |||
8bd06241f3 | |||
6594c1fcb7 | |||
a3598ced21 | |||
1c2ac0ee77 | |||
fe7487b5d8 | |||
73280fcb0b | |||
71ce6adc2e | |||
229c3b603b | |||
efe39feea5 | |||
72fe4df946 | |||
ea2c35c7a5 | |||
349dbc8836 | |||
f1163f604a | |||
8eca1d0ef7 | |||
96c65de4e2 | |||
89b0dba085 | |||
6b5aabbf2c | |||
e382c672ec | |||
ca33c27d49 | |||
dba9fdc8de | |||
6506e7f163 | |||
2c6dd3ca5c | |||
eca06d4b8b | |||
0aa487e5d3 | |||
cbc6b9339c | |||
460734e375 | |||
fa44961402 | |||
e8b5dd7fd9 | |||
2bc71941ab | |||
a3cc109ba3 | |||
378e550f03 | |||
9e6553174e | |||
dfc868fe5b | |||
0041e454d7 | |||
3fbe922712 | |||
de76753af8 | |||
235d59a457 | |||
810cf48439 | |||
0a6e63f673 | |||
b12351645b | |||
9324e4801b | |||
09670742ce | |||
592c155de9 | |||
fe345a7306 | |||
f5703f22b8 | |||
3afaa90931 | |||
997f94aff7 | |||
ea42aa3111 | |||
48ae86f244 | |||
93349a24a6 | |||
48738f5225 | |||
52fc4a08bb | |||
ce9d5dd8ca | |||
c041c68fb3 | |||
323dba26fb | |||
fe41af2b8c | |||
626f329aeb | |||
01a3e0bbaf | |||
cefe56f1b8 | |||
0f1a3f3e1e | |||
7fbc133172 | |||
75088cfb8c | |||
a48033dbe5 | |||
b568f2d235 | |||
4443e6154f | |||
d09706b327 | |||
49e8c60d5e | |||
3e920a38a2 | |||
2c17096d17 | |||
10446b5fa8 | |||
6d8b30b13d | |||
4da0051a98 | |||
1b5e99f1b7 | |||
1e690d899d | |||
c4faec1d98 | |||
4147ec12e5 | |||
3890f26825 | |||
8fdf01cd91 | |||
b1b08138ec | |||
77e00abb24 | |||
6d9e1aea04 | |||
b196c235d4 | |||
e130686c28 | |||
483b9aed8c | |||
2f47441f45 | |||
d942484deb | |||
d2ae3f23ee | |||
284d3a7977 | |||
bf684e0d3b | |||
d199dbedfb | |||
377a375536 | |||
e29e2255ee | |||
1412aa8059 | |||
b34c8ff45f | |||
ef5432b207 | |||
d2d538893d | |||
3cc9e98e04 | |||
c700084508 | |||
f7d09fce00 | |||
adf40bc352 | |||
cf13e14bbc | |||
6287dc4f8b | |||
429f8ee7cd | |||
a9318b1f09 | |||
1ecb13d311 | |||
f5b7aa7a69 | |||
a693d43a0e | |||
da8ad31027 | |||
de6775a887 | |||
75e28dd1c3 | |||
e065a3ee83 | |||
2a8270cd7a | |||
32bd74db4b | |||
8920fee3cb | |||
4ffde423e2 | |||
ebb49b4b70 | |||
71383d2eac | |||
ec69fcb39d | |||
3959efb5c8 | |||
13d399ef2c | |||
3920341fe3 | |||
58444e8429 | |||
abfe5e9050 | |||
4db77623cd | |||
3ee2598f83 | |||
d9ace62cea | |||
c922980f7c | |||
43cea1c1fd | |||
d6ab380c6e | |||
73be1372e9 | |||
f26434056e | |||
67793b7e86 | |||
3f4cd2f65c | |||
b94f65c38b | |||
65b091b262 | |||
c71dfa7bd3 | |||
5100508e5e | |||
d63fc67fe8 | |||
6be32cd64a | |||
42e3cdc73f | |||
d39eba4485 | |||
373f495bfd | |||
bc4f80daab | |||
58cd9f2a38 | |||
c95421e939 | |||
6c9495a0e0 | |||
dd24bd4bff | |||
85e09b423f | |||
bf9a5090cf | |||
6c22726061 | |||
409f19818f | |||
34232f3065 | |||
1770def22b | |||
808bffe957 | |||
5ae5f769d1 | |||
fbaac58d6e | |||
964e8bd55e | |||
f49c4ad3c7 | |||
297a3ce7fd | |||
3bc4ad4d2f | |||
8c27435465 | |||
1b782aaf6f | |||
bce7d00345 | |||
c4c81a9c4c | |||
59a51aecd4 | |||
03a3775a72 | |||
88936cbf3d | |||
0672593883 | |||
7b2f2a380c | |||
6638ab854c | |||
78eae21e2a | |||
6676cf8b46 | |||
2b2c56bc64 | |||
81c6f529db | |||
a974b605a9 | |||
2207678eb0 | |||
bef27cd48d | |||
121b1973d7 | |||
5153ad122e | |||
87a8e8cdaf | |||
b57bf42ca7 | |||
a0495bef04 | |||
9fcc4f1d52 | |||
60886325bb | |||
091daf4536 | |||
a11537b029 | |||
d24d0ffa6a | |||
19274454bb | |||
0a5ff88b68 | |||
14cc168052 | |||
db81c1dd79 | |||
51d5a59516 | |||
f8d99d59c2 | |||
fb427e156b | |||
ab87d2520a | |||
12d88cd347 | |||
ae645dcb12 |
62
.githooks/post-checkout
Executable file
62
.githooks/post-checkout
Executable file
@ -0,0 +1,62 @@
|
||||
#!/bin/bash -
|
||||
# echo "POST-CHECKOUT"
|
||||
# echo "PREV-HEAD=$1"
|
||||
# echo "CURR-HEAD=$2"
|
||||
# echo "BRANCH-CHECKOUT=$3"
|
||||
|
||||
readonly GIT_UPDATE_LOG="/opt/app/tools/atbupdate/update_log.csv"
|
||||
readonly OPKG_COMMANDS_FILE="./etc/psa_update/opkg_commands"
|
||||
|
||||
write_log_file () {
|
||||
# repo: customer_281
|
||||
# readonly repo=$(basename $(git rev-parse --show-toplevel))
|
||||
# branch: customer_281:HEAD->zg1/zone1,origin/zg1/zone1
|
||||
# readonly branch=$(git log --graph --all --decorate $2 | head -n 1 | sed -E -e 's/(.*?)\((.*)\)/\2/g' | sed -E -e s/[[:space:]]//g)
|
||||
# readonly line="$repo:$branch"
|
||||
readonly now="$(date +%Y-%m-%dT%T)"
|
||||
# echo "DOWNLOAD, /etc/dc/dc2c.bin, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print01.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print02.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print03.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print04.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print05.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print06.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print07.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print08.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print09.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print10.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print11.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print12.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print13.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print14.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print15.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print16.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print17.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print18.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print19.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print20.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print29.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_print32.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_device.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_cash.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
# echo "DOWNLOAD, /etc/psa_config/DC2C_conf.json, $now, N/A" >> $GIT_UPDATE_LOG
|
||||
if [ -f "$OPKG_COMMANDS_FILE" ]; then
|
||||
if grep -qE . "${OPKG_COMMANDS_FILE}"; then
|
||||
# make sure the file is empty
|
||||
echo -n "" > $GIT_UPDATE_LOG
|
||||
readarray opkg_commands < <(cat $OPKG_COMMANDS_FILE)
|
||||
for opkg_c in "${opkg_commands[@]}"; do
|
||||
# check for lines longer than 'opkg '
|
||||
if [ "${#opkg_c}" -gt 4 ]; then
|
||||
# comment: spaces, at least one '#'
|
||||
grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
|
||||
echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
|
||||
echo "" >> $GIT_UPDATE_LOG 2>&1
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
write_log_file
|
||||
|
56
.githooks/post-merge
Executable file
56
.githooks/post-merge
Executable file
@ -0,0 +1,56 @@
|
||||
#!/bin/bash -
|
||||
|
||||
# FILE="/tmp/post-merge$(date +%FT%H-%M-%S)"
|
||||
# commit=$(git rev-parse --verify HEAD)
|
||||
# echo "$commit $(git cat-file commit $commit)" >> /tmp/post-merge
|
||||
|
||||
# Redirect output to stderr.
|
||||
exec 1>&2
|
||||
|
||||
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
|
||||
# note: this can be used for any file in the filesystem
|
||||
echo $(git hash-object $1)
|
||||
}
|
||||
|
||||
get_commit_for_blob () {
|
||||
# search for the blob in all commits for the file(name) $1
|
||||
echo $(git log --all --pretty=format:%H -- $2 |
|
||||
xargs -I{} bash -c "git ls-tree {} -- $2 |
|
||||
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
|
||||
if grep -qE "DC2C.*json" <<< $fn; then
|
||||
# called in repository: $fn is e.g. etc/psa_tariff/tariff01.json
|
||||
# add '/' prefix
|
||||
echo "DOWNLOAD, $(echo $fn | awk '{ printf "/"$0 }'), $now, N/A" >> "$GIT_UPDATE_LOG"
|
||||
elif grep -qE "dc2c.bin" <<< $fn; then
|
||||
# download the file referenced by the link dc2c.bin
|
||||
echo "DOWNLOAD, "/etc/dc/dc2c.bin", $now, N/A" >> "$GIT_UPDATE_LOG"
|
||||
elif grep -qE ".*opkg_commands" <<< $fn; then
|
||||
readarray opkg_commands < <(cat $fn)
|
||||
for opkg_c in "${opkg_commands[@]}"; do
|
||||
# check for lines longer than 'opkg '
|
||||
if [ "${#opkg_c}" -gt 4 ]; then
|
||||
# comment: spaces, at least one '#'
|
||||
grep -qE '^[[:space:]]*#+.*$' <<< "$opkg_c" && continue
|
||||
echo -n "EXECUTE, $opkg_c, $now, N/A" | tr -d '\n\r' >> $GIT_UPDATE_LOG 2>&1
|
||||
echo "" >> $GIT_UPDATE_LOG 2>&1
|
||||
fi
|
||||
done
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
write_log_file
|
||||
|
61
.githooks/post-merge.bck
Executable file
61
.githooks/post-merge.bck
Executable file
@ -0,0 +1,61 @@
|
||||
#!/bin/bash -
|
||||
|
||||
# FILE="/tmp/post-merge$(date +%FT%H-%M-%S)"
|
||||
# commit=$(git rev-parse --verify HEAD)
|
||||
# echo "$commit $(git cat-file commit $commit)" >> /tmp/post-merge
|
||||
|
||||
# Redirect output to stderr.
|
||||
exec 1>&2
|
||||
|
||||
if [ -z $IFS ]; then
|
||||
IFS=$'\n'
|
||||
fi
|
||||
|
||||
GIT_PULL_TMP=/tmp/git_pull
|
||||
OPKG_CMDS_TMP=/tmp/opkg_commands
|
||||
|
||||
rm -f $GIT_PULL_TMP
|
||||
rm -f $OPKG_CMDS_TMP
|
||||
|
||||
get_blob () { # get the blob of the file(name) passed as $1
|
||||
# note: this can be used for any file in the filesystem
|
||||
echo $(git hash-object $1)
|
||||
}
|
||||
|
||||
get_commit_for_blob () {
|
||||
blob=$(get_blob $1)
|
||||
if [ ! -z $blob ]; then
|
||||
# search for the blob in all commits for the file(name) $1
|
||||
echo $(echo $(git log --all --pretty=format:%H -- $1) |
|
||||
xargs -I{} bash -c "git ls-tree {} -- $1 |
|
||||
grep -q $blob && echo {}")
|
||||
fi
|
||||
}
|
||||
|
||||
changed_file_names () {
|
||||
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
|
||||
CHANGED_FILE_NAMES+=($fn)
|
||||
done
|
||||
}
|
||||
|
||||
# write_git
|
||||
|
||||
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
|
||||
if grep -E -q "(DC.*json|dc.*hex|dc.*bin|tariff.*json)" <<< $fn; then
|
||||
fsize=0
|
||||
if [[ -f "$fn" ]]; then
|
||||
fsize=$(ls -l "$fn" | awk '{ print $5 }')
|
||||
fi
|
||||
echo "$fn $fsize" >> $GIT_PULL_TMP
|
||||
fi
|
||||
if grep -E -q ".*opkg_commands" <<< $fn; then
|
||||
readarray opkg_commands < <(cat $fn)
|
||||
for opkg_c in "${opkg_commands[@]}"; do
|
||||
test -z $opkg_c && continue;
|
||||
test ! -z $(grep -E "^\s*[#]+.*$" <<< $opkg_c) && continue
|
||||
echo -n "$opkg_c" | tr -d '\n\r' >> $OPKG_CMDS_TMP 2>&1
|
||||
echo "" >> $OPKG_CMDS_TMP 2>&1
|
||||
done
|
||||
source "$fn"
|
||||
fi
|
||||
done
|
27
.gitignore
vendored
Normal file
27
.gitignore
vendored
Normal file
@ -0,0 +1,27 @@
|
||||
# First, ignore everything
|
||||
*
|
||||
# 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
|
||||
!**/.githooks/post-checkout
|
||||
|
||||
## 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
|
||||
|
@ -1,4 +0,0 @@
|
||||
Wed 30 Aug 2023 10:37:28 AM CEST Version 0.0.1: Test (1)
|
||||
Wed 30 Aug 2023 10:45:08 AM CEST Version 0.0.2: Test (2)
|
||||
Wed 30 Aug 2023 11:24:51 AM CEST Version 0.0.3: Test (3)
|
||||
Wed 30 Aug 2023 11:29:44 AM CEST Version 0.0.4: Test (4)
|
BIN
etc/dc/dc2c.04.36.bin
Executable file
BIN
etc/dc/dc2c.04.36.bin
Executable file
Binary file not shown.
BIN
etc/dc/dc2c.4.11.bin
Executable file
BIN
etc/dc/dc2c.4.11.bin
Executable file
Binary file not shown.
BIN
etc/dc/dc2c.4.21.bin
Executable file
BIN
etc/dc/dc2c.4.21.bin
Executable file
Binary file not shown.
BIN
etc/dc/dc2c.4.22.bin
Executable file
BIN
etc/dc/dc2c.4.22.bin
Executable file
Binary file not shown.
BIN
etc/dc/dc2c.4.33.bin
Executable file
BIN
etc/dc/dc2c.4.33.bin
Executable file
Binary file not shown.
BIN
etc/dc/dc2c.4.35.bin
Executable file
BIN
etc/dc/dc2c.4.35.bin
Executable file
Binary file not shown.
1
etc/dc/dc2c.bin
Symbolic link
1
etc/dc/dc2c.bin
Symbolic link
@ -0,0 +1 @@
|
||||
dc2c.04.36.bin
|
0
etc/dc/dc2c04.30.bin
Normal file
0
etc/dc/dc2c04.30.bin
Normal file
0
etc/dc/dc2c04.31.bin
Normal file
0
etc/dc/dc2c04.31.bin
Normal file
0
etc/dc/dc2c05.55.bin
Normal file
0
etc/dc/dc2c05.55.bin
Normal file
27
etc/psa_config/DC2C_cash.json
Executable file → Normal file
27
etc/psa_config/DC2C_cash.json
Executable file → Normal file
@ -1,18 +1,17 @@
|
||||
{
|
||||
"title":"DC2C_cash ",
|
||||
"project":"Schoenau",
|
||||
"version":"15.10.2023 14:55 02.00.06",
|
||||
"CoinDenom(15..0)":[0,0,0,0,0,0,0,0,0,255,200,100,50,20,10,5],
|
||||
"CoinValue(15..0)":[0,0,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
|
||||
"CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0],
|
||||
"ExchangeRate":1,
|
||||
"TokenChannel":6,
|
||||
"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
|
||||
"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],
|
||||
"LocalTaxRate":19,
|
||||
"ForeignTaxRate":0,
|
||||
"project":"DBM Szeged",
|
||||
"version":"0.0.5",
|
||||
"CoinDenom(15..0)":[200,100,50,0,0,0,0,100,200,100,50,20,10,5,0,3],
|
||||
"CoinValue(15..0)":[760,380,190,0,0,0,0,100,200,100,50,20,10,5,0,3],
|
||||
"CoinAccept(15..0)":[1,1,1,0,0,0,0,1,1,1,1,1,1,1,0,1],
|
||||
"ExchangeRate":378
|
||||
"TokenChannel":1,
|
||||
"BillValues(7..0)":[0,0,0,0,0,0,0,0],
|
||||
"LocalTaxRate":20,
|
||||
"ForeignTaxRate":19,
|
||||
"Surcharge":0,
|
||||
"Discount":0
|
||||
}
|
||||
#"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,10000,5000,2000,1000,500],
|
||||
"Discount":0,
|
||||
|
||||
}
|
||||
|
||||
|
12
etc/psa_config/DC2C_conf.json
Executable file → Normal file
12
etc/psa_config/DC2C_conf.json
Executable file → Normal file
@ -1,12 +1,12 @@
|
||||
{
|
||||
"title":"DC2C_config",
|
||||
"project":"Schoenau",
|
||||
"version":"15.11.2023 00001",
|
||||
"custNum":332,
|
||||
"machNum":10,
|
||||
"project":"DBM Szeged",
|
||||
"version":"0.0.1",
|
||||
"custNum":281,
|
||||
"machNum":997,
|
||||
"borough":1,
|
||||
"zone":1,
|
||||
"alias":0,
|
||||
"location":"PP Königssee"
|
||||
"alias":997,
|
||||
"location":"ATB Thomas' office"
|
||||
}
|
||||
|
||||
|
@ -1,27 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_device",
|
||||
"project":"Schoenau",
|
||||
"Version":"15.11.2023 00102",
|
||||
"printer":1,
|
||||
"coinChk":3,
|
||||
"mifRd":1,
|
||||
"solarPwr":1,
|
||||
"modem":1,
|
||||
"creditCard":1,
|
||||
"escrow":0,
|
||||
"RejMotor":0,
|
||||
"shutter":1,
|
||||
"billRd":1,
|
||||
"vaultLock":0,
|
||||
"autoAlarm":1,
|
||||
"autoOpen":1,
|
||||
"AccPrint":1,
|
||||
"DorPrint":1,
|
||||
"TokPrint":1,
|
||||
"CBwarnLev":1600,
|
||||
"CBerrLev":1900,
|
||||
"BattWarn":11800,
|
||||
"BattErr":11200,
|
||||
"foreign":1,
|
||||
"refPrint":0
|
||||
}
|
26
etc/psa_config/DC2C_device.json
Executable file → Normal file
26
etc/psa_config/DC2C_device.json
Executable file → Normal file
@ -1,27 +1,25 @@
|
||||
{
|
||||
"title":"DC2C_device",
|
||||
"project":"Schoenau",
|
||||
"Version":"15.11.2023 00102",
|
||||
"project":"DBM Szeged",
|
||||
"Version":"13.02.2023 12:20 00001",
|
||||
"printer":1,
|
||||
"coinChk":3,
|
||||
"coinChk":1,
|
||||
"mifRd":1,
|
||||
"solarPwr":0,
|
||||
"modem":0,
|
||||
"creditCard":1,
|
||||
"escrow":0,
|
||||
"RejMotor":0,
|
||||
"solarPwr":1,
|
||||
"modem":1,
|
||||
"creditCard":0,
|
||||
"escrow":1,
|
||||
"RejMotor":1,
|
||||
"shutter":1,
|
||||
"billRd":1,
|
||||
"vaultLock":0,
|
||||
"vaultLock":1,
|
||||
"autoAlarm":1,
|
||||
"autoOpen":1,
|
||||
"AccPrint":1,
|
||||
"DorPrint":1,
|
||||
"TokPrint":1,
|
||||
"CBwarnLev":1600,
|
||||
"CBerrLev":1900,
|
||||
"BattWarn":11800,
|
||||
"BattErr":11200,
|
||||
"foreign":1,
|
||||
"refPrint":1
|
||||
"CBerrLev":1900
|
||||
|
||||
}
|
||||
|
||||
|
49
etc/psa_config/DC2C_print01.json
Executable file → Normal file
49
etc/psa_config/DC2C_print01.json
Executable file → Normal file
@ -1,46 +1,41 @@
|
||||
{
|
||||
"title":"DC2C_pri01",
|
||||
"project":"Schoenau",
|
||||
"Version":"15.11.2023 00001",
|
||||
"styl":"font 10",
|
||||
"styl":"size 11",
|
||||
"styl":"align c",
|
||||
"styl":"font 08",
|
||||
"styl":"size 10",
|
||||
"feed":"margin02",
|
||||
"feed":"rim02",
|
||||
"text":"PARKTICKET",
|
||||
"text":"PARKOLÓJEGY",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Bitte gut sichtbar",
|
||||
"text":"Kérjük az elsö szélvédö",
|
||||
"feed":"nl",
|
||||
"text":"hinter die Scheibe",
|
||||
"text":"mögé jól láthatóan",
|
||||
"feed":"nl",
|
||||
"text":"legen",
|
||||
"text":"elhelyezni!",
|
||||
"feed":"nl",
|
||||
"text":"A PARKOLÓ NEM ÕRZÖTT",
|
||||
"feed":"nl",
|
||||
"text":"Please place it clearly visible",
|
||||
"feed":"nl",
|
||||
"text":"behind the",
|
||||
"text":" front windshield!",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"styl":"align l",
|
||||
"text":"Ihr Kennzeichen: ",
|
||||
"feed":"nl",
|
||||
"styl":"size 11",
|
||||
"text":"Rendszám: ",
|
||||
"vari":"Dynamic01",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Parkende: ",
|
||||
"text":"Parkolási idõ vége:",
|
||||
"feed":"nl",
|
||||
"styl":"size 11",
|
||||
"styl":"size 01",
|
||||
"vari":"Dynamic04",
|
||||
"vari":"Dynamic03",
|
||||
"styl":"size 00",
|
||||
"feed":"nl"
|
||||
"feed":"nl",
|
||||
"text":"Parkolás helye: ",
|
||||
"feed":"nl",
|
||||
"vari":"location",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
55
etc/psa_config/DC2C_print02.json
Executable file → Normal file
55
etc/psa_config/DC2C_print02.json
Executable file → Normal file
@ -1,31 +1,36 @@
|
||||
{
|
||||
"title":"DC2C_pri02",
|
||||
"project":"Schoenau",
|
||||
"Version":"15.11.2023 00001",
|
||||
"issued":"13.11.2023 01.01",
|
||||
"text":"Standort: ",
|
||||
"feed":"nl",
|
||||
"vari":"location",
|
||||
"feed":"nl",
|
||||
"text":"Bezahlt: ",
|
||||
"styl":"size 11",
|
||||
"vari":"Dynamic07",
|
||||
"feed":"nl",
|
||||
"text":"Összeg: ",
|
||||
"styl":"size 01",
|
||||
"vari":"Dynamic02",
|
||||
"styl":"size 00",
|
||||
"text":"Gedruckt am: ",
|
||||
"vari":"wday deu short",
|
||||
"vari":"date ge",
|
||||
"vari":"time long"
|
||||
"feed":"nl",
|
||||
"text":"Kiadás időpontja:",
|
||||
"feed":"nl",
|
||||
"vari":"date us",
|
||||
"vari":"time short",
|
||||
"feed":"nl",
|
||||
"text":"Automata száma: ",
|
||||
"vari":"manu",
|
||||
"text":"Park.jegy sorsz.: ",
|
||||
"vari":"TickCtr",
|
||||
"feed":"nl",
|
||||
"text":"Szegedi Közlekedési Kft",
|
||||
"feed":"nl",
|
||||
"text":"6720 Szeged ",
|
||||
"feed":"nl",
|
||||
"text":"Zrínyi utca 4-8",
|
||||
"feed":"nl",
|
||||
"text":"Adósz: 11092612-2-06",
|
||||
"feed":"nl",
|
||||
"text":"A jegy ára az ÁFA-t",
|
||||
"feed":"nl",
|
||||
"text":" tartalmazza!",
|
||||
"feed":"nl",
|
||||
"text":"Üf. szolg nyitvatartás:",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
40
etc/psa_config/DC2C_print03.json
Executable file → Normal file
40
etc/psa_config/DC2C_print03.json
Executable file → Normal file
@ -1,38 +1,22 @@
|
||||
{
|
||||
"title":"DC2C_pri03",
|
||||
"project":"Schoenau",
|
||||
"Version":"15.11.2023 00001",
|
||||
"feed":"nl",
|
||||
"project":"DBM Szeged park_coins",
|
||||
"issued":"13.04.2023 01.01",
|
||||
|
||||
"styl":"size 00",
|
||||
"text":"Automat: ",
|
||||
"vari":"manu",
|
||||
"text":"Gruppe: ",
|
||||
"vari":"group",
|
||||
"text":"Zone: ",
|
||||
"vari":"zone",
|
||||
"text":"H - P: 7:45 - 17:00",
|
||||
"feed":"nl",
|
||||
"text":"Ort: ",
|
||||
"vari":"location",
|
||||
"styl":"align c",
|
||||
"text":"Schönau am Königssee",
|
||||
"text":"Tel: (80) 820-500",
|
||||
"feed":"nl",
|
||||
"text":"Ticket-Nr. ",
|
||||
"vari":"TickCtr",
|
||||
"text":"Parkoljon egy érintéssel. ",
|
||||
"feed":"nl",
|
||||
"text":"Automatentechnik ",
|
||||
"text":"Használja bankkártyáját ",
|
||||
"feed":"nl",
|
||||
"text":"Baumann GmbH",
|
||||
"feed":"eject"
|
||||
"text":" automatáinknál is!",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"eject",
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
11
etc/psa_config/DC2C_print04.json
Executable file → Normal file
11
etc/psa_config/DC2C_print04.json
Executable file → Normal file
@ -1,6 +1,9 @@
|
||||
{
|
||||
"title":"DC2C_pri04",
|
||||
"project":"Schoenau",
|
||||
"Version":"15.11.2023 01.01",
|
||||
"text":"";
|
||||
}
|
||||
"project":"empty template",
|
||||
"issued":"09.06.2023 01.01",
|
||||
"styl":"size 00"
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
49
etc/psa_config/DC2C_print05.json
Executable file → Normal file
49
etc/psa_config/DC2C_print05.json
Executable file → Normal file
@ -1,46 +1,41 @@
|
||||
{
|
||||
"title":"DC2C_pri05",
|
||||
"project":"Schoenau",
|
||||
"Version":"15.11.2023 00001",
|
||||
"styl":"font 10",
|
||||
"styl":"size 11",
|
||||
"styl":"align c",
|
||||
"styl":"font 08",
|
||||
"styl":"size 10",
|
||||
"feed":"margin02",
|
||||
"feed":"rim02",
|
||||
"text":"PARKTICKET",
|
||||
"text":"PARKOLÓJEGY",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Bitte gut sichtbar",
|
||||
"text":"Kérjük az elsö szélvédö",
|
||||
"feed":"nl",
|
||||
"text":"hinter die Scheibe",
|
||||
"text":"mögé jól láthatóan",
|
||||
"feed":"nl",
|
||||
"text":"legen",
|
||||
"text":"elhelyezni!",
|
||||
"feed":"nl",
|
||||
"text":"A PARKOLÓ NEM ÕRZÖTT",
|
||||
"feed":"nl",
|
||||
"text":"Please place it clearly visible",
|
||||
"feed":"nl",
|
||||
"text":"behind the",
|
||||
"text":" front windshield!",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"styl":"align l",
|
||||
"text":"Ihr Kennzeichen: ",
|
||||
"feed":"nl",
|
||||
"styl":"size 11",
|
||||
"text":"Rendszám: ",
|
||||
"vari":"Dynamic01",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Parkende: ",
|
||||
"text":"Parkolási idõ vége:",
|
||||
"feed":"nl",
|
||||
"styl":"size 11",
|
||||
"styl":"size 01",
|
||||
"vari":"Dynamic04",
|
||||
"vari":"Dynamic03",
|
||||
"styl":"size 00",
|
||||
"feed":"nl"
|
||||
"feed":"nl",
|
||||
"text":"Parkolás helye: ",
|
||||
"feed":"nl",
|
||||
"vari":"location",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
55
etc/psa_config/DC2C_print06.json
Executable file → Normal file
55
etc/psa_config/DC2C_print06.json
Executable file → Normal file
@ -1,31 +1,36 @@
|
||||
{
|
||||
"title":"DC2C_pri06",
|
||||
"project":"Schoenau",
|
||||
"Version":"15.11.2023 00001",
|
||||
"issued":"13.11.2023 01.01",
|
||||
"text":"Standort: ",
|
||||
"feed":"nl",
|
||||
"vari":"location",
|
||||
"feed":"nl",
|
||||
"text":"Bezahlt: ",
|
||||
"styl":"size 11",
|
||||
"vari":"Dynamic07",
|
||||
"feed":"nl",
|
||||
"text":"Összeg: ",
|
||||
"styl":"size 01",
|
||||
"vari":"Dynamic02",
|
||||
"styl":"size 00",
|
||||
"text":"Gedruckt am: ",
|
||||
"vari":"wday deu short",
|
||||
"vari":"date ge",
|
||||
"vari":"time long"
|
||||
"feed":"nl",
|
||||
"text":"Kiadás időpontja:",
|
||||
"feed":"nl",
|
||||
"vari":"date us",
|
||||
"vari":"time short",
|
||||
"feed":"nl",
|
||||
"text":"Automata száma: ",
|
||||
"vari":"manu",
|
||||
"text":"Park.jegy sorsz.: ",
|
||||
"vari":"TickCtr",
|
||||
"feed":"nl",
|
||||
"text":"Szegedi Közlekedési Kft",
|
||||
"feed":"nl",
|
||||
"text":"6720 Szeged ",
|
||||
"feed":"nl",
|
||||
"text":"Zrínyi utca 4-8",
|
||||
"feed":"nl",
|
||||
"text":"Adósz: 11092612-2-06",
|
||||
"feed":"nl",
|
||||
"text":"A jegy ára az ÁFA-t",
|
||||
"feed":"nl",
|
||||
"text":" tartalmazza!",
|
||||
"feed":"nl",
|
||||
"text":"Üf. szolg nyitvatartás:",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
40
etc/psa_config/DC2C_print07.json
Executable file → Normal file
40
etc/psa_config/DC2C_print07.json
Executable file → Normal file
@ -1,38 +1,22 @@
|
||||
{
|
||||
"title":"DC2C_pri07",
|
||||
"project":"Schoenau",
|
||||
"Version":"15.11.2023 00001",
|
||||
"feed":"nl",
|
||||
"project":"DBM Szeged",
|
||||
"issued":"13.04.2023 01.01",
|
||||
|
||||
"styl":"size 00",
|
||||
"text":"Automat: ",
|
||||
"vari":"manu",
|
||||
"text":"Gruppe: ",
|
||||
"vari":"group",
|
||||
"text":"Zone: ",
|
||||
"vari":"zone",
|
||||
"text":"H - P: 7:45 - 17:00",
|
||||
"feed":"nl",
|
||||
"text":"Ort: ",
|
||||
"vari":"location",
|
||||
"styl":"align c",
|
||||
"text":"Schönau am Königssee",
|
||||
"text":"Tel: (80) 820-500",
|
||||
"feed":"nl",
|
||||
"text":"Ticket-Nr. ",
|
||||
"vari":"TickCtr",
|
||||
"text":"Parkoljon egy érintéssel. ",
|
||||
"feed":"nl",
|
||||
"text":"Automatentechnik ",
|
||||
"text":"Használja bankkártyáját ",
|
||||
"feed":"nl",
|
||||
"text":"Baumann GmbH",
|
||||
"feed":"eject"
|
||||
"text":" automatáinknál is!",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"eject",
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
10
etc/psa_config/DC2C_print08.json
Executable file → Normal file
10
etc/psa_config/DC2C_print08.json
Executable file → Normal file
@ -1,6 +1,8 @@
|
||||
{
|
||||
"title":"DC2C_pri08",
|
||||
"project":"Schoenau",
|
||||
"Version":"15.11.2023 01.01",
|
||||
"text":"";
|
||||
}
|
||||
"project":"empty template",
|
||||
"issued":"09.06.2023 01.01",
|
||||
"styl":"size 00"
|
||||
}
|
||||
|
||||
|
||||
|
41
etc/psa_config/DC2C_print09.json
Normal file
41
etc/psa_config/DC2C_print09.json
Normal file
@ -0,0 +1,41 @@
|
||||
{
|
||||
"title":"DC2C_pri09",
|
||||
"styl":"font 08",
|
||||
"styl":"size 10",
|
||||
"feed":"margin02",
|
||||
"feed":"rim02",
|
||||
"text":"PARKOLÓJEGY",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Kérjük az elsö szélvédö",
|
||||
"feed":"nl",
|
||||
"text":"mögé jól láthatóan",
|
||||
"feed":"nl",
|
||||
"text":"elhelyezni!",
|
||||
"feed":"nl",
|
||||
"text":"A PARKOLÓ NEM ÕRZÖTT",
|
||||
"feed":"nl",
|
||||
"text":"Please place it clearly visible",
|
||||
"feed":"nl",
|
||||
"text":"behind the",
|
||||
"text":" front windshield!",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":"Rendszám: ",
|
||||
"vari":"Dynamic01",
|
||||
"feed":"nl",
|
||||
"text":"Parkolási idõ vége:",
|
||||
"feed":"nl",
|
||||
"styl":"size 01",
|
||||
"vari":"Dynamic04",
|
||||
"vari":"Dynamic03",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Parkolás helye: ",
|
||||
"feed":"nl",
|
||||
"vari":"location",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
}
|
||||
|
||||
|
40
etc/psa_config/DC2C_print10.json
Normal file
40
etc/psa_config/DC2C_print10.json
Normal file
@ -0,0 +1,40 @@
|
||||
{
|
||||
"title":"DC2C_pri10",
|
||||
"styl":"size 01",
|
||||
"text":"Napijegy K",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Összeg: ",
|
||||
"styl":"size 01",
|
||||
"vari":"Dynamic02",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Kiadás időpontja:",
|
||||
"feed":"nl",
|
||||
"vari":"date us",
|
||||
"vari":"time short",
|
||||
"feed":"nl",
|
||||
"text":"Automata száma: ",
|
||||
"vari":"manu",
|
||||
"text":"Park.jegy sorsz.: ",
|
||||
"vari":"TickCtr",
|
||||
"feed":"nl",
|
||||
"text":"Szegedi Közlekedési Kft",
|
||||
"feed":"nl",
|
||||
"text":"6720 Szeged ",
|
||||
"feed":"nl",
|
||||
"text":"Zrínyi utca 4-8",
|
||||
"feed":"nl",
|
||||
"text":"Adósz: 11092612-2-06",
|
||||
"feed":"nl",
|
||||
"text":"A jegy ára az ÁFA-t",
|
||||
"feed":"nl",
|
||||
"text":" tartalmazza!",
|
||||
"feed":"nl",
|
||||
"text":"Üf. szolg nyitvatartás:",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
}
|
||||
|
||||
|
22
etc/psa_config/DC2C_print11.json
Normal file
22
etc/psa_config/DC2C_print11.json
Normal file
@ -0,0 +1,22 @@
|
||||
{
|
||||
"title":"DC2C_pri11",
|
||||
"project":"DBM Szeged",
|
||||
"issued":"13.04.2023 01.01",
|
||||
|
||||
"styl":"size 00",
|
||||
"text":"H - P: 7:45 - 17:00",
|
||||
"feed":"nl",
|
||||
"text":"Tel: (80) 820-500",
|
||||
"feed":"nl",
|
||||
"text":"Parkoljon egy érintéssel. ",
|
||||
"feed":"nl",
|
||||
"text":"Használja bankkártyáját ",
|
||||
"feed":"nl",
|
||||
"text":" automatáinknál is!",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"nl"
|
||||
}
|
||||
|
||||
|
9
etc/psa_config/DC2C_print12.json
Normal file
9
etc/psa_config/DC2C_print12.json
Normal file
@ -0,0 +1,9 @@
|
||||
{
|
||||
"title":"DC2C_pri12",
|
||||
"project":"empty template",
|
||||
"issued":"09.06.2023 01.01",
|
||||
"styl":"size 00"
|
||||
|
||||
}
|
||||
|
||||
|
41
etc/psa_config/DC2C_print13.json
Normal file
41
etc/psa_config/DC2C_print13.json
Normal file
@ -0,0 +1,41 @@
|
||||
{
|
||||
"title":"DC2C_pri13",
|
||||
"styl":"font 08",
|
||||
"styl":"size 10",
|
||||
"feed":"margin02",
|
||||
"feed":"rim02",
|
||||
"text":"PARKOLÓJEGY",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Kérjük az elsö szélvédö",
|
||||
"feed":"nl",
|
||||
"text":"mögé jól láthatóan",
|
||||
"feed":"nl",
|
||||
"text":"elhelyezni!",
|
||||
"feed":"nl",
|
||||
"text":"A PARKOLÓ NEM ÕRZÖTT",
|
||||
"feed":"nl",
|
||||
"text":"Please place it clearly visible",
|
||||
"feed":"nl",
|
||||
"text":"behind the",
|
||||
"text":" front windshield!",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":"Rendszám: ",
|
||||
"vari":"Dynamic01",
|
||||
"feed":"nl",
|
||||
"text":"Parkolási idõ vége:",
|
||||
"feed":"nl",
|
||||
"styl":"size 01",
|
||||
"vari":"Dynamic04",
|
||||
"vari":"Dynamic03",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Parkolás helye: ",
|
||||
"feed":"nl",
|
||||
"vari":"location",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
}
|
||||
|
||||
|
40
etc/psa_config/DC2C_print14.json
Normal file
40
etc/psa_config/DC2C_print14.json
Normal file
@ -0,0 +1,40 @@
|
||||
{
|
||||
"title":"DC2C_pri14",
|
||||
"styl":"size 01",
|
||||
"text":"Napijegy K",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Összeg: ",
|
||||
"styl":"size 01",
|
||||
"vari":"Dynamic02",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Kiadás időpontja:",
|
||||
"feed":"nl",
|
||||
"vari":"date us",
|
||||
"vari":"time short",
|
||||
"feed":"nl",
|
||||
"text":"Automata száma: ",
|
||||
"vari":"manu",
|
||||
"text":"Park.jegy sorsz.: ",
|
||||
"vari":"TickCtr",
|
||||
"feed":"nl",
|
||||
"text":"Szegedi Közlekedési Kft",
|
||||
"feed":"nl",
|
||||
"text":"6720 Szeged ",
|
||||
"feed":"nl",
|
||||
"text":"Zrínyi utca 4-8",
|
||||
"feed":"nl",
|
||||
"text":"Adósz: 11092612-2-06",
|
||||
"feed":"nl",
|
||||
"text":"A jegy ára az ÁFA-t",
|
||||
"feed":"nl",
|
||||
"text":" tartalmazza!",
|
||||
"feed":"nl",
|
||||
"text":"Üf. szolg nyitvatartás:",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
}
|
||||
|
||||
|
22
etc/psa_config/DC2C_print15.json
Normal file
22
etc/psa_config/DC2C_print15.json
Normal file
@ -0,0 +1,22 @@
|
||||
{
|
||||
"title":"DC2C_pri15",
|
||||
"project":"DBM Szeged park_coins",
|
||||
"issued":"13.04.2023 01.01",
|
||||
|
||||
"styl":"size 00",
|
||||
"text":"H - P: 7:45 - 17:00",
|
||||
"feed":"nl",
|
||||
"text":"Tel: (80) 820-500",
|
||||
"feed":"nl",
|
||||
"text":"Parkoljon egy érintéssel. ",
|
||||
"feed":"nl",
|
||||
"text":"Használja bankkártyáját ",
|
||||
"feed":"nl",
|
||||
"text":" automatáinknál is!",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"nl"
|
||||
}
|
||||
|
||||
|
8
etc/psa_config/DC2C_print16.json
Normal file
8
etc/psa_config/DC2C_print16.json
Normal file
@ -0,0 +1,8 @@
|
||||
{
|
||||
"title":"DC2C_pri16",
|
||||
"project":"empty template",
|
||||
"issued":"09.06.2023 01.01",
|
||||
"styl":"size 00"
|
||||
}
|
||||
|
||||
|
25
etc/psa_config/DC2C_print17.json
Normal file
25
etc/psa_config/DC2C_print17.json
Normal file
@ -0,0 +1,25 @@
|
||||
{
|
||||
"title":"DC2C_pri17",
|
||||
"styl":"align l",
|
||||
"feed":"margin01",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"part",
|
||||
"text":"Utazzon tovább közösségi közle-",
|
||||
"feed":"nl",
|
||||
"text":"kedéssel! Ehhez a leválasztható",
|
||||
"feed":"nl",
|
||||
"text":" szelvényhez a közösségi közle- ",
|
||||
"feed":"nl",
|
||||
"text":"kedési járművek (villamos, helyi-",
|
||||
"feed":"nl",
|
||||
"text":"járatos busz,trolibusz,vasútvilla-",
|
||||
"feed":"nl",
|
||||
"text":"mos) bankkártyás fedélzeti jegy-",
|
||||
"feed":"nl",
|
||||
"text":"kiadó automatáiból,illetve a jegy-",
|
||||
"feed":"nl",
|
||||
"feed":"nl"
|
||||
}
|
||||
|
18
etc/psa_config/DC2C_print18.json
Normal file
18
etc/psa_config/DC2C_print18.json
Normal file
@ -0,0 +1,18 @@
|
||||
"title":"DC2C_pri18",
|
||||
"styl":"align l",
|
||||
"feed":"margin01",
|
||||
|
||||
"text":"árusító applikációkból Közterületi",
|
||||
"feed":"nl",
|
||||
"text":"fizető parkolás napijegyhez vál-",
|
||||
"feed":"nl",
|
||||
"text":"tott kiegészítő Körút napijegy vá-",
|
||||
"feed":"nl",
|
||||
"text":"sárolható (ára 440,-Ft)1 fő részé-",
|
||||
"feed":"nl",
|
||||
"text":"re. Ez a napijegy Szeged, Nagy-",
|
||||
"feed":"nl",
|
||||
"text":" körútig bezárólag illetve a Nagy-",
|
||||
"feed":"nl",
|
||||
"feed":"nl"
|
||||
}
|
13
etc/psa_config/DC2C_print19.json
Normal file
13
etc/psa_config/DC2C_print19.json
Normal file
@ -0,0 +1,13 @@
|
||||
{
|
||||
"title":"DC2C_pri19",
|
||||
"styl":"align l",
|
||||
"feed":"margin01",
|
||||
|
||||
"text":"körúton túli első megállóhelytől",
|
||||
"feed":"nl",
|
||||
"text":"vagy megállóhelyig korlátlan uta-",
|
||||
"feed":"nl",
|
||||
"text":"zásra érvényes a parkolás nap-",
|
||||
"feed":"nl",
|
||||
"text":"ján."
|
||||
}
|
28
etc/psa_config/DC2C_print20.json
Normal file
28
etc/psa_config/DC2C_print20.json
Normal file
@ -0,0 +1,28 @@
|
||||
{
|
||||
"title":"DC2C_pri20",
|
||||
"project":"empty template",
|
||||
"issued":"09.06.2023 01.01",
|
||||
"styl":"size 00"
|
||||
|
||||
"text":"Ellenőrzéshez ezt a szelvényt",
|
||||
"feed":"nl",
|
||||
"text":"és az utazásra jogosító papírt" ,
|
||||
"feed":"nl",
|
||||
"text":"vagy elektronikus napijegyet ",
|
||||
"feed":"nl",
|
||||
"text":"együttesen kell bemutatni.",
|
||||
"feed":"nl",
|
||||
"text":"Rendszám: ",
|
||||
"vari":"Dynamic01",
|
||||
"feed":"nl",
|
||||
"text":"Parkolás kezdete:",
|
||||
"text":"(Kék Zóna)",
|
||||
"feed":"nl",
|
||||
"vari":"date us",
|
||||
"vari":"time short",
|
||||
"feed":"nl",
|
||||
"feed":"eject"
|
||||
|
||||
}
|
||||
|
||||
|
40
etc/psa_config/DC2C_print21.json
Normal file
40
etc/psa_config/DC2C_print21.json
Normal file
@ -0,0 +1,40 @@
|
||||
{
|
||||
"title":"DC2C_pri21",
|
||||
"project":"DBM Szeged StartParking",
|
||||
"styl":"size 10",
|
||||
"text":"Igazoló ",
|
||||
"text":"szelvény",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":" Bizonylat ",
|
||||
"feed":"nl",
|
||||
"text":"Szélvédõ mögé NEM",
|
||||
"feed":"nl",
|
||||
"text":"kell kihelyezni!",
|
||||
"feed":"nl",
|
||||
"text":"A PARKOLÓ NEM ÕRZÖTT!",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":"Rendszám: ",
|
||||
"vari":"Dynamic01",
|
||||
"feed":"nl",
|
||||
"text":"Parkolás helye: ",
|
||||
"feed":"nl",
|
||||
"styl":"size 10",
|
||||
"vari":"location",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Zárolt összeg/Ft.: ",
|
||||
"feed":"nl",
|
||||
"styl":"size 11",
|
||||
"vari":"Dynamic02",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Kiadás idõpontja:",
|
||||
"feed":"nl",
|
||||
"vari":"date us",
|
||||
"vari":"time short",
|
||||
"feed":"nl"
|
||||
}
|
||||
|
29
etc/psa_config/DC2C_print22.json
Normal file
29
etc/psa_config/DC2C_print22.json
Normal file
@ -0,0 +1,29 @@
|
||||
"title":"DC2C_pri22",
|
||||
"project":"DBM Szeged StartParking",
|
||||
"styl":"size 00",
|
||||
"text":"Automata száma: ",
|
||||
"vari":"manu",
|
||||
"feed":"nl",
|
||||
"text":"Igazoló sz. sorsz: ",
|
||||
"feed":"nl",
|
||||
"vari":"Dynamic07",
|
||||
"feed":"nl",
|
||||
"vari":"Dynamic08",
|
||||
"feed":"nl",
|
||||
"text":"Az igazolo szelvény",
|
||||
"feed":"nl"
|
||||
"text":"a nyugtával együtt érvényes. ",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":"Üf. szolg nyitvatartás:",
|
||||
"feed":"nl",
|
||||
"text":"Deák Ferenc u. 31.",
|
||||
"feed":"nl",
|
||||
"text":"H - P: 7:45 - 17:00",
|
||||
"feed":"nl",
|
||||
"text":"Tel: (80) 820-500",
|
||||
"feed":"nl",
|
||||
"feed":"nl"
|
||||
}
|
||||
|
||||
|
34
etc/psa_config/DC2C_print23.json
Normal file
34
etc/psa_config/DC2C_print23.json
Normal file
@ -0,0 +1,34 @@
|
||||
"title":"DC2C_pri23",
|
||||
"project":"DBM Szeged StartParking",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Szegedi Közlekedési Kft",
|
||||
"feed":"nl",
|
||||
"text":" 6720 Szeged",
|
||||
"feed":"nl",
|
||||
"text":" Zrínyi utca 4-8.",
|
||||
"feed":"nl",
|
||||
"text":"Adósz: 11092612-2-06",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":"Parkoljon egy érintéssel.",
|
||||
"feed":"nl",
|
||||
"text":"Használja bankkártyáját",
|
||||
"feed":"nl",
|
||||
"text":" automatáinknál is!",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":"Leállító KÓD:",
|
||||
"feed":"nl",
|
||||
"styl":"size 11",
|
||||
"vari":"Dynamic07",
|
||||
"feed":"nl",
|
||||
"vari":"Dynamic08",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"Õrizze meg, tartsa magánál!",
|
||||
"feed":"nl",
|
||||
"feed":"eject"
|
||||
}
|
||||
|
||||
|
39
etc/psa_config/DC2C_print24.json
Normal file
39
etc/psa_config/DC2C_print24.json
Normal file
@ -0,0 +1,39 @@
|
||||
{
|
||||
"title":"DC2C_pri24",
|
||||
"project":"DBM Szeged StopParking",
|
||||
"styl":"size 10"
|
||||
"text":"Parkolójegy",
|
||||
"styl":"size 00"
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":"Nyugta : ",
|
||||
"feed":"nl",
|
||||
"vari":"Dynamic07",
|
||||
"feed":"nl",
|
||||
"vari":"Dynamic08",
|
||||
"feed":"nl",
|
||||
"text":"Rendszám: ",
|
||||
"vari":"Dynamic01",
|
||||
"feed":"nl",
|
||||
"text":"Leállítás helye:",
|
||||
"feed":"nl",
|
||||
"styl":"size 10"
|
||||
"vari":"location",
|
||||
"styl":"size 00",
|
||||
"text":"Leállítás idõpontja:",
|
||||
"feed":"nl",
|
||||
"vari":"date us",
|
||||
"vari":"time short",
|
||||
"feed":"nl",
|
||||
"text":"Automata száma: ",
|
||||
"vari":"manu",
|
||||
"feed":"nl",
|
||||
"text":"Terhelt Összeg: ",
|
||||
"vari":"Dynamic02",
|
||||
"text":"Ft. (BK)",
|
||||
"feed":"nl",
|
||||
"text":"A nyugta az igazoló",
|
||||
"feed":"nl",
|
||||
"text":"szelvénnyel együtt"
|
||||
}
|
||||
|
31
etc/psa_config/DC2C_print25.json
Normal file
31
etc/psa_config/DC2C_print25.json
Normal file
@ -0,0 +1,31 @@
|
||||
{
|
||||
"title":"DC2C_pri25",
|
||||
"project":"DBM Szeged StopParking",
|
||||
"text":"érvényes.",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":"Üf. szolg nyitvatartás:"
|
||||
"feed":"nl",
|
||||
"text":" Arany Janos u. 5",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":" H - P: 7:45 - 17:00",
|
||||
"feed":"nl",
|
||||
"text":" Tel: (80) 820-500",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":"Szegedi Közlekedési Kft",
|
||||
"feed":"nl",
|
||||
"text":" 6720 Szeged ",
|
||||
"feed":"nl",
|
||||
"text":" Zrínyi utca 4-8.",
|
||||
"feed":"nl",
|
||||
"text":"Adósz: 11092612-2-06",
|
||||
"feed":"nl",
|
||||
"text":" A jegy ára az ÁFA-t",
|
||||
"feed":"nl",
|
||||
"text":" tartalmazza!",
|
||||
"feed":"nl"
|
||||
}
|
||||
|
||||
|
17
etc/psa_config/DC2C_print26.json
Normal file
17
etc/psa_config/DC2C_print26.json
Normal file
@ -0,0 +1,17 @@
|
||||
{
|
||||
"title":"DC2C_pri26",
|
||||
"project":"DBM Szeged StopParking",
|
||||
"feed":"nl",
|
||||
"text":"Start azonosító:",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"vari":"Dynamic07",
|
||||
"feed":"nl",
|
||||
"vari":"Dynamic08",
|
||||
"feed":"nl",
|
||||
"text":"Õrizze meg, tartsa magánál!",
|
||||
"feed":"nl",
|
||||
"feed":"eject"
|
||||
}
|
||||
|
||||
|
36
etc/psa_config/DC2C_print27.json
Normal file
36
etc/psa_config/DC2C_print27.json
Normal file
@ -0,0 +1,36 @@
|
||||
{
|
||||
"title":"DC2C_pri27",
|
||||
"project":"DBM Szeged Error",
|
||||
"styl":"size 00",
|
||||
"feed":"nl",
|
||||
"text":"TRANZAKCIÓ ELUTASÍTVA!",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":" Bizonylat",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":"Rendszám: ",
|
||||
"vari":"Dynamic01",
|
||||
"feed":"nl",
|
||||
"text":"Indítás helye:",
|
||||
"feed":"nl",
|
||||
"vari":"location",
|
||||
"feed":"nl",
|
||||
"text":"Kiadás idõpontja:",
|
||||
"feed":"nl",
|
||||
"vari":"date us",
|
||||
"vari":"time short",
|
||||
"feed":"nl",
|
||||
"text":"Automata száma: ",
|
||||
"vari":"manu",
|
||||
"text":"Bizonylat sorsz.: ",
|
||||
"feed":"nl",
|
||||
"vari":"Dynamic07",
|
||||
"feed":"nl",
|
||||
"vari":"Dynamic08",
|
||||
"feed":"nl",
|
||||
"text":"Hibaüzenet: ",
|
||||
"vari":"Dynamic06",
|
||||
"feed":"nl"
|
||||
}
|
||||
|
35
etc/psa_config/DC2C_print28.json
Normal file
35
etc/psa_config/DC2C_print28.json
Normal file
@ -0,0 +1,35 @@
|
||||
{
|
||||
"title":"DC2C_pri28",
|
||||
"project":"DBM Szeged Error",
|
||||
"styl":"size 00",
|
||||
"text":" Üf. szolg nyitvatartás:",
|
||||
"feed":"nl",
|
||||
"text":" Deák Ferenc u. 31. ",
|
||||
"feed":"nl",
|
||||
"text":" H - P: 7:45 - 17:00",
|
||||
"feed":"nl",
|
||||
"text":" Tel: (80) 820-500",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":"Szegedi Közlekedési Kft",
|
||||
"feed":"nl",
|
||||
"text":" 6720",
|
||||
"text":" Szeged ",
|
||||
"feed":"nl",
|
||||
"text":" Zrínyi utca 4-8",
|
||||
"feed":"nl",
|
||||
"text":"Adósz: ",
|
||||
"text":"11092612-2-06",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"text":"Parkoljon egy érintéssel.",
|
||||
"feed":"nl",
|
||||
"text":"Használja bankkártyáját",
|
||||
"feed":"nl",
|
||||
"text":" automatáinknál",
|
||||
"text":" is!",
|
||||
"feed":"nl",
|
||||
"feed":"eject"
|
||||
|
||||
}
|
||||
|
24
etc/psa_config/DC2C_print29.json
Normal file
24
etc/psa_config/DC2C_print29.json
Normal file
@ -0,0 +1,24 @@
|
||||
{
|
||||
"title":"DC2C_pri29",
|
||||
"project":"ATB test",
|
||||
"issued":"24.05.2023 01.00",
|
||||
"styl":"font 08",
|
||||
"styl":"size 11",
|
||||
"feed":"margin02",
|
||||
"feed":"rim02",
|
||||
"text":"All 8 Variables:",
|
||||
"feed":"nl",
|
||||
"vari":"Dynamic01",
|
||||
"vari":"Dynamic02",
|
||||
"vari":"Dynamic03",
|
||||
"vari":"Dynamic04",
|
||||
"vari":"Dynamic05",
|
||||
"vari":"Dynamic06",
|
||||
"vari":"Dynamic07",
|
||||
"vari":"Dynamic08",
|
||||
"feed":"eject",
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
0
etc/psa_config/DC2C_print30.json
Normal file
0
etc/psa_config/DC2C_print30.json
Normal file
40
etc/psa_config/DC2C_print31.json
Executable file → Normal file
40
etc/psa_config/DC2C_print31.json
Executable file → Normal file
@ -1,40 +0,0 @@
|
||||
{
|
||||
"title":"DC2C_pri31",
|
||||
"project":"door close print",
|
||||
"Version":"15.11.2023 00001",
|
||||
"styl":"font 08",
|
||||
"styl":"size 10",
|
||||
"feed":"margin02",
|
||||
"feed":"rim02",
|
||||
"feed":"speed10",
|
||||
"styl":"size 11",
|
||||
"feed":"nl",
|
||||
"text":"Türöffnung um:",
|
||||
"feed":"nl",
|
||||
"styl":"size 00",
|
||||
"vari":"date ge",
|
||||
"vari":"time long",
|
||||
"feed":"nl",
|
||||
"text":"KuNu: ",
|
||||
"vari":"cunu",
|
||||
"text":"MaNu: ",
|
||||
"vari":"manu",
|
||||
"text":"Ort: ",
|
||||
"vari":"location",
|
||||
"text":"Gruppe: ",
|
||||
"vari":"group",
|
||||
"text":"Zone: ",
|
||||
"vari":"zone",
|
||||
"text":"Name: ",
|
||||
"vari":"alias",
|
||||
"feed":"nl",
|
||||
"text":"**Automatentechnik ",
|
||||
"feed":"nl",
|
||||
"text":" Baumann GmbH ***",
|
||||
"feed":"nl",
|
||||
"text":" * * * * * * * * * ",
|
||||
"feed":"nl",
|
||||
"feed":"eject"
|
||||
}
|
||||
|
||||
|
23
etc/psa_config/DC2C_print32.json
Executable file → Normal file
23
etc/psa_config/DC2C_print32.json
Executable file → Normal file
@ -1,42 +1,39 @@
|
||||
{
|
||||
"title":"DC2C_pri32",
|
||||
"project":"refund reciept",
|
||||
"Version":"15.11.2023 00001",
|
||||
"project":"DBM Szeged door",
|
||||
"issued":"18.04.2023 01.01",
|
||||
"styl":"font 08",
|
||||
"styl":"size 10",
|
||||
"feed":"margin02",
|
||||
"feed":"rim02",
|
||||
"feed":"speed10",
|
||||
"styl":"size 11",
|
||||
"text":"Ersatzbeleg",
|
||||
"text":"AJTÓ NYITÁS",
|
||||
"feed":"nl",
|
||||
"styl":"size 00",
|
||||
"text":"Erstattungsbetrag: ",
|
||||
"text":"Door closed",
|
||||
"feed":"nl",
|
||||
"vari":"Dynamic07",
|
||||
"text":"€",
|
||||
"feed":"nl",
|
||||
"text":"KuNu: ",
|
||||
"text":"CuNu: ",
|
||||
"vari":"cunu",
|
||||
"text":"MaNu: ",
|
||||
"vari":"manu",
|
||||
"text":"Ort: ",
|
||||
"text":"Place: ",
|
||||
"vari":"location",
|
||||
"text":"Gruppe: ",
|
||||
"text":"Group: ",
|
||||
"vari":"group",
|
||||
"text":"Zone: ",
|
||||
"vari":"zone",
|
||||
"text":"Name: ",
|
||||
"vari":"alias",
|
||||
"text":"Am: ",
|
||||
"text":"Date: ",
|
||||
"vari":"date us",
|
||||
"text":"Um: ",
|
||||
"text":"Time: ",
|
||||
"vari":"time long",
|
||||
"feed":"nl",
|
||||
"text":" * * * * * * * * ",
|
||||
"feed":"nl",
|
||||
"feed":"nl",
|
||||
"feed":"eject"
|
||||
"feed":"eject",
|
||||
}
|
||||
|
||||
|
||||
|
15
etc/psa_config/test.sh
Executable file
15
etc/psa_config/test.sh
Executable file
@ -0,0 +1,15 @@
|
||||
echo "XXX" >> DC2C_print01.json
|
||||
echo "XXX" >> DC2C_print02.json
|
||||
echo "XXX" >> DC2C_print03.json
|
||||
echo "XXX" >> DC2C_print04.json
|
||||
echo "XXX" >> DC2C_print05.json
|
||||
echo "XXX" >> DC2C_print06.json
|
||||
echo "XXX" >> DC2C_print07.json
|
||||
echo "XXX" >> DC2C_print08.json
|
||||
echo "XXX" >> DC2C_print09.json
|
||||
echo "XXX" >> DC2C_print10.json
|
||||
echo "XXX" >> DC2C_print11.json
|
||||
echo "XXX" >> DC2C_print12.json
|
||||
echo "XXX" >> DC2C_print13.json
|
||||
echo "XXX" >> DC2C_print14.json
|
||||
echo "XXX" >> DC2C_print15.json
|
@ -1132,4 +1132,3 @@
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
@ -1 +1,39 @@
|
||||
###############################################################################
|
||||
# !!! NOTE !!!
|
||||
###############################################################################
|
||||
# opkg-commands added to this file will be executed by ATBUpdateTool.
|
||||
###############################################################################
|
||||
# opkg prefix will be added inside evaluating script
|
||||
#
|
||||
# 2023-06-30: test-1
|
||||
# 2023-06-30: test-2
|
||||
# 2023-06-30: return to usual workflow
|
||||
# 2023-06-30: test update atbqt in Szeged
|
||||
# 2023-06-30: 2. test update atbqt in Szeged
|
||||
# 2023-06-30: 4. test update atbqt in Szeged
|
||||
# 2023-07-17-1: test
|
||||
# 2023-07-18-1: test
|
||||
# 2023-07-18-2: test
|
||||
# 2023-07-18-3: test
|
||||
# 2023-07-18-4: test
|
||||
# 2023-07-18-5: test
|
||||
# 2023-07-18-6: test
|
||||
# 2023-07-18-7: test
|
||||
# 2023-07-18-8: test
|
||||
# 2023-07-18-9: test
|
||||
# 2023-07-18-10: test
|
||||
# 2023-07-18-11: test
|
||||
# 2023-07-18-12: test
|
||||
# 2023-07-18-13: test
|
||||
# 2023-07-18-14: test
|
||||
# 2023-07-19-1: test
|
||||
# 2023-07-19-2: test via service-menu
|
||||
# 2023-07-26-1: test
|
||||
# opkg info ptu5-gitinstaller
|
||||
# opkg info atbqt
|
||||
opkg update
|
||||
opkg info atbupdatetool
|
||||
# opkg install ptu5-gitinstaller
|
||||
# opkg install atbqt
|
||||
# opkg info ptu5-gitinstaller
|
||||
# opkg info atbqt
|
||||
|
0
etc/psa_update/post_install_commands.sh
Normal file
0
etc/psa_update/post_install_commands.sh
Normal file
0
etc/psa_update/pre_install_commands.sh
Normal file
0
etc/psa_update/pre_install_commands.sh
Normal file
@ -1 +1,90 @@
|
||||
# Thu Jul 13 15:02:54 CEST 2023
|
||||
[ATBDeviceControllerPlugin]
|
||||
serialPort=ttymxc2
|
||||
|
||||
[COMMON]
|
||||
%23ooo_mode={useDisk|otherMachine}
|
||||
%23useLanguage=[128+][64+][32+][16]
|
||||
%23usePayment=[128+][64+][32+][16]
|
||||
%23useProduct=[128+][64+][32+][16+][8]
|
||||
%23useVehicle=[128+][64+][32+][16+][8]
|
||||
CharacterSet=ISO 8859-2
|
||||
alternativeLogoFile=
|
||||
com_baud_rate=9600
|
||||
com_port_name=/dev/ttyS1
|
||||
defaultLanguage=1
|
||||
feature_DBusDisplayControl=on
|
||||
feature_DBusDisplayDimLow=off
|
||||
feature_DBusSuspendControl=on
|
||||
feature_DisplayControl=off
|
||||
feature_Log=off
|
||||
feature_ShowParkingTime=off
|
||||
feature_StartButton=on
|
||||
feature_SystemSuspend=off
|
||||
feature_TouchFeedback=off
|
||||
feature_selfOOO=off
|
||||
lang1=hu_HU
|
||||
lang2=en_GB
|
||||
lang3=de_DE
|
||||
lang4=sr
|
||||
lang5=ro_RO
|
||||
logfile=/var/log/atbqt.log
|
||||
ooo_alternativeLocation=
|
||||
ooo_mode=otherMachine
|
||||
ooo_serviceEmail=
|
||||
ooo_serviceNumber=
|
||||
sellTimeout_time=60
|
||||
showHelpButton=false
|
||||
showInfoButton=false
|
||||
statefile=/opt/app/ATBAPP/states/APP_States.xml
|
||||
suspend_methode=sysfs
|
||||
suspend_program=
|
||||
suspend_time=8
|
||||
textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
|
||||
touch_feedback_gpio=121
|
||||
touch_feedback_off_value=0
|
||||
touch_feedback_on_value=1
|
||||
useAppStates=1
|
||||
useLanguage=240
|
||||
usePayment=96
|
||||
useProduct=240
|
||||
useVehicle=240
|
||||
|
||||
[IngenicoISelf_CCPlugin]
|
||||
Currency=HUF
|
||||
PortName=/dev/ttymxc0
|
||||
ZVT=DE
|
||||
debug=1
|
||||
sleep=1
|
||||
sleepExtended=1
|
||||
|
||||
[MOBILISIS_CalculatePricePlugin]
|
||||
tariffFileName=/etc/psa_tariff/tariff01.json
|
||||
useDebug=1
|
||||
|
||||
[PAYMENT]
|
||||
cashVariant=CoinsOnly
|
||||
currencyISOCode=HUF
|
||||
currencySymbol=Ft
|
||||
paymentPointInTime=poa
|
||||
useHonestPayment=on
|
||||
|
||||
[PLUGINS]
|
||||
CCPlugin=IngenicoISelf_CCPlugin
|
||||
CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
|
||||
DeviceControllerPlugin=ATBDeviceControllerPlugin
|
||||
|
||||
[SCREENCONFIG]
|
||||
sc_31="1,1,0"
|
||||
sc_33="1,0,1"
|
||||
sc_35="0,0,0"
|
||||
sc_3F="1,0,0"
|
||||
sc_40="1,0,1"
|
||||
sc_41="1,0,1"
|
||||
sc_51="1,0,1"
|
||||
sc_52="1,0,0"
|
||||
sc_53="1,0,0"
|
||||
|
||||
[TCP_CONTROL]
|
||||
enable=1
|
||||
|
||||
###
|
||||
|
Loading…
Reference in New Issue
Block a user