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
GitLab 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
3cc87b1e
Commit
3cc87b1e
authored
8 years ago
by
Paul Sokolovsky
Browse files
Options
Downloads
Patches
Plain Diff
unix/modtime: Switch ticks/sleep_ms/us() to utime_mphal.
parent
6a870840
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
unix/modtime.c
+4
-36
4 additions, 36 deletions
unix/modtime.c
with
4 additions
and
36 deletions
unix/modtime.c
+
4
−
36
View file @
3cc87b1e
...
@@ -77,22 +77,6 @@ STATIC mp_obj_t mod_time_time(void) {
...
@@ -77,22 +77,6 @@ STATIC mp_obj_t mod_time_time(void) {
}
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_0
(
mod_time_time_obj
,
mod_time_time
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_0
(
mod_time_time_obj
,
mod_time_time
);
STATIC
mp_obj_t
mod_time_ticks_us
(
void
)
{
struct
timeval
tv
;
gettimeofday
(
&
tv
,
NULL
);
mp_uint_t
us
=
tv
.
tv_sec
*
1000000
+
tv
.
tv_usec
;
return
MP_OBJ_NEW_SMALL_INT
(
us
&
MP_SMALL_INT_POSITIVE_MASK
);
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_0
(
mod_time_ticks_us_obj
,
mod_time_ticks_us
);
STATIC
mp_obj_t
mod_time_ticks_ms
(
void
)
{
struct
timeval
tv
;
gettimeofday
(
&
tv
,
NULL
);
mp_uint_t
ms
=
tv
.
tv_sec
*
1000
+
tv
.
tv_usec
/
1000
;
return
MP_OBJ_NEW_SMALL_INT
(
ms
&
MP_SMALL_INT_POSITIVE_MASK
);
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_0
(
mod_time_ticks_ms_obj
,
mod_time_ticks_ms
);
// Note: this is deprecated since CPy3.3, but pystone still uses it.
// Note: this is deprecated since CPy3.3, but pystone still uses it.
STATIC
mp_obj_t
mod_time_clock
(
void
)
{
STATIC
mp_obj_t
mod_time_clock
(
void
)
{
#if MICROPY_PY_BUILTINS_FLOAT
#if MICROPY_PY_BUILTINS_FLOAT
...
@@ -143,22 +127,6 @@ STATIC mp_obj_t mod_time_sleep(mp_obj_t arg) {
...
@@ -143,22 +127,6 @@ STATIC mp_obj_t mod_time_sleep(mp_obj_t arg) {
}
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_1
(
mod_time_sleep_obj
,
mod_time_sleep
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_1
(
mod_time_sleep_obj
,
mod_time_sleep
);
STATIC
mp_obj_t
mod_time_sleep_ms
(
mp_obj_t
arg
)
{
MP_THREAD_GIL_EXIT
();
usleep
(
mp_obj_get_int
(
arg
)
*
1000
);
MP_THREAD_GIL_ENTER
();
return
mp_const_none
;
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_1
(
mod_time_sleep_ms_obj
,
mod_time_sleep_ms
);
STATIC
mp_obj_t
mod_time_sleep_us
(
mp_obj_t
arg
)
{
MP_THREAD_GIL_EXIT
();
usleep
(
mp_obj_get_int
(
arg
));
MP_THREAD_GIL_ENTER
();
return
mp_const_none
;
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_1
(
mod_time_sleep_us_obj
,
mod_time_sleep_us
);
STATIC
mp_obj_t
mod_time_strftime
(
size_t
n_args
,
const
mp_obj_t
*
args
)
{
STATIC
mp_obj_t
mod_time_strftime
(
size_t
n_args
,
const
mp_obj_t
*
args
)
{
time_t
t
;
time_t
t
;
if
(
n_args
==
1
)
{
if
(
n_args
==
1
)
{
...
@@ -179,11 +147,11 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
...
@@ -179,11 +147,11 @@ STATIC const mp_rom_map_elem_t mp_module_time_globals_table[] = {
{
MP_ROM_QSTR
(
MP_QSTR___name__
),
MP_ROM_QSTR
(
MP_QSTR_utime
)
},
{
MP_ROM_QSTR
(
MP_QSTR___name__
),
MP_ROM_QSTR
(
MP_QSTR_utime
)
},
{
MP_ROM_QSTR
(
MP_QSTR_clock
),
MP_ROM_PTR
(
&
mod_time_clock_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_clock
),
MP_ROM_PTR
(
&
mod_time_clock_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_sleep
),
MP_ROM_PTR
(
&
mod_time_sleep_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_sleep
),
MP_ROM_PTR
(
&
mod_time_sleep_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_sleep_ms
),
MP_ROM_PTR
(
&
m
od_
time_sleep_ms_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_sleep_ms
),
MP_ROM_PTR
(
&
m
p_u
time_sleep_ms_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_sleep_us
),
MP_ROM_PTR
(
&
m
od_
time_sleep_us_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_sleep_us
),
MP_ROM_PTR
(
&
m
p_u
time_sleep_us_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_time
),
MP_ROM_PTR
(
&
mod_time_time_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_time
),
MP_ROM_PTR
(
&
mod_time_time_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_ticks_ms
),
MP_ROM_PTR
(
&
m
od_
time_ticks_ms_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_ticks_ms
),
MP_ROM_PTR
(
&
m
p_u
time_ticks_ms_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_ticks_us
),
MP_ROM_PTR
(
&
m
od_
time_ticks_us_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_ticks_us
),
MP_ROM_PTR
(
&
m
p_u
time_ticks_us_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_ticks_diff
),
MP_ROM_PTR
(
&
mp_utime_ticks_diff_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_ticks_diff
),
MP_ROM_PTR
(
&
mp_utime_ticks_diff_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_strftime
),
MP_ROM_PTR
(
&
mod_time_strftime_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_strftime
),
MP_ROM_PTR
(
&
mod_time_strftime_obj
)
},
};
};
...
...
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