TiagoRG
/
it2s-itss-facilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
emanuel 2022-07-26 13:33:46 +01:00
parent ded1ae5c9e 140c7fc744
commit 41dbcccf1f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -31,8 +31,10 @@ deploy release:
stage: deploy release stage: deploy release
script: script:
- curl http://192.168.94.221:3000/it2s-itss-facilities-git - curl http://192.168.94.221:3000/it2s-itss-facilities-git
- curl http://192.168.94.221:3002/it2s-itss-facilities-git
deploy debug: deploy debug:
stage: deploy debug stage: deploy debug
script: script:
- curl http://192.168.94.221:3000/it2s-itss-facilities-debug-git - curl http://192.168.94.221:3000/it2s-itss-facilities-debug-git
- curl http://192.168.94.221:3002/it2s-itss-facilities-debug-git

4
src/saem.c
View File

@ -182,7 +182,7 @@ int mk_saem(facilities_t* facilities, uint8_t* b_saem, uint32_t* b_saem_len) {
uint8_t buf[1024]; uint8_t buf[1024];
for (int i = 0; i < facilities->tolling.infos.length; ++i) { for (int i = 0; i < facilities->tolling.infos.length; ++i) {
saem->sam.body.serviceInfos->list.array[i] = calloc(1, sizeof(ServiceInfo_t)); saem->sam.body.serviceInfos->list.array[i] = calloc(1, sizeof(ServiceInfo_t));
saem->sam.body.serviceInfos->list.array[i]->serviceID = 0; saem->sam.body.serviceInfos->list.array[i]->serviceID = 1;
saem->sam.body.serviceInfos->list.array[i]->chOptions.extensions = calloc(1, sizeof(ServiceInfoExts_t)); saem->sam.body.serviceInfos->list.array[i]->chOptions.extensions = calloc(1, sizeof(ServiceInfoExts_t));
@ -374,7 +374,7 @@ void *sa_service(void *fc) {
for (int a = 0; a < bulletin->to_consume_len; ++a) { for (int a = 0; a < bulletin->to_consume_len; ++a) {
// Tolling // Tolling
if (facilities->tolling.enabled && if (facilities->tolling.enabled &&
bulletin->to_consume[a]->its_aid == 0 && bulletin->to_consume[a]->its_aid == 1 &&
now > bulletin->to_consume[a]->t_trigger + TOLLING_PAYMENT_MIN_PERIOD_MS && now > bulletin->to_consume[a]->t_trigger + TOLLING_PAYMENT_MIN_PERIOD_MS &&
facilities->station_type != 15) { facilities->station_type != 15) {