Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
c45e641c
Commit
c45e641c
authored
10 years ago
by
danicampora
Browse files
Options
Downloads
Patches
Plain Diff
cc3200: Re-name pybsystick to mpsystick.
parent
6bf423df
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
cc3200/application.mk
+1
-1
1 addition, 1 deletion
cc3200/application.mk
cc3200/misc/help.c
+2
-4
2 additions, 4 deletions
cc3200/misc/help.c
cc3200/misc/mpsystick.c
+1
-1
1 addition, 1 deletion
cc3200/misc/mpsystick.c
cc3200/misc/mpsystick.h
+5
-0
5 additions, 0 deletions
cc3200/misc/mpsystick.h
with
9 additions
and
6 deletions
cc3200/application.mk
+
1
−
1
View file @
c45e641c
...
@@ -79,6 +79,7 @@ APP_MISC_SRC_C = $(addprefix misc/,\
...
@@ -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/,\
...
@@ -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
\
)
)
...
...
This diff is collapsed.
Click to expand it.
cc3200/misc/help.c
+
2
−
4
View file @
c45e641c
...
@@ -46,10 +46,9 @@ STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) {
...
@@ -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) {
...
@@ -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
);
This diff is collapsed.
Click to expand it.
cc3200/m
ods/pyb
systick.c
→
cc3200/m
isc/mp
systick.c
+
1
−
1
View file @
c45e641c
...
@@ -29,7 +29,7 @@
...
@@ -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
"p
yb
systick.h"
#include
"
m
psystick.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"
...
...
This diff is collapsed.
Click to expand it.
cc3200/m
ods/pyb
systick.h
→
cc3200/m
isc/mp
systick.h
+
5
−
0
View file @
c45e641c
...
@@ -25,6 +25,11 @@
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment