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-01-27 13:35:17 +00:00
parent d6a6f0f1fd 10ec331740
commit e497628e7d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cam.c
View File

@ -155,14 +155,14 @@ static int mk_cam(facilities_t* facilities, uint8_t *cam_oer, uint32_t *cam_len)
// Acceleration Control (encondig failure) // Acceleration Control (encondig failure)
if(shared_message->b_pedal_value != 1683 && shared_message->s_pedal_value != 1683){ if(shared_message->b_pedal_value != 1683 && shared_message->s_pedal_value != 1683){
if(shared_message->b_pedal_value) if(shared_message->b_pedal_value)
ac = ac | 0x01; ac = ac | 0x80;
if(shared_message->s_pedal_value) if(shared_message->s_pedal_value)
ac = ac | 0x02; ac = ac | 0x40;
bvc_hf->accelerationControl = calloc(1, sizeof(AccelerationControl_t)); bvc_hf->accelerationControl = calloc(1, sizeof(AccelerationControl_t));
bvc_hf->accelerationControl->buf = malloc(sizeof(uint8_t)); bvc_hf->accelerationControl->buf = malloc(sizeof(uint8_t));
memcpy(bvc_hf->accelerationControl->buf, &ac, 1); memcpy(bvc_hf->accelerationControl->buf, &ac, 1);
bvc_hf->accelerationControl->size = 1; bvc_hf->accelerationControl->size = 1;
bvc_hf->accelerationControl->bits_unused = 0; bvc_hf->accelerationControl->bits_unused = 1;
} }
} }

2
src/cpm.c
View File

@ -155,7 +155,7 @@ dissemination_t* dissemination_init(){
int dissemination_check(dissemination_t* dissemination, it2s_tender_epv_t* epv, int f) { int dissemination_check(dissemination_t* dissemination, it2s_tender_epv_t* epv, int f) {
int rv; int rv = 0;
uint64_t now = it2s_tender_get_clock(epv); uint64_t now = it2s_tender_get_clock(epv);