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

cc3200: Re-name pybsystick to mpsystick.

Browse Source
This commit is contained in:
danicampora 2015-03-19 14:41:34 +01:00
parent 6bf423df2c
commit c45e641c1d
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cc3200/application.mk
View File

@ -79,6 +79,7 @@ APP_MISC_SRC_C = $(addprefix misc/,\
mpcallback.c \ mpcallback.c \
mperror.c \ mperror.c \
mpexception.c \ mpexception.c \
mpsystick.c \
pin_defs_cc3200.c \ pin_defs_cc3200.c \
) )
@ -95,7 +96,6 @@ APP_MODS_SRC_C = $(addprefix mods/,\
pybrtc.c \ pybrtc.c \
pybsd.c \ pybsd.c \
pybsleep.c \ pybsleep.c \
pybsystick.c \
pybuart.c \ pybuart.c \
pybwdt.c \ pybwdt.c \
) )

6
cc3200/misc/help.c
View File

@ -46,10 +46,9 @@ STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) {
if (n_args == 0) { if (n_args == 0) {
// print a general help message // print a general help message
printf("%s", help_text); printf("%s", help_text);
}
} else { else {
// try to print something sensible about the given object // try to print something sensible about the given object
printf("object "); printf("object ");
mp_obj_print(args[0], PRINT_STR); mp_obj_print(args[0], PRINT_STR);
printf(" is of type %s\n", mp_obj_get_type_str(args[0])); printf(" is of type %s\n", mp_obj_get_type_str(args[0]));
@ -76,7 +75,6 @@ STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) {
} }
} }
} }
return mp_const_none; return mp_const_none;
} }
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_help_obj, 0, 1, pyb_help); MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_help_obj, 0, 1, pyb_help);

2
cc3200/mods/pybsystick.c → cc3200/misc/mpsystick.c
View File

@ -29,7 +29,7 @@
#include MICROPY_HAL_H #include MICROPY_HAL_H
#include "py/obj.h" #include "py/obj.h"
#include "irq.h" #include "irq.h"
#include "pybsystick.h" #include "mpsystick.h"
#include "systick.h" #include "systick.h"
#include "inc/hw_types.h" #include "inc/hw_types.h"
#include "inc/hw_nvic.h" #include "inc/hw_nvic.h"

5
cc3200/mods/pybsystick.h → cc3200/misc/mpsystick.h
View File

@ -25,6 +25,11 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef MPSYSTICK_H
#define MPSYSTICK_H
void sys_tick_wait_at_least(uint32_t stc, uint32_t delay_ms); void sys_tick_wait_at_least(uint32_t stc, uint32_t delay_ms);
bool sys_tick_has_passed(uint32_t stc, uint32_t delay_ms); bool sys_tick_has_passed(uint32_t stc, uint32_t delay_ms);
uint32_t sys_tick_get_microseconds(void); uint32_t sys_tick_get_microseconds(void);
#endif // MPSYSTICK_H