diff options
author | Damien George <damien.p.george@gmail.com> | 2016-02-17 15:19:03 +0000 |
---|---|---|
committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-03-09 09:03:59 +0700 |
commit | f7be80398e8f38c9695d2ebabcb2e19e80e60f0f (patch) | |
tree | 7e7101d499c10a92444ee3f51774b36e5acb59ce /esp8266/modpyb.c | |
parent | 809fbeefb7533a1f83339c28a92d213a1a5990d0 (diff) | |
download | micropython-f7be80398e8f38c9695d2ebabcb2e19e80e60f0f.tar.gz micropython-f7be80398e8f38c9695d2ebabcb2e19e80e60f0f.zip |
esp8266: Move pyb.freq to machine.freq.
Diffstat (limited to 'esp8266/modpyb.c')
-rw-r--r-- | esp8266/modpyb.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/esp8266/modpyb.c b/esp8266/modpyb.c index a9daef9c7e..be64c1909f 100644 --- a/esp8266/modpyb.c +++ b/esp8266/modpyb.c @@ -77,23 +77,6 @@ STATIC mp_obj_t pyb_info(mp_uint_t n_args, const mp_obj_t *args) { } STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_info_obj, 0, 1, pyb_info); -STATIC mp_obj_t pyb_freq(mp_uint_t n_args, const mp_obj_t *args) { - if (n_args == 0) { - // get - return mp_obj_new_int(system_get_cpu_freq() * 1000000); - } else { - // set - mp_int_t freq = mp_obj_get_int(args[0]) / 1000000; - if (freq != 80 && freq != 160) { - nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, - "frequency can only be either 80Mhz or 160MHz")); - } - system_update_cpu_freq(freq); - return mp_const_none; - } -} -STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(pyb_freq_obj, 0, 1, pyb_freq); - STATIC mp_obj_t pyb_sync(void) { //storage_flush(); return mp_const_none; @@ -158,7 +141,6 @@ STATIC const mp_map_elem_t pyb_module_globals_table[] = { { MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_pyb) }, { MP_OBJ_NEW_QSTR(MP_QSTR_info), (mp_obj_t)&pyb_info_obj }, - { MP_OBJ_NEW_QSTR(MP_QSTR_freq), (mp_obj_t)&pyb_freq_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_millis), (mp_obj_t)&pyb_millis_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_elapsed_millis), (mp_obj_t)&pyb_elapsed_millis_obj }, |