Merge pull request #3917 from TomoYamanaka/master

Fix  mistake register setting in serial_format()
pull/3939/head
Anna Bridge 2017-03-14 14:42:21 +00:00 committed by GitHub
commit 5495e24793
1 changed files with 5 additions and 4 deletions

View File

@ -398,10 +398,11 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
break;
}
obj->serial.uart->SCSMR = data_bits << 6
| parity_enable << 5
| parity_select << 4
| stop_bits << 3;
obj->serial.uart->SCSMR = (obj->serial.uart->SCSMR & ~0x0078)
| (data_bits << 6)
| (parity_enable << 5)
| (parity_select << 4)
| (stop_bits << 3);
}
/******************************************************************************