djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stmhal: Allow DAC object to be initialised from a pin. 

Eg: dac = DAC(Pin.board.X5)
This commit is contained in:
Damien George 2014-10-26 21:46:06 +00:00
parent e503512f83
commit e4e52f5370
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
stmhal/dac.c
View File

@ -39,6 +39,8 @@
#include "runtime.h" #include "runtime.h"
#include "timer.h" #include "timer.h"
#include "dac.h" #include "dac.h"
#include "pin.h"
#include "genhdr/pins.h"
/// \moduleref pyb /// \moduleref pyb
/// \class DAC - digital to analog conversion /// \class DAC - digital to analog conversion
@ -107,18 +109,33 @@ typedef struct _pyb_dac_obj_t {
// create the dac object // create the dac object
// currently support either DAC1 on X5 (id = 1) or DAC2 on X6 (id = 2) // currently support either DAC1 on X5 (id = 1) or DAC2 on X6 (id = 2)
/// \classmethod \constructor(id) /// \classmethod \constructor(port)
/// Construct a new DAC object. /// Construct a new DAC object.
/// ///
/// `id` can be 1 or 2: DAC 1 is on pin X5 and DAC 2 is on pin X6. /// `port` can be a pin object, or an integer (1 or 2).
/// DAC(1) is on pin X5 and DAC(2) is on pin X6.
STATIC mp_obj_t pyb_dac_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) { STATIC mp_obj_t pyb_dac_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) {
// check arguments // check arguments
mp_arg_check_num(n_args, n_kw, 1, 1, false); mp_arg_check_num(n_args, n_kw, 1, 1, false);
// get pin/channel to output on
mp_int_t dac_id;
if (MP_OBJ_IS_INT(args[0])) {
dac_id = mp_obj_get_int(args[0]);
} else {
const pin_obj_t *pin = pin_find(args[0]);
if (pin == &pin_A4) {
dac_id = 1;
} else if (pin == &pin_A5) {
dac_id = 2;
} else {
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "pin %s does not have DAC capabilities", qstr_str(pin->name)));
}
}
pyb_dac_obj_t *dac = m_new_obj(pyb_dac_obj_t); pyb_dac_obj_t *dac = m_new_obj(pyb_dac_obj_t);
dac->base.type = &pyb_dac_type; dac->base.type = &pyb_dac_type;
mp_int_t dac_id = mp_obj_get_int(args[0]);
uint32_t pin; uint32_t pin;
if (dac_id == 1) { if (dac_id == 1) {
pin = GPIO_PIN_4; pin = GPIO_PIN_4;