rusefi
/
ChibiOS-Contrib
mirror of https://github.com/rusefi/ChibiOS-Contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed bad commit

This commit is contained in:
Stephane D'Alu 2016-11-24 21:50:14 +01:00
parent f2ff03a634
commit d2b5649b0f
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
os/hal/ports/NRF5/NRF51822/hal_pwm_lld.c
View File

@ -71,7 +71,6 @@ PWMDriver PWMD3;
/*===========================================================================*/
static const uint8_t pwm_margin_by_prescaler[] = {
<<<<<<< HEAD
(PWM_GPIOTE_DECISION_TIME + 0) >> 0,
(PWM_GPIOTE_DECISION_TIME + 1) >> 1,
(PWM_GPIOTE_DECISION_TIME + 3) >> 2,
@ -82,18 +81,6 @@ static const uint8_t pwm_margin_by_prescaler[] = {
(PWM_GPIOTE_DECISION_TIME + 127) >> 7,
(PWM_GPIOTE_DECISION_TIME + 255) >> 8,
(PWM_GPIOTE_DECISION_TIME + 511) >> 9
=======
(PWM_GPIOTE_DECISION_TIME + 0) >> 0,
(PWM_GPIOTE_DECISION_TIME + 1) >> 1,
(PWM_GPIOTE_DECISION_TIME + 3) >> 2,
(PWM_GPIOTE_DECISION_TIME + 7) >> 3,
(PWM_GPIOTE_DECISION_TIME + 15) >> 4,
(PWM_GPIOTE_DECISION_TIME + 31) >> 5,
(PWM_GPIOTE_DECISION_TIME + 63) >> 6,
(PWM_GPIOTE_DECISION_TIME + 127) >> 7,
(PWM_GPIOTE_DECISION_TIME + 255) >> 8,
(PWM_GPIOTE_DECISION_TIME + 511) >> 9
>>>>>>> 0c9313ee3db5fd2eb75cbf1c9df9313e316d5123
};
/*===========================================================================*/