fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

nrf/modules/machine/pwm: Add paramter checks and error messages.

Browse Source
This commit is contained in:
robert-hh 2023-03-04 11:36:54 +01:00 committed by Damien George
parent b336b6bb74
commit cf43df4caa
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/nrf/modules/machine/pwm.c
View File

@ -97,7 +97,6 @@ STATIC int hard_pwm_find(mp_obj_t id) {
if (pwm_id >= 0 && pwm_id < MP_ARRAY_SIZE(machine_hard_pwm_obj)) { if (pwm_id >= 0 && pwm_id < MP_ARRAY_SIZE(machine_hard_pwm_obj)) {
return pwm_id; return pwm_id;
} }
mp_raise_ValueError(MP_ERROR_TEXT("PWM doesn't exist"));
} }
return -1; return -1;
} }
@ -231,19 +230,22 @@ STATIC mp_obj_t machine_hard_pwm_make_new(mp_arg_val_t *args) {
enum { ARG_id, ARG_pin, ARG_freq, ARG_period, ARG_duty, ARG_pulse_width, ARG_mode }; enum { ARG_id, ARG_pin, ARG_freq, ARG_period, ARG_duty, ARG_pulse_width, ARG_mode };
// get static peripheral object // get static peripheral object
int pwm_id = hard_pwm_find(args[ARG_id].u_obj); int pwm_id = hard_pwm_find(args[ARG_id].u_obj);
if (pwm_id < 0) {
mp_raise_ValueError(MP_ERROR_TEXT("invalid or missing PWM id"));
}
const machine_hard_pwm_obj_t *self = &machine_hard_pwm_obj[pwm_id]; const machine_hard_pwm_obj_t *self = &machine_hard_pwm_obj[pwm_id];
// check if PWM pin is set // check if PWM pin is set
if (args[ARG_pin].u_obj != MP_OBJ_NULL) { if (args[ARG_pin].u_obj != MP_OBJ_NULL) {
self->p_config->pwm_pin = mp_hal_get_pin_obj(args[ARG_pin].u_obj)->pin; self->p_config->pwm_pin = mp_hal_get_pin_obj(args[ARG_pin].u_obj)->pin;
} else { } else {
// TODO: raise exception. mp_raise_ValueError(MP_ERROR_TEXT("Pin missing"));
} }
if (args[ARG_freq].u_obj != MP_OBJ_NULL) { if (args[ARG_freq].u_obj != MP_OBJ_NULL) {
self->p_config->freq = mp_obj_get_int(args[ARG_freq].u_obj); self->p_config->freq = mp_obj_get_int(args[ARG_freq].u_obj);
} else { } else {
self->p_config->freq = 50; // 50 Hz by default. self->p_config->freq = 2; // 4 MHz by default.
} }
if (args[ARG_period].u_obj != MP_OBJ_NULL) { if (args[ARG_period].u_obj != MP_OBJ_NULL) {
@ -294,7 +296,7 @@ STATIC void machine_hard_pwm_init(mp_obj_t self_in, mp_arg_val_t *args) {
uint16_t pulse_width = ((self->p_config->period * self->p_config->duty) / 100); uint16_t pulse_width = ((self->p_config->period * self->p_config->duty) / 100);
// If manual period has been set, override duty-cycle. // If manual pulse width has been set, override duty-cycle.
if (self->p_config->pulse_width > 0) { if (self->p_config->pulse_width > 0) {
pulse_width = self->p_config->pulse_width; pulse_width = self->p_config->pulse_width;
} }