Skip to content

Commit 3061725

Browse files
0xc01700xc0170
authored
Merge pull request ARMmbed#14379 from OpenNuvoton/nvt_high_res_pwm
Nuvoton: Enlarge NuMaker PWM duty cycle range
2 parents dd7ca06 + 5b693ff commit 3061725

File tree

18 files changed

+45
-45
lines changed

18 files changed

+45
-45
lines changed

‎targets/TARGET_NUVOTON/TARGET_M251/device/StdDriver/inc/m251_pwm.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ uint32_t PWM_ConfigOutputChannel(PWM_T *pwm, uint32_t u32ChannelNum, uint32_t u3
475475
uint32_t PWM_ConfigOutputChannel2(PWM_T *epwm,
476476
uint32_t u32ChannelNum,
477477
uint32_t u32Frequency,
478-
uint32_t u32DutyCycle,
478+
uint32_t u32HighDutyCycle,
479479
uint32_t u32Frequency2);
480480
void PWM_Start(PWM_T *pwm, uint32_t u32ChannelMask);
481481
void PWM_Stop(PWM_T *pwm, uint32_t u32ChannelMask);

‎targets/TARGET_NUVOTON/TARGET_M251/device/StdDriver/src/m251_pwm.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ uint32_t PWM_ConfigCaptureChannel(PWM_T *pwm, uint32_t u32ChannelNum, uint32_t u
145145
*/
146146
uint32_t PWM_ConfigOutputChannel(PWM_T *pwm, uint32_t u32ChannelNum, uint32_t u32Frequency, uint32_t u32DutyCycle)
147147
{
148-
return PWM_ConfigOutputChannel2(pwm, u32ChannelNum, u32Frequency, u32DutyCycle, 1);
148+
return PWM_ConfigOutputChannel2(pwm, u32ChannelNum, u32Frequency, u32DutyCycle*100, 1);
149149
}
150150

151151
/**
@@ -155,13 +155,13 @@ uint32_t PWM_ConfigOutputChannel(PWM_T *pwm, uint32_t u32ChannelNum, uint32_t u3
155155
* - PWM1 : PWM Group 1
156156
* @param[in] u32ChannelNum PWM channel number. Valid values are between 0~5
157157
* @param[in] u32Frequency Target generator frequency = u32Frequency / u32Frequency2
158-
* @param[in] u32DutyCycle Target generator duty cycle percentage. Valid range are between 0 ~ 100. 10 means 10%, 20 means 20%...
158+
* @param[in] u32HighDutyCycle Target generator duty cycle percentage. Valid range are between 0 ~ 10000. 1000 means 10%, 2000 means 20%...
159159
* @param[in] u32Frequency2 Target generator frequency = u32Frequency / u32Frequency2
160160
* @return Nearest frequency clock in nano second
161161
* @note Since every two channels, (0 & 1), (2 & 3), shares a prescaler. Call this API to configure PWM frequency may affect
162162
* existing frequency of other channel.
163163
*/
164-
uint32_t PWM_ConfigOutputChannel2(PWM_T *pwm, uint32_t u32ChannelNum, uint32_t u32Frequency, uint32_t u32DutyCycle, uint32_t u32Frequency2)
164+
uint32_t PWM_ConfigOutputChannel2(PWM_T *pwm, uint32_t u32ChannelNum, uint32_t u32Frequency, uint32_t u32HighDutyCycle, uint32_t u32Frequency2)
165165
{
166166
uint32_t u32Src;
167167
uint32_t u32PWMClockSrc;
@@ -219,12 +219,12 @@ uint32_t PWM_ConfigOutputChannel2(PWM_T *pwm, uint32_t u32ChannelNum, uint32_t u
219219
u16CNR -= 1UL;
220220
PWM_SET_CNR(pwm, u32ChannelNum, u16CNR);
221221

222-
if (u32DutyCycle)
222+
if (u32HighDutyCycle)
223223
{
224-
if (u32DutyCycle >= 100UL)
224+
if (u32HighDutyCycle >= 10000UL)
225225
PWM_SET_CMR(pwm, u32ChannelNum, u16CNR);
226226
else
227-
PWM_SET_CMR(pwm, u32ChannelNum, u32DutyCycle * (u16CNR + 1UL) / 100UL);
227+
PWM_SET_CMR(pwm, u32ChannelNum, u32HighDutyCycle * (u16CNR + 1UL) / 10000UL);
228228

229229
(pwm)->WGCTL0 &= ~((PWM_WGCTL0_PRDPCTL0_Msk | PWM_WGCTL0_ZPCTL0_Msk) << (u32ChannelNum << 1UL));
230230
(pwm)->WGCTL0 |= (PWM_OUTPUT_LOW << ((u32ChannelNum << 1UL) + PWM_WGCTL0_PRDPCTL0_Pos));

‎targets/TARGET_NUVOTON/TARGET_M251/pwmout_api.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,10 @@ static void pwmout_config(pwmout_t *obj, int start)
195195

196196
// NOTE: Support period < 1s
197197
// NOTE: ARM mbed CI test fails due to first PWM pulse error. Workaround by:
198-
// 1. Inverse duty cycle (100 - duty)
198+
// 1. Inverse duty cycle (10000 - duty)
199199
// 2. Inverse PWM output polarity
200200
// This trick is here to pass ARM mbed CI test. First PWM pulse error still remains.
201-
PWM_ConfigOutputChannel2(pwm_base, chn, 1000 * 1000, 100 - obj->pulsewidth_us * 100 / obj->period_us, obj->period_us);
201+
PWM_ConfigOutputChannel2(pwm_base, chn, 1000 * 1000, 10000 - obj->pulsewidth_us * 10000 / obj->period_us, obj->period_us);
202202
pwm_base->POLCTL |= 1 << (PWM_POLCTL_PINV0_Pos + chn);
203203

204204
if (start) {

‎targets/TARGET_NUVOTON/TARGET_M261/device/StdDriver/m261_epwm.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ uint32_t EPWM_ConfigCaptureChannel(EPWM_T *epwm, uint32_t u32ChannelNum, uint32_
126126
*/
127127
uint32_t EPWM_ConfigOutputChannel(EPWM_T *epwm, uint32_t u32ChannelNum, uint32_t u32Frequency, uint32_t u32DutyCycle)
128128
{
129-
return EPWM_ConfigOutputChannel2(epwm, u32ChannelNum, u32Frequency, u32DutyCycle, 1);
129+
return EPWM_ConfigOutputChannel2(epwm, u32ChannelNum, u32Frequency, u32DutyCycle*100, 1);
130130
}
131131

132132
/**
@@ -136,15 +136,15 @@ uint32_t EPWM_ConfigOutputChannel(EPWM_T *epwm, uint32_t u32ChannelNum, uint32_t
136136
* - EPWM1 : EPWM Group 1
137137
* @param[in] u32ChannelNum EPWM channel number. Valid values are between 0~5
138138
* @param[in] u32Frequency Target generator frequency
139-
* @param[in] u32DutyCycle Target generator duty cycle percentage. Valid range are between 0 ~ 100. 10 means 10%, 20 means 20%...
139+
* @param[in] u32HighDutyCycle Target generator duty cycle percentage. Valid range are between 0 ~ 10000. 1000 means 10%, 2000 means 20%...
140140
* @param[in] u32Frequency2 Target generator frequency = u32Frequency / u32Frequency2
141141
* @return Nearest frequency clock in nano second
142142
* @note Since every two channels, (0 & 1), (2 & 3), shares a prescaler. Call this API to configure EPWM frequency may affect
143143
* existing frequency of other channel.
144144
* @note This function is used for initial stage.
145145
* To change duty cycle later, it should get the configured period value and calculate the new comparator value.
146146
*/
147-
uint32_t EPWM_ConfigOutputChannel2(EPWM_T *epwm, uint32_t u32ChannelNum, uint32_t u32Frequency, uint32_t u32DutyCycle, uint32_t u32Frequency2)
147+
uint32_t EPWM_ConfigOutputChannel2(EPWM_T *epwm, uint32_t u32ChannelNum, uint32_t u32Frequency, uint32_t u32HighDutyCycle, uint32_t u32Frequency2)
148148
{
149149
uint32_t u32PWMClockSrc;
150150
uint32_t i;
@@ -183,7 +183,7 @@ uint32_t EPWM_ConfigOutputChannel2(EPWM_T *epwm, uint32_t u32ChannelNum, uint32_
183183

184184
u32CNR = u32CNR - 1U;
185185
EPWM_SET_CNR(epwm, u32ChannelNum, u32CNR);
186-
EPWM_SET_CMR(epwm, u32ChannelNum, u32DutyCycle * (u32CNR + 1UL) / 100UL);
186+
EPWM_SET_CMR(epwm, u32ChannelNum, u32HighDutyCycle * (u32CNR + 1UL) / 10000UL);
187187

188188
(epwm)->WGCTL0 = ((epwm)->WGCTL0 & ~((EPWM_WGCTL0_PRDPCTL0_Msk | EPWM_WGCTL0_ZPCTL0_Msk) << (u32ChannelNum << 1))) | \
189189
(EPWM_OUTPUT_HIGH << (u32ChannelNum << 1UL << EPWM_WGCTL0_ZPCTL0_Pos));

‎targets/TARGET_NUVOTON/TARGET_M261/device/StdDriver/m261_epwm.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ uint32_t EPWM_ConfigOutputChannel(EPWM_T *epwm, uint32_t u32ChannelNum, uint32_t
566566
uint32_t EPWM_ConfigOutputChannel2(EPWM_T *epwm,
567567
uint32_t u32ChannelNum,
568568
uint32_t u32Frequency,
569-
uint32_t u32DutyCycle,
569+
uint32_t u32HighDutyCycle,
570570
uint32_t u32Frequency2);
571571
void EPWM_Start(EPWM_T *epwm, uint32_t u32ChannelMask);
572572
void EPWM_Stop(EPWM_T *epwm, uint32_t u32ChannelMask);

‎targets/TARGET_NUVOTON/TARGET_M261/pwmout_api.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,10 @@ static void pwmout_config(pwmout_t *obj, int start)
195195

196196
// NOTE: Support period < 1s
197197
// NOTE: ARM mbed CI test fails due to first PWM pulse error. Workaround by:
198-
// 1. Inverse duty cycle (100 - duty)
198+
// 1. Inverse duty cycle (10000 - duty)
199199
// 2. Inverse PWM output polarity
200200
// This trick is here to pass ARM mbed CI test. First PWM pulse error still remains.
201-
EPWM_ConfigOutputChannel2(pwm_base, chn, 1000 * 1000, 100 - obj->pulsewidth_us * 100 / obj->period_us, obj->period_us);
201+
EPWM_ConfigOutputChannel2(pwm_base, chn, 1000 * 1000, 10000 - obj->pulsewidth_us * 10000 / obj->period_us, obj->period_us);
202202
pwm_base->POLCTL |= 1 << (EPWM_POLCTL_PINV0_Pos + chn);
203203

204204
if (start) {

‎targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_pwm.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ uint32_t PWM_ConfigOutputChannel (PWM_T *pwm,
107107
uint32_t u32Frequency,
108108
uint32_t u32DutyCycle)
109109
{
110-
return PWM_ConfigOutputChannel2(pwm, u32ChannelNum, u32Frequency, u32DutyCycle, 1);
110+
return PWM_ConfigOutputChannel2(pwm, u32ChannelNum, u32Frequency, u32DutyCycle*100, 1);
111111
}
112112

113113
/**
114114
* @brief This function config PWM generator and get the nearest frequency in edge aligned auto-reload mode
115115
* @param[in] pwm The base address of PWM module
116116
* @param[in] u32ChannelNum PWM channel number. Valid values are between 0~5
117117
* @param[in] u32Frequency Target generator frequency = u32Frequency / u32Frequency2
118-
* @param[in] u32DutyCycle Target generator duty cycle percentage. Valid range are between 0 ~ 100. 10 means 10%, 20 means 20%...
118+
* @param[in] u32HighDutyCycle Target generator duty cycle percentage. Valid range are between 0 ~ 10000. 1000 means 10%, 2000 means 20%...
119119
* @param[in] u32Frequency2 Target generator frequency = u32Frequency / u32Frequency2
120120
* @return Nearest frequency clock in nano second
121121
* @note Since every two channels, (0 & 1), (2 & 3), (4 & 5), shares a prescaler. Call this API to configure PWM frequency may affect
@@ -124,7 +124,7 @@ uint32_t PWM_ConfigOutputChannel (PWM_T *pwm,
124124
uint32_t PWM_ConfigOutputChannel2(PWM_T *pwm,
125125
uint32_t u32ChannelNum,
126126
uint32_t u32Frequency,
127-
uint32_t u32DutyCycle,
127+
uint32_t u32HighDutyCycle,
128128
uint32_t u32Frequency2)
129129
{
130130
uint32_t u32Src;
@@ -176,9 +176,9 @@ uint32_t PWM_ConfigOutputChannel2(PWM_T *pwm,
176176
(pwm)->CTL1 &= ~(PWM_CTL1_CNTMODE0_Msk << u32ChannelNum);
177177

178178
PWM_SET_CNR(pwm, u32ChannelNum, --u16CNR);
179-
if(u32DutyCycle)
179+
if(u32HighDutyCycle)
180180
{
181-
PWM_SET_CMR(pwm, u32ChannelNum, u32DutyCycle * (u16CNR + 1) / 100 - 1);
181+
PWM_SET_CMR(pwm, u32ChannelNum, u32HighDutyCycle * (u16CNR + 1) / 10000 - 1);
182182
(pwm)->WGCTL0 &= ~((PWM_WGCTL0_PRDPCTL0_Msk | PWM_WGCTL0_ZPCTL0_Msk) << (u32ChannelNum * 2));
183183
(pwm)->WGCTL0 |= (PWM_OUTPUT_LOW << (u32ChannelNum * 2 + PWM_WGCTL0_PRDPCTL0_Pos));
184184
(pwm)->WGCTL1 &= ~((PWM_WGCTL1_CMPDCTL0_Msk | PWM_WGCTL1_CMPUCTL0_Msk) << (u32ChannelNum * 2));

‎targets/TARGET_NUVOTON/TARGET_M451/device/StdDriver/m451_pwm.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ uint32_t PWM_ConfigOutputChannel(PWM_T *pwm, uint32_t u32ChannelNum, uint32_t u3
476476
uint32_t PWM_ConfigOutputChannel2(PWM_T *pwm,
477477
uint32_t u32ChannelNum,
478478
uint32_t u32Frequency,
479-
uint32_t u32DutyCycle,
479+
uint32_t u32HighDutyCycle,
480480
uint32_t u32Frequency2);
481481
void PWM_Start(PWM_T *pwm, uint32_t u32ChannelMask);
482482
void PWM_Stop(PWM_T *pwm, uint32_t u32ChannelMask);

‎targets/TARGET_NUVOTON/TARGET_M451/pwmout_api.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ static void pwmout_config(pwmout_t *obj)
195195
uint32_t chn = NU_MODSUBINDEX(obj->pwm);
196196
// NOTE: Support period < 1s
197197
//PWM_ConfigOutputChannel(pwm_base, chn, 1000 * 1000 / obj->period_us, obj->pulsewidth_us * 100 / obj->period_us);
198-
PWM_ConfigOutputChannel2(pwm_base, chn, 1000 * 1000, obj->pulsewidth_us * 100 / obj->period_us, obj->period_us);
198+
PWM_ConfigOutputChannel2(pwm_base, chn, 1000 * 1000, obj->pulsewidth_us * 10000 / obj->period_us, obj->period_us);
199199
}
200200

201201
const PinMap *pwmout_pinmap()

‎targets/TARGET_NUVOTON/TARGET_M480/device/StdDriver/inc/m480_epwm.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ uint32_t EPWM_ConfigOutputChannel(EPWM_T *epwm, uint32_t u32ChannelNum, uint32_t
541541
uint32_t EPWM_ConfigOutputChannel2(EPWM_T *epwm,
542542
uint32_t u32ChannelNum,
543543
uint32_t u32Frequency,
544-
uint32_t u32DutyCycle,
544+
uint32_t u32HighDutyCycle,
545545
uint32_t u32Frequency2);
546546
void EPWM_Start(EPWM_T *epwm, uint32_t u32ChannelMask);
547547
void EPWM_Stop(EPWM_T *epwm, uint32_t u32ChannelMask);

0 commit comments

Comments
 (0)