Browse Source
This commit refactors machine.PWM and creates extmod/machine_pwm.c. The esp8266, esp32 and rp2 ports all use this and provide implementations of the required PWM functionality. This helps to reduce code duplication and keep the same Python API across ports. This commit does not make any functional changes. Signed-off-by: Damien George <damien@micropython.org>pull/7450/head
Damien George
3 years ago
19 changed files with 336 additions and 251 deletions
@ -0,0 +1,143 @@ |
|||
/*
|
|||
* This file is part of the MicroPython project, http://micropython.org/
|
|||
* |
|||
* The MIT License (MIT) |
|||
* |
|||
* Copyright (c) 2020-2021 Damien P. George |
|||
* |
|||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|||
* of this software and associated documentation files (the "Software"), to deal |
|||
* in the Software without restriction, including without limitation the rights |
|||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|||
* copies of the Software, and to permit persons to whom the Software is |
|||
* furnished to do so, subject to the following conditions: |
|||
* |
|||
* The above copyright notice and this permission notice shall be included in |
|||
* all copies or substantial portions of the Software. |
|||
* |
|||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|||
* THE SOFTWARE. |
|||
*/ |
|||
|
|||
#include "py/runtime.h" |
|||
|
|||
#if MICROPY_PY_MACHINE_PWM |
|||
|
|||
#include "extmod/machine_pwm.h" |
|||
|
|||
#ifdef MICROPY_PY_MACHINE_PWM_INCLUDEFILE |
|||
#include MICROPY_PY_MACHINE_PWM_INCLUDEFILE |
|||
#endif |
|||
|
|||
#if MICROPY_PY_MACHINE_PWM_INIT |
|||
STATIC mp_obj_t machine_pwm_init(size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) { |
|||
mp_machine_pwm_init_helper(args[0], n_args - 1, args + 1, kw_args); |
|||
return mp_const_none; |
|||
} |
|||
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(machine_pwm_init_obj, 1, machine_pwm_init); |
|||
#endif |
|||
|
|||
// PWM.deinit()
|
|||
STATIC mp_obj_t machine_pwm_deinit(mp_obj_t self_in) { |
|||
machine_pwm_obj_t *self = MP_OBJ_TO_PTR(self_in); |
|||
mp_machine_pwm_deinit(self); |
|||
return mp_const_none; |
|||
} |
|||
STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_pwm_deinit_obj, machine_pwm_deinit); |
|||
|
|||
// PWM.freq([value])
|
|||
STATIC mp_obj_t machine_pwm_freq(size_t n_args, const mp_obj_t *args) { |
|||
machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]); |
|||
if (n_args == 1) { |
|||
// Get frequency.
|
|||
return mp_machine_pwm_freq_get(self); |
|||
} else { |
|||
// Set the frequency.
|
|||
mp_int_t freq = mp_obj_get_int(args[1]); |
|||
mp_machine_pwm_freq_set(self, freq); |
|||
return mp_const_none; |
|||
} |
|||
} |
|||
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_freq_obj, 1, 2, machine_pwm_freq); |
|||
|
|||
#if MICROPY_PY_MACHINE_PWM_DUTY |
|||
// PWM.duty([duty])
|
|||
STATIC mp_obj_t machine_pwm_duty(size_t n_args, const mp_obj_t *args) { |
|||
machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]); |
|||
if (n_args == 1) { |
|||
// Get duty cycle.
|
|||
return mp_machine_pwm_duty_get(self); |
|||
} else { |
|||
// Set duty cycle.
|
|||
mp_int_t duty = mp_obj_get_int(args[1]); |
|||
mp_machine_pwm_duty_set(self, duty); |
|||
return mp_const_none; |
|||
} |
|||
} |
|||
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_obj, 1, 2, machine_pwm_duty); |
|||
#endif |
|||
|
|||
#if MICROPY_PY_MACHINE_PWM_DUTY_U16_NS |
|||
|
|||
// PWM.duty_u16([value])
|
|||
STATIC mp_obj_t machine_pwm_duty_u16(size_t n_args, const mp_obj_t *args) { |
|||
machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]); |
|||
if (n_args == 1) { |
|||
// Get duty cycle.
|
|||
return mp_machine_pwm_duty_get_u16(self); |
|||
} else { |
|||
// Set duty cycle.
|
|||
mp_int_t duty_u16 = mp_obj_get_int(args[1]); |
|||
mp_machine_pwm_duty_set_u16(self, duty_u16); |
|||
return mp_const_none; |
|||
} |
|||
} |
|||
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_u16_obj, 1, 2, machine_pwm_duty_u16); |
|||
|
|||
// PWM.duty_ns([value])
|
|||
STATIC mp_obj_t machine_pwm_duty_ns(size_t n_args, const mp_obj_t *args) { |
|||
machine_pwm_obj_t *self = MP_OBJ_TO_PTR(args[0]); |
|||
if (n_args == 1) { |
|||
// Get duty cycle.
|
|||
return mp_machine_pwm_duty_get_ns(self); |
|||
} else { |
|||
// Set duty cycle.
|
|||
mp_int_t duty_ns = mp_obj_get_int(args[1]); |
|||
mp_machine_pwm_duty_set_ns(self, duty_ns); |
|||
return mp_const_none; |
|||
} |
|||
} |
|||
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(machine_pwm_duty_ns_obj, 1, 2, machine_pwm_duty_ns); |
|||
|
|||
#endif |
|||
|
|||
STATIC const mp_rom_map_elem_t machine_pwm_locals_dict_table[] = { |
|||
#if MICROPY_PY_MACHINE_PWM_INIT |
|||
{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&machine_pwm_init_obj) }, |
|||
#endif |
|||
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_pwm_deinit_obj) }, |
|||
{ MP_ROM_QSTR(MP_QSTR_freq), MP_ROM_PTR(&machine_pwm_freq_obj) }, |
|||
#if MICROPY_PY_MACHINE_PWM_DUTY |
|||
{ MP_ROM_QSTR(MP_QSTR_duty), MP_ROM_PTR(&machine_pwm_duty_obj) }, |
|||
#endif |
|||
#if MICROPY_PY_MACHINE_PWM_DUTY_U16_NS |
|||
{ MP_ROM_QSTR(MP_QSTR_duty_u16), MP_ROM_PTR(&machine_pwm_duty_u16_obj) }, |
|||
{ MP_ROM_QSTR(MP_QSTR_duty_ns), MP_ROM_PTR(&machine_pwm_duty_ns_obj) }, |
|||
#endif |
|||
}; |
|||
STATIC MP_DEFINE_CONST_DICT(machine_pwm_locals_dict, machine_pwm_locals_dict_table); |
|||
|
|||
const mp_obj_type_t machine_pwm_type = { |
|||
{ &mp_type_type }, |
|||
.name = MP_QSTR_PWM, |
|||
.print = mp_machine_pwm_print, |
|||
.make_new = mp_machine_pwm_make_new, |
|||
.locals_dict = (mp_obj_dict_t *)&machine_pwm_locals_dict, |
|||
}; |
|||
|
|||
#endif // MICROPY_PY_MACHINE_PWM
|
|||
@ -0,0 +1,55 @@ |
|||
/*
|
|||
* This file is part of the MicroPython project, http://micropython.org/
|
|||
* |
|||
* The MIT License (MIT) |
|||
* |
|||
* Copyright (c) 2021 Damien P. George |
|||
* |
|||
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|||
* of this software and associated documentation files (the "Software"), to deal |
|||
* in the Software without restriction, including without limitation the rights |
|||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|||
* copies of the Software, and to permit persons to whom the Software is |
|||
* furnished to do so, subject to the following conditions: |
|||
* |
|||
* The above copyright notice and this permission notice shall be included in |
|||
* all copies or substantial portions of the Software. |
|||
* |
|||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|||
* THE SOFTWARE. |
|||
*/ |
|||
|
|||
#ifndef MICROPY_INCLUDED_EXTMOD_MACHINE_PWM_H |
|||
#define MICROPY_INCLUDED_EXTMOD_MACHINE_PWM_H |
|||
|
|||
#include "py/obj.h" |
|||
|
|||
// A port must provide this type, but it's otherwise opaque.
|
|||
typedef struct _machine_pwm_obj_t machine_pwm_obj_t; |
|||
|
|||
// This PWM class is implemented by machine_pwm.c.
|
|||
extern const mp_obj_type_t machine_pwm_type; |
|||
|
|||
// A port must provide implementations of these low-level PWM functions, either as global
|
|||
// linker symbols, or included directly if MICROPY_PY_MACHINE_PWM_INCLUDEFILE is defined.
|
|||
#ifndef MICROPY_PY_MACHINE_PWM_INCLUDEFILE |
|||
void mp_machine_pwm_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t kind); |
|||
mp_obj_t mp_machine_pwm_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args); |
|||
void mp_machine_pwm_init_helper(machine_pwm_obj_t *self, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args); |
|||
void mp_machine_pwm_deinit(machine_pwm_obj_t *self); |
|||
mp_obj_t mp_machine_pwm_freq_get(machine_pwm_obj_t *self); |
|||
void mp_machine_pwm_freq_set(machine_pwm_obj_t *self, mp_int_t freq); |
|||
mp_obj_t mp_machine_pwm_duty_get(machine_pwm_obj_t *self); |
|||
void mp_machine_pwm_duty_set(machine_pwm_obj_t *self, mp_int_t duty); |
|||
mp_obj_t mp_machine_pwm_duty_get_u16(machine_pwm_obj_t *self); |
|||
void mp_machine_pwm_duty_set_u16(machine_pwm_obj_t *self, mp_int_t duty_u16); |
|||
mp_obj_t mp_machine_pwm_duty_get_ns(machine_pwm_obj_t *self); |
|||
void mp_machine_pwm_duty_set_ns(machine_pwm_obj_t *self, mp_int_t duty_ns); |
|||
#endif |
|||
|
|||
#endif // MICROPY_INCLUDED_EXTMOD_MACHINE_PWM_H
|
|||
Loading…
Reference in new issue