diff options
| author | Stephane D'Alu <sdalu@sdalu.com> | 2016-11-24 21:48:41 +0100 |
|---|---|---|
| committer | Stephane D'Alu <sdalu@sdalu.com> | 2016-11-24 21:48:41 +0100 |
| commit | f2ff03a6340f2d70d58fda1e8c29815487c434c1 (patch) | |
| tree | 5c78ded43101592a1aede639f5ba23f1cabd59f1 /os/hal/ports/NRF5 | |
| parent | 13bb299950d2e1631ffb59c505fb0d927247d811 (diff) | |
| parent | 0c9313ee3db5fd2eb75cbf1c9df9313e316d5123 (diff) | |
| download | ChibiOS-Contrib-f2ff03a6340f2d70d58fda1e8c29815487c434c1.tar.gz ChibiOS-Contrib-f2ff03a6340f2d70d58fda1e8c29815487c434c1.tar.bz2 ChibiOS-Contrib-f2ff03a6340f2d70d58fda1e8c29815487c434c1.zip | |
Merge branch 'pwmfix' of https://github.com/sdalu/ChibiOS-Contrib into pwmfix
Conflicts:
os/hal/ports/NRF5/NRF51822/hal_pwm_lld.c
Diffstat (limited to 'os/hal/ports/NRF5')
| -rw-r--r-- | os/hal/ports/NRF5/NRF51822/hal_pwm_lld.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/os/hal/ports/NRF5/NRF51822/hal_pwm_lld.c b/os/hal/ports/NRF5/NRF51822/hal_pwm_lld.c index e2b4b6b..ba8ed16 100644 --- a/os/hal/ports/NRF5/NRF51822/hal_pwm_lld.c +++ b/os/hal/ports/NRF5/NRF51822/hal_pwm_lld.c @@ -71,6 +71,7 @@ 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,
@@ -81,6 +82,18 @@ 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 };
/*===========================================================================*/
|