diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-01-25 16:30:47 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-01-25 16:30:47 +0000 |
| commit | 51f3a6becd8566243c12243b7c295de1fcabc388 (patch) | |
| tree | 2ebaa09b139307ead6e42c6ff6aa77fb03459993 /stm/main.c | |
| parent | b829b5caecd1ba4fbc30e03978776d2c868dd67b (diff) | |
| download | micropython-51f3a6becd8566243c12243b7c295de1fcabc388.tar.gz micropython-51f3a6becd8566243c12243b7c295de1fcabc388.zip | |
stm: Improved ADC module; add BOARD_NAME config value.
Diffstat (limited to 'stm/main.c')
| -rw-r--r-- | stm/main.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/stm/main.c b/stm/main.c index d2754a2e6a..1388a1d900 100644 --- a/stm/main.c +++ b/stm/main.c @@ -137,8 +137,10 @@ static const char *help_text = " pyb.switch() -- return True/False if switch pressed or not\n" " pyb.accel() -- get accelerometer values\n" " pyb.rand() -- get a 16-bit random number\n" -" pyb.gpio(<port>) -- get port value (port='a4' for example)\n" +" pyb.gpio(<port>) -- get port value (port='A4' for example)\n" " pyb.gpio(<port>, <val>) -- set port value, True or False, 1 or 0\n" +" pyb.ADC(<port>) -- make an analog port object (port='C0' for example)\n" +" ADC methods: read()\n" ; // get some help about available functions @@ -348,7 +350,7 @@ int readline(vstr_t *line, const char *prompt) { } void do_repl(void) { - stdout_tx_str("Micro Python build <git hash> on 2/1/2014; PYBv3 with STM32F405RG\r\n"); + stdout_tx_str("Micro Python build <git hash> on 25/1/2014; " MICROPY_HW_BOARD_NAME " with STM32F405RG\r\n"); stdout_tx_str("Type \"help()\" for more information.\r\n"); vstr_t line; @@ -654,7 +656,8 @@ soft_reset: rt_store_attr(m, MP_QSTR_I2C, rt_make_function_n(2, pyb_I2C)); rt_store_attr(m, MP_QSTR_gpio, (mp_obj_t)&pyb_gpio_obj); rt_store_attr(m, MP_QSTR_Usart, rt_make_function_n(2, pyb_Usart)); - rt_store_attr(m, MP_QSTR_ADC, rt_make_function_n(1, pyb_ADC)); + rt_store_attr(m, qstr_from_str("ADC_all"), (mp_obj_t)&pyb_ADC_all_obj); + rt_store_attr(m, MP_QSTR_ADC, (mp_obj_t)&pyb_ADC_obj); rt_store_name(MP_QSTR_pyb, m); rt_store_name(MP_QSTR_open, rt_make_function_n(2, pyb_io_open)); |