Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
09866754
Commit
09866754
authored
May 06, 2017
by
Damien George
Browse files
stmhal: Convert all module and method tables to use MP_ROM macros.
parent
084824f8
Changes
30
Hide whitespace changes
Inline
Side-by-side
stmhal/accel.c
View file @
09866754
...
@@ -211,15 +211,15 @@ STATIC mp_obj_t pyb_accel_write(mp_obj_t self_in, mp_obj_t reg, mp_obj_t val) {
...
@@ -211,15 +211,15 @@ STATIC mp_obj_t pyb_accel_write(mp_obj_t self_in, mp_obj_t reg, mp_obj_t val) {
}
}
MP_DEFINE_CONST_FUN_OBJ_3
(
pyb_accel_write_obj
,
pyb_accel_write
);
MP_DEFINE_CONST_FUN_OBJ_3
(
pyb_accel_write_obj
,
pyb_accel_write
);
STATIC
const
mp_map_elem_t
pyb_accel_locals_dict_table
[]
=
{
STATIC
const
mp_
rom_
map_elem_t
pyb_accel_locals_dict_table
[]
=
{
// TODO add init, deinit, and perhaps reset methods
// TODO add init, deinit, and perhaps reset methods
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_x
),
(
mp_obj_t
)
&
pyb_accel_x_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_x
),
MP_ROM_PTR
(
&
pyb_accel_x_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_y
),
(
mp_obj_t
)
&
pyb_accel_y_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_y
),
MP_ROM_PTR
(
&
pyb_accel_y_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_z
),
(
mp_obj_t
)
&
pyb_accel_z_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_z
),
MP_ROM_PTR
(
&
pyb_accel_z_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_tilt
),
(
mp_obj_t
)
&
pyb_accel_tilt_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_tilt
),
MP_ROM_PTR
(
&
pyb_accel_tilt_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_filtered_xyz
),
(
mp_obj_t
)
&
pyb_accel_filtered_xyz_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_filtered_xyz
),
MP_ROM_PTR
(
&
pyb_accel_filtered_xyz_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_read
),
(
mp_obj_t
)
&
pyb_accel_read_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_read
),
MP_ROM_PTR
(
&
pyb_accel_read_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_write
),
(
mp_obj_t
)
&
pyb_accel_write_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_write
),
MP_ROM_PTR
(
&
pyb_accel_write_obj
)
},
};
};
STATIC
MP_DEFINE_CONST_DICT
(
pyb_accel_locals_dict
,
pyb_accel_locals_dict_table
);
STATIC
MP_DEFINE_CONST_DICT
(
pyb_accel_locals_dict
,
pyb_accel_locals_dict_table
);
...
@@ -228,7 +228,7 @@ const mp_obj_type_t pyb_accel_type = {
...
@@ -228,7 +228,7 @@ const mp_obj_type_t pyb_accel_type = {
{
&
mp_type_type
},
{
&
mp_type_type
},
.
name
=
MP_QSTR_Accel
,
.
name
=
MP_QSTR_Accel
,
.
make_new
=
pyb_accel_make_new
,
.
make_new
=
pyb_accel_make_new
,
.
locals_dict
=
(
mp_obj_
t
)
&
pyb_accel_locals_dict
,
.
locals_dict
=
(
mp_obj_
dict_t
*
)
&
pyb_accel_locals_dict
,
};
};
#endif // MICROPY_HW_HAS_MMA7660
#endif // MICROPY_HW_HAS_MMA7660
stmhal/adc.c
View file @
09866754
...
@@ -439,9 +439,9 @@ STATIC mp_obj_t adc_read_timed(mp_obj_t self_in, mp_obj_t buf_in, mp_obj_t freq_
...
@@ -439,9 +439,9 @@ STATIC mp_obj_t adc_read_timed(mp_obj_t self_in, mp_obj_t buf_in, mp_obj_t freq_
}
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_3
(
adc_read_timed_obj
,
adc_read_timed
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_3
(
adc_read_timed_obj
,
adc_read_timed
);
STATIC
const
mp_map_elem_t
adc_locals_dict_table
[]
=
{
STATIC
const
mp_
rom_
map_elem_t
adc_locals_dict_table
[]
=
{
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_read
),
(
mp_obj_t
)
&
adc_read_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_read
),
MP_ROM_PTR
(
&
adc_read_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_read_timed
),
(
mp_obj_t
)
&
adc_read_timed_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_read_timed
),
MP_ROM_PTR
(
&
adc_read_timed_obj
)
},
};
};
STATIC
MP_DEFINE_CONST_DICT
(
adc_locals_dict
,
adc_locals_dict_table
);
STATIC
MP_DEFINE_CONST_DICT
(
adc_locals_dict
,
adc_locals_dict_table
);
...
@@ -451,7 +451,7 @@ const mp_obj_type_t pyb_adc_type = {
...
@@ -451,7 +451,7 @@ const mp_obj_type_t pyb_adc_type = {
.
name
=
MP_QSTR_ADC
,
.
name
=
MP_QSTR_ADC
,
.
print
=
adc_print
,
.
print
=
adc_print
,
.
make_new
=
adc_make_new
,
.
make_new
=
adc_make_new
,
.
locals_dict
=
(
mp_obj_
t
)
&
adc_locals_dict
,
.
locals_dict
=
(
mp_obj_
dict_t
*
)
&
adc_locals_dict
,
};
};
/******************************************************************************/
/******************************************************************************/
...
@@ -658,13 +658,13 @@ STATIC mp_obj_t adc_all_read_vref(mp_obj_t self_in) {
...
@@ -658,13 +658,13 @@ STATIC mp_obj_t adc_all_read_vref(mp_obj_t self_in) {
STATIC
MP_DEFINE_CONST_FUN_OBJ_1
(
adc_all_read_vref_obj
,
adc_all_read_vref
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_1
(
adc_all_read_vref_obj
,
adc_all_read_vref
);
#endif
#endif
STATIC
const
mp_map_elem_t
adc_all_locals_dict_table
[]
=
{
STATIC
const
mp_
rom_
map_elem_t
adc_all_locals_dict_table
[]
=
{
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_read_channel
),
(
mp_obj_t
)
&
adc_all_read_channel_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_read_channel
),
MP_ROM_PTR
(
&
adc_all_read_channel_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_read_core_temp
),
(
mp_obj_t
)
&
adc_all_read_core_temp_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_read_core_temp
),
MP_ROM_PTR
(
&
adc_all_read_core_temp_obj
)
},
#if MICROPY_PY_BUILTINS_FLOAT
#if MICROPY_PY_BUILTINS_FLOAT
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_read_core_vbat
),
(
mp_obj_t
)
&
adc_all_read_core_vbat_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_read_core_vbat
),
MP_ROM_PTR
(
&
adc_all_read_core_vbat_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_read_core_vref
),
(
mp_obj_t
)
&
adc_all_read_core_vref_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_read_core_vref
),
MP_ROM_PTR
(
&
adc_all_read_core_vref_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_read_vref
),
(
mp_obj_t
)
&
adc_all_read_vref_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_read_vref
),
MP_ROM_PTR
(
&
adc_all_read_vref_obj
)
},
#endif
#endif
};
};
...
@@ -674,5 +674,5 @@ const mp_obj_type_t pyb_adc_all_type = {
...
@@ -674,5 +674,5 @@ const mp_obj_type_t pyb_adc_all_type = {
{
&
mp_type_type
},
{
&
mp_type_type
},
.
name
=
MP_QSTR_ADCAll
,
.
name
=
MP_QSTR_ADCAll
,
.
make_new
=
adc_all_make_new
,
.
make_new
=
adc_all_make_new
,
.
locals_dict
=
(
mp_obj_
t
)
&
adc_all_locals_dict
,
.
locals_dict
=
(
mp_obj_
dict_t
*
)
&
adc_all_locals_dict
,
};
};
stmhal/boards/make-pins.py
View file @
09866754
...
@@ -283,11 +283,11 @@ class Pins(object):
...
@@ -283,11 +283,11 @@ class Pins(object):
self
.
board_pins
.
append
(
NamedPin
(
row
[
0
],
pin
))
self
.
board_pins
.
append
(
NamedPin
(
row
[
0
],
pin
))
def
print_named
(
self
,
label
,
named_pins
):
def
print_named
(
self
,
label
,
named_pins
):
print
(
'STATIC const mp_map_elem_t pin_{:s}_pins_locals_dict_table[] = {{'
.
format
(
label
))
print
(
'STATIC const mp_
rom_
map_elem_t pin_{:s}_pins_locals_dict_table[] = {{'
.
format
(
label
))
for
named_pin
in
named_pins
:
for
named_pin
in
named_pins
:
pin
=
named_pin
.
pin
()
pin
=
named_pin
.
pin
()
if
pin
.
is_board_pin
():
if
pin
.
is_board_pin
():
print
(
' {{ MP_
OBJ_NEW
_QSTR(MP_QSTR_{:s}),
(mp_obj_t)
&pin_{:s} }},'
.
format
(
named_pin
.
name
(),
pin
.
cpu_pin_name
()))
print
(
' {{ MP_
ROM
_QSTR(MP_QSTR_{:s}),
MP_ROM_PTR(
&pin_{:s}
)
}},'
.
format
(
named_pin
.
name
(),
pin
.
cpu_pin_name
()))
print
(
'};'
)
print
(
'};'
)
print
(
'MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);'
.
format
(
label
,
label
));
print
(
'MP_DEFINE_CONST_DICT(pin_{:s}_pins_locals_dict, pin_{:s}_pins_locals_dict_table);'
.
format
(
label
,
label
));
...
...
stmhal/can.c
View file @
09866754
...
@@ -777,29 +777,29 @@ STATIC mp_obj_t pyb_can_rxcallback(mp_obj_t self_in, mp_obj_t fifo_in, mp_obj_t
...
@@ -777,29 +777,29 @@ STATIC mp_obj_t pyb_can_rxcallback(mp_obj_t self_in, mp_obj_t fifo_in, mp_obj_t
}
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_3
(
pyb_can_rxcallback_obj
,
pyb_can_rxcallback
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_3
(
pyb_can_rxcallback_obj
,
pyb_can_rxcallback
);
STATIC
const
mp_map_elem_t
pyb_can_locals_dict_table
[]
=
{
STATIC
const
mp_
rom_
map_elem_t
pyb_can_locals_dict_table
[]
=
{
// instance methods
// instance methods
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_init
),
(
mp_obj_t
)
&
pyb_can_init_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_init
),
MP_ROM_PTR
(
&
pyb_can_init_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_deinit
),
(
mp_obj_t
)
&
pyb_can_deinit_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_deinit
),
MP_ROM_PTR
(
&
pyb_can_deinit_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_any
),
(
mp_obj_t
)
&
pyb_can_any_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_any
),
MP_ROM_PTR
(
&
pyb_can_any_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_send
),
(
mp_obj_t
)
&
pyb_can_send_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_send
),
MP_ROM_PTR
(
&
pyb_can_send_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_recv
),
(
mp_obj_t
)
&
pyb_can_recv_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_recv
),
MP_ROM_PTR
(
&
pyb_can_recv_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_initfilterbanks
),
(
mp_obj_t
)
&
pyb_can_initfilterbanks_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_initfilterbanks
),
MP_ROM_PTR
(
&
pyb_can_initfilterbanks_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_setfilter
),
(
mp_obj_t
)
&
pyb_can_setfilter_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_setfilter
),
MP_ROM_PTR
(
&
pyb_can_setfilter_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_clearfilter
),
(
mp_obj_t
)
&
pyb_can_clearfilter_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_clearfilter
),
MP_ROM_PTR
(
&
pyb_can_clearfilter_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_rxcallback
),
(
mp_obj_t
)
&
pyb_can_rxcallback_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_rxcallback
),
MP_ROM_PTR
(
&
pyb_can_rxcallback_obj
)
},
// class constants
// class constants
// Note: we use the ST constants >> 4 so they fit in a small-int. The
// Note: we use the ST constants >> 4 so they fit in a small-int. The
// right-shift is undone when the constants are used in the init function.
// right-shift is undone when the constants are used in the init function.
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_NORMAL
),
MP_
OBJ_NEW_SMALL
_INT
(
CAN_MODE_NORMAL
>>
4
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_NORMAL
),
MP_
ROM
_INT
(
CAN_MODE_NORMAL
>>
4
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_LOOPBACK
),
MP_
OBJ_NEW_SMALL
_INT
(
CAN_MODE_LOOPBACK
>>
4
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_LOOPBACK
),
MP_
ROM
_INT
(
CAN_MODE_LOOPBACK
>>
4
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_SILENT
),
MP_
OBJ_NEW_SMALL
_INT
(
CAN_MODE_SILENT
>>
4
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_SILENT
),
MP_
ROM
_INT
(
CAN_MODE_SILENT
>>
4
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_SILENT_LOOPBACK
),
MP_
OBJ_NEW_SMALL
_INT
(
CAN_MODE_SILENT_LOOPBACK
>>
4
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_SILENT_LOOPBACK
),
MP_
ROM
_INT
(
CAN_MODE_SILENT_LOOPBACK
>>
4
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_MASK16
),
MP_
OBJ_NEW_SMALL
_INT
(
MASK16
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_MASK16
),
MP_
ROM
_INT
(
MASK16
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_LIST16
),
MP_
OBJ_NEW_SMALL
_INT
(
LIST16
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_LIST16
),
MP_
ROM
_INT
(
LIST16
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_MASK32
),
MP_
OBJ_NEW_SMALL
_INT
(
MASK32
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_MASK32
),
MP_
ROM
_INT
(
MASK32
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_LIST32
),
MP_
OBJ_NEW_SMALL
_INT
(
LIST32
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_LIST32
),
MP_
ROM
_INT
(
LIST32
)
},
};
};
STATIC
MP_DEFINE_CONST_DICT
(
pyb_can_locals_dict
,
pyb_can_locals_dict_table
);
STATIC
MP_DEFINE_CONST_DICT
(
pyb_can_locals_dict
,
pyb_can_locals_dict_table
);
...
...
stmhal/dac.c
View file @
09866754
...
@@ -481,20 +481,20 @@ mp_obj_t pyb_dac_write_timed(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
...
@@ -481,20 +481,20 @@ mp_obj_t pyb_dac_write_timed(mp_uint_t n_args, const mp_obj_t *pos_args, mp_map_
STATIC
MP_DEFINE_CONST_FUN_OBJ_KW
(
pyb_dac_write_timed_obj
,
1
,
pyb_dac_write_timed
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_KW
(
pyb_dac_write_timed_obj
,
1
,
pyb_dac_write_timed
);
#endif
#endif
STATIC
const
mp_map_elem_t
pyb_dac_locals_dict_table
[]
=
{
STATIC
const
mp_
rom_
map_elem_t
pyb_dac_locals_dict_table
[]
=
{
// instance methods
// instance methods
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_init
),
(
mp_obj_t
)
&
pyb_dac_init_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_init
),
MP_ROM_PTR
(
&
pyb_dac_init_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_deinit
),
(
mp_obj_t
)
&
pyb_dac_deinit_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_deinit
),
MP_ROM_PTR
(
&
pyb_dac_deinit_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_write
),
(
mp_obj_t
)
&
pyb_dac_write_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_write
),
MP_ROM_PTR
(
&
pyb_dac_write_obj
)
},
#if defined(TIM6)
#if defined(TIM6)
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_noise
),
(
mp_obj_t
)
&
pyb_dac_noise_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_noise
),
MP_ROM_PTR
(
&
pyb_dac_noise_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_triangle
),
(
mp_obj_t
)
&
pyb_dac_triangle_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_triangle
),
MP_ROM_PTR
(
&
pyb_dac_triangle_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_write_timed
),
(
mp_obj_t
)
&
pyb_dac_write_timed_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_write_timed
),
MP_ROM_PTR
(
&
pyb_dac_write_timed_obj
)
},
#endif
#endif
// class constants
// class constants
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_NORMAL
),
MP_OBJ_NEW_SMALL
_INT
(
DMA_NORMAL
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_NORMAL
),
MP_ROM
_INT
(
DMA_NORMAL
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_CIRCULAR
),
MP_OBJ_NEW_SMALL
_INT
(
DMA_CIRCULAR
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_CIRCULAR
),
MP_ROM
_INT
(
DMA_CIRCULAR
)
},
};
};
STATIC
MP_DEFINE_CONST_DICT
(
pyb_dac_locals_dict
,
pyb_dac_locals_dict_table
);
STATIC
MP_DEFINE_CONST_DICT
(
pyb_dac_locals_dict
,
pyb_dac_locals_dict_table
);
...
@@ -503,7 +503,7 @@ const mp_obj_type_t pyb_dac_type = {
...
@@ -503,7 +503,7 @@ const mp_obj_type_t pyb_dac_type = {
{
&
mp_type_type
},
{
&
mp_type_type
},
.
name
=
MP_QSTR_DAC
,
.
name
=
MP_QSTR_DAC
,
.
make_new
=
pyb_dac_make_new
,
.
make_new
=
pyb_dac_make_new
,
.
locals_dict
=
(
mp_obj_
t
)
&
pyb_dac_locals_dict
,
.
locals_dict
=
(
mp_obj_
dict_t
*
)
&
pyb_dac_locals_dict
,
};
};
#endif // MICROPY_HW_ENABLE_DAC
#endif // MICROPY_HW_ENABLE_DAC
stmhal/extint.c
View file @
09866754
...
@@ -368,23 +368,23 @@ STATIC void extint_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print
...
@@ -368,23 +368,23 @@ STATIC void extint_obj_print(const mp_print_t *print, mp_obj_t self_in, mp_print
mp_printf
(
print
,
"<ExtInt line=%u>"
,
self
->
line
);
mp_printf
(
print
,
"<ExtInt line=%u>"
,
self
->
line
);
}
}
STATIC
const
mp_map_elem_t
extint_locals_dict_table
[]
=
{
STATIC
const
mp_
rom_
map_elem_t
extint_locals_dict_table
[]
=
{
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_line
),
(
mp_obj_t
)
&
extint_obj_line_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_line
),
MP_ROM_PTR
(
&
extint_obj_line_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_enable
),
(
mp_obj_t
)
&
extint_obj_enable_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_enable
),
MP_ROM_PTR
(
&
extint_obj_enable_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_disable
),
(
mp_obj_t
)
&
extint_obj_disable_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_disable
),
MP_ROM_PTR
(
&
extint_obj_disable_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_swint
),
(
mp_obj_t
)
&
extint_obj_swint_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_swint
),
MP_ROM_PTR
(
&
extint_obj_swint_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_regs
),
(
mp_obj_t
)
&
extint_regs_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_regs
),
MP_ROM_PTR
(
&
extint_regs_obj
)
},
// class constants
// class constants
/// \constant IRQ_RISING - interrupt on a rising edge
/// \constant IRQ_RISING - interrupt on a rising edge
/// \constant IRQ_FALLING - interrupt on a falling edge
/// \constant IRQ_FALLING - interrupt on a falling edge
/// \constant IRQ_RISING_FALLING - interrupt on a rising or falling edge
/// \constant IRQ_RISING_FALLING - interrupt on a rising or falling edge
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_IRQ_RISING
),
MP_
OBJ_NEW_SMALL
_INT
(
GPIO_MODE_IT_RISING
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_IRQ_RISING
),
MP_
ROM
_INT
(
GPIO_MODE_IT_RISING
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_IRQ_FALLING
),
MP_
OBJ_NEW_SMALL
_INT
(
GPIO_MODE_IT_FALLING
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_IRQ_FALLING
),
MP_
ROM
_INT
(
GPIO_MODE_IT_FALLING
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_IRQ_RISING_FALLING
),
MP_
OBJ_NEW_SMALL
_INT
(
GPIO_MODE_IT_RISING_FALLING
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_IRQ_RISING_FALLING
),
MP_
ROM
_INT
(
GPIO_MODE_IT_RISING_FALLING
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_EVT_RISING
),
MP_
OBJ_NEW_SMALL
_INT
(
GPIO_MODE_EVT_RISING
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_EVT_RISING
),
MP_
ROM
_INT
(
GPIO_MODE_EVT_RISING
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_EVT_FALLING
),
MP_
OBJ_NEW_SMALL
_INT
(
GPIO_MODE_EVT_FALLING
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_EVT_FALLING
),
MP_
ROM
_INT
(
GPIO_MODE_EVT_FALLING
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_EVT_RISING_FALLING
),
MP_
OBJ_NEW_SMALL
_INT
(
GPIO_MODE_EVT_RISING_FALLING
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_EVT_RISING_FALLING
),
MP_
ROM
_INT
(
GPIO_MODE_EVT_RISING_FALLING
)
},
};
};
STATIC
MP_DEFINE_CONST_DICT
(
extint_locals_dict
,
extint_locals_dict_table
);
STATIC
MP_DEFINE_CONST_DICT
(
extint_locals_dict
,
extint_locals_dict_table
);
...
@@ -394,7 +394,7 @@ const mp_obj_type_t extint_type = {
...
@@ -394,7 +394,7 @@ const mp_obj_type_t extint_type = {
.
name
=
MP_QSTR_ExtInt
,
.
name
=
MP_QSTR_ExtInt
,
.
print
=
extint_obj_print
,
.
print
=
extint_obj_print
,
.
make_new
=
extint_make_new
,
.
make_new
=
extint_make_new
,
.
locals_dict
=
(
mp_obj_
t
)
&
extint_locals_dict
,
.
locals_dict
=
(
mp_obj_
dict_t
*
)
&
extint_locals_dict
,
};
};
void
extint_init0
(
void
)
{
void
extint_init0
(
void
)
{
...
...
stmhal/i2c.c
View file @
09866754
...
@@ -1010,22 +1010,22 @@ STATIC mp_obj_t pyb_i2c_mem_write(mp_uint_t n_args, const mp_obj_t *pos_args, mp
...
@@ -1010,22 +1010,22 @@ STATIC mp_obj_t pyb_i2c_mem_write(mp_uint_t n_args, const mp_obj_t *pos_args, mp
}
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_KW
(
pyb_i2c_mem_write_obj
,
1
,
pyb_i2c_mem_write
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_KW
(
pyb_i2c_mem_write_obj
,
1
,
pyb_i2c_mem_write
);
STATIC
const
mp_map_elem_t
pyb_i2c_locals_dict_table
[]
=
{
STATIC
const
mp_
rom_
map_elem_t
pyb_i2c_locals_dict_table
[]
=
{
// instance methods
// instance methods
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_init
),
(
mp_obj_t
)
&
pyb_i2c_init_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_init
),
MP_ROM_PTR
(
&
pyb_i2c_init_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_deinit
),
(
mp_obj_t
)
&
pyb_i2c_deinit_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_deinit
),
MP_ROM_PTR
(
&
pyb_i2c_deinit_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_is_ready
),
(
mp_obj_t
)
&
pyb_i2c_is_ready_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_is_ready
),
MP_ROM_PTR
(
&
pyb_i2c_is_ready_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_scan
),
(
mp_obj_t
)
&
pyb_i2c_scan_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_scan
),
MP_ROM_PTR
(
&
pyb_i2c_scan_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_send
),
(
mp_obj_t
)
&
pyb_i2c_send_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_send
),
MP_ROM_PTR
(
&
pyb_i2c_send_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_recv
),
(
mp_obj_t
)
&
pyb_i2c_recv_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_recv
),
MP_ROM_PTR
(
&
pyb_i2c_recv_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_mem_read
),
(
mp_obj_t
)
&
pyb_i2c_mem_read_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_mem_read
),
MP_ROM_PTR
(
&
pyb_i2c_mem_read_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_mem_write
),
(
mp_obj_t
)
&
pyb_i2c_mem_write_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_mem_write
),
MP_ROM_PTR
(
&
pyb_i2c_mem_write_obj
)
},
// class constants
// class constants
/// \constant MASTER - for initialising the bus to master mode
/// \constant MASTER - for initialising the bus to master mode
/// \constant SLAVE - for initialising the bus to slave mode
/// \constant SLAVE - for initialising the bus to slave mode
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_MASTER
),
MP_OBJ_NEW_SMALL
_INT
(
PYB_I2C_MASTER
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_MASTER
),
MP_ROM
_INT
(
PYB_I2C_MASTER
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_SLAVE
),
MP_OBJ_NEW_SMALL
_INT
(
PYB_I2C_SLAVE
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_SLAVE
),
MP_ROM
_INT
(
PYB_I2C_SLAVE
)
},
};
};
STATIC
MP_DEFINE_CONST_DICT
(
pyb_i2c_locals_dict
,
pyb_i2c_locals_dict_table
);
STATIC
MP_DEFINE_CONST_DICT
(
pyb_i2c_locals_dict
,
pyb_i2c_locals_dict_table
);
...
@@ -1035,5 +1035,5 @@ const mp_obj_type_t pyb_i2c_type = {
...
@@ -1035,5 +1035,5 @@ const mp_obj_type_t pyb_i2c_type = {
.
name
=
MP_QSTR_I2C
,
.
name
=
MP_QSTR_I2C
,
.
print
=
pyb_i2c_print
,
.
print
=
pyb_i2c_print
,
.
make_new
=
pyb_i2c_make_new
,
.
make_new
=
pyb_i2c_make_new
,
.
locals_dict
=
(
mp_obj_
t
)
&
pyb_i2c_locals_dict
,
.
locals_dict
=
(
mp_obj_
dict_t
*
)
&
pyb_i2c_locals_dict
,
};
};
stmhal/lcd.c
View file @
09866754
...
@@ -504,17 +504,17 @@ STATIC mp_obj_t pyb_lcd_show(mp_obj_t self_in) {
...
@@ -504,17 +504,17 @@ STATIC mp_obj_t pyb_lcd_show(mp_obj_t self_in) {
}
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_1
(
pyb_lcd_show_obj
,
pyb_lcd_show
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_1
(
pyb_lcd_show_obj
,
pyb_lcd_show
);
STATIC
const
mp_map_elem_t
pyb_lcd_locals_dict_table
[]
=
{
STATIC
const
mp_
rom_
map_elem_t
pyb_lcd_locals_dict_table
[]
=
{
// instance methods
// instance methods
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_command
),
(
mp_obj_t
)
&
pyb_lcd_command_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_command
),
MP_ROM_PTR
(
&
pyb_lcd_command_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_contrast
),
(
mp_obj_t
)
&
pyb_lcd_contrast_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_contrast
),
MP_ROM_PTR
(
&
pyb_lcd_contrast_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_light
),
(
mp_obj_t
)
&
pyb_lcd_light_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_light
),
MP_ROM_PTR
(
&
pyb_lcd_light_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_write
),
(
mp_obj_t
)
&
pyb_lcd_write_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_write
),
MP_ROM_PTR
(
&
pyb_lcd_write_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_fill
),
(
mp_obj_t
)
&
pyb_lcd_fill_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_fill
),
MP_ROM_PTR
(
&
pyb_lcd_fill_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_get
),
(
mp_obj_t
)
&
pyb_lcd_get_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_get
),
MP_ROM_PTR
(
&
pyb_lcd_get_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_pixel
),
(
mp_obj_t
)
&
pyb_lcd_pixel_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_pixel
),
MP_ROM_PTR
(
&
pyb_lcd_pixel_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_text
),
(
mp_obj_t
)
&
pyb_lcd_text_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_text
),
MP_ROM_PTR
(
&
pyb_lcd_text_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_show
),
(
mp_obj_t
)
&
pyb_lcd_show_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_show
),
MP_ROM_PTR
(
&
pyb_lcd_show_obj
)
},
};
};
STATIC
MP_DEFINE_CONST_DICT
(
pyb_lcd_locals_dict
,
pyb_lcd_locals_dict_table
);
STATIC
MP_DEFINE_CONST_DICT
(
pyb_lcd_locals_dict
,
pyb_lcd_locals_dict_table
);
...
@@ -523,7 +523,7 @@ const mp_obj_type_t pyb_lcd_type = {
...
@@ -523,7 +523,7 @@ const mp_obj_type_t pyb_lcd_type = {
{
&
mp_type_type
},
{
&
mp_type_type
},
.
name
=
MP_QSTR_LCD
,
.
name
=
MP_QSTR_LCD
,
.
make_new
=
pyb_lcd_make_new
,
.
make_new
=
pyb_lcd_make_new
,
.
locals_dict
=
(
mp_obj_
t
)
&
pyb_lcd_locals_dict
,
.
locals_dict
=
(
mp_obj_
dict_t
*
)
&
pyb_lcd_locals_dict
,
};
};
#endif // MICROPY_HW_HAS_LCD
#endif // MICROPY_HW_HAS_LCD
stmhal/led.c
View file @
09866754
...
@@ -349,11 +349,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(led_obj_off_obj, led_obj_off);
...
@@ -349,11 +349,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(led_obj_off_obj, led_obj_off);
STATIC
MP_DEFINE_CONST_FUN_OBJ_1
(
led_obj_toggle_obj
,
led_obj_toggle
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_1
(
led_obj_toggle_obj
,
led_obj_toggle
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
led_obj_intensity_obj
,
1
,
2
,
led_obj_intensity
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
led_obj_intensity_obj
,
1
,
2
,
led_obj_intensity
);
STATIC
const
mp_map_elem_t
led_locals_dict_table
[]
=
{
STATIC
const
mp_
rom_
map_elem_t
led_locals_dict_table
[]
=
{
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_on
),
(
mp_obj_t
)
&
led_obj_on_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_on
),
MP_ROM_PTR
(
&
led_obj_on_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_off
),
(
mp_obj_t
)
&
led_obj_off_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_off
),
MP_ROM_PTR
(
&
led_obj_off_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_toggle
),
(
mp_obj_t
)
&
led_obj_toggle_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_toggle
),
MP_ROM_PTR
(
&
led_obj_toggle_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_intensity
),
(
mp_obj_t
)
&
led_obj_intensity_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_intensity
),
MP_ROM_PTR
(
&
led_obj_intensity_obj
)
},
};
};
STATIC
MP_DEFINE_CONST_DICT
(
led_locals_dict
,
led_locals_dict_table
);
STATIC
MP_DEFINE_CONST_DICT
(
led_locals_dict
,
led_locals_dict_table
);
...
@@ -363,7 +363,7 @@ const mp_obj_type_t pyb_led_type = {
...
@@ -363,7 +363,7 @@ const mp_obj_type_t pyb_led_type = {
.
name
=
MP_QSTR_LED
,
.
name
=
MP_QSTR_LED
,
.
print
=
led_obj_print
,
.
print
=
led_obj_print
,
.
make_new
=
led_obj_make_new
,
.
make_new
=
led_obj_make_new
,
.
locals_dict
=
(
mp_obj_
t
)
&
led_locals_dict
,
.
locals_dict
=
(
mp_obj_
dict_t
*
)
&
led_locals_dict
,
};
};
#else
#else
...
...
stmhal/make-stmconst.py
View file @
09866754
...
@@ -162,13 +162,13 @@ def print_regs_as_submodules(reg_name, reg_defs, modules, needed_qstrs):
...
@@ -162,13 +162,13 @@ def print_regs_as_submodules(reg_name, reg_defs, modules, needed_qstrs):
modules
.
append
((
mod_name_lower
,
mod_name_upper
))
modules
.
append
((
mod_name_lower
,
mod_name_upper
))
print
(
"""
print
(
"""
STATIC const mp_map_elem_t stm_%s_globals_table[] = {
STATIC const mp_
rom_
map_elem_t stm_%s_globals_table[] = {
{ MP_
OBJ_NEW
_QSTR(MP_QSTR___name__), MP_
OBJ_NEW
_QSTR(MP_QSTR_%s) },
{ MP_
ROM
_QSTR(MP_QSTR___name__), MP_
ROM
_QSTR(MP_QSTR_%s) },
"""
%
(
mod_name_lower
,
mod_name_upper
))
"""
%
(
mod_name_lower
,
mod_name_upper
))
needed_qstrs
.
add
(
mod_name_upper
)
needed_qstrs
.
add
(
mod_name_upper
)
for
r
in
reg_defs
:
for
r
in
reg_defs
:
print
(
' { MP_
OBJ_NEW
_QSTR(MP_QSTR_%s), MP_
OBJ_NEW_SMALL
_INT(%#x) }, // %s-bits, %s'
%
(
r
[
0
],
r
[
1
],
r
[
2
],
r
[
3
]))
print
(
' { MP_
ROM
_QSTR(MP_QSTR_%s), MP_
ROM
_INT(%#x) }, // %s-bits, %s'
%
(
r
[
0
],
r
[
1
],
r
[
2
],
r
[
3
]))
needed_qstrs
.
add
(
r
[
0
])
needed_qstrs
.
add
(
r
[
0
])
print
(
"""};
print
(
"""};
...
...
stmhal/modmachine.c
View file @
09866754
...
@@ -518,66 +518,66 @@ STATIC mp_obj_t machine_reset_cause(void) {
...
@@ -518,66 +518,66 @@ STATIC mp_obj_t machine_reset_cause(void) {
}
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_0
(
machine_reset_cause_obj
,
machine_reset_cause
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_0
(
machine_reset_cause_obj
,
machine_reset_cause
);
STATIC
const
mp_map_elem_t
machine_module_globals_table
[]
=
{
STATIC
const
mp_
rom_
map_elem_t
machine_module_globals_table
[]
=
{
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR___name__
),
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_umachine
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR___name__
),
MP_
ROM
_QSTR
(
MP_QSTR_umachine
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_info
),
(
mp_obj_t
)
&
machine_info_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_info
),
MP_ROM_PTR
(
&
machine_info_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_unique_id
),
(
mp_obj_t
)
&
machine_unique_id_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_unique_id
),
MP_ROM_PTR
(
&
machine_unique_id_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_reset
),
(
mp_obj_t
)
&
machine_reset_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_reset
),
MP_ROM_PTR
(
&
machine_reset_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_soft_reset
),
(
mp_obj_t
)
&
machine_soft_reset_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_soft_reset
),
MP_ROM_PTR
(
&
machine_soft_reset_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_bootloader
),
(
mp_obj_t
)
&
machine_bootloader_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_bootloader
),
MP_ROM_PTR
(
&
machine_bootloader_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_freq
),
(
mp_obj_t
)
&
machine_freq_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_freq
),
MP_ROM_PTR
(
&
machine_freq_obj
)
},
#if MICROPY_HW_ENABLE_RNG
#if MICROPY_HW_ENABLE_RNG
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_rng
),
(
mp_obj_t
)
&
pyb_rng_get_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_rng
),
MP_ROM_PTR
(
&
pyb_rng_get_obj
)
},
#endif
#endif
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_idle
),
(
mp_obj_t
)
&
pyb_wfi_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_idle
),
MP_ROM_PTR
(
&
pyb_wfi_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_sleep
),
(
mp_obj_t
)
&
machine_sleep_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_sleep
),
MP_ROM_PTR
(
&
machine_sleep_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_deepsleep
),
(
mp_obj_t
)
&
machine_deepsleep_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_deepsleep
),
MP_ROM_PTR
(
&
machine_deepsleep_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_reset_cause
),
(
mp_obj_t
)
&
machine_reset_cause_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_reset_cause
),
MP_ROM_PTR
(
&
machine_reset_cause_obj
)
},
#if 0
#if 0
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_wake_reason),
(mp_obj_t)
&machine_wake_reason_obj },
{ MP_
ROM
_QSTR(MP_QSTR_wake_reason),
MP_ROM_PTR(
&machine_wake_reason_obj
)
},
#endif
#endif
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_disable_irq
),
(
mp_obj_t
)
&
pyb_disable_irq_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_disable_irq
),
MP_ROM_PTR
(
&
pyb_disable_irq_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_enable_irq
),
(
mp_obj_t
)
&
pyb_enable_irq_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_enable_irq
),
MP_ROM_PTR
(
&
pyb_enable_irq_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_time_pulse_us
),
(
mp_obj_t
)
&
machine_time_pulse_us_obj
},
{
MP_
ROM
_QSTR
(
MP_QSTR_time_pulse_us
),
MP_ROM_PTR
(
&
machine_time_pulse_us_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_mem8
),
(
mp_obj_t
)
&
machine_mem8_obj
},
{
MP_ROM_QSTR
(
MP_QSTR_mem8
),
MP_ROM_PTR
(
&
machine_mem8_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_mem16
),
(
mp_obj_t
)
&
machine_mem16_obj
},
{
MP_ROM_QSTR
(
MP_QSTR_mem16
),
MP_ROM_PTR
(
&
machine_mem16_obj
)
},
{
MP_ROM_QSTR
(
MP_QSTR_mem32
),
(
mp_obj_t
)
&
machine_mem32_obj
},
{
MP_ROM_QSTR
(
MP_QSTR_mem32
),
MP_ROM_PTR
(
&
machine_mem32_obj
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_Pin
),
(
mp_obj_t
)
&
pin_type
},
{
MP_
ROM
_QSTR
(
MP_QSTR_Pin
),
MP_ROM_PTR
(
&
pin_type
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_Signal
),
(
mp_obj_t
)
&
machine_signal_type
},
{
MP_
ROM
_QSTR
(
MP_QSTR_Signal
),
MP_ROM_PTR
(
&
machine_signal_type
)
},
#if 0
#if 0
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_RTC),
(mp_obj_t)
&pyb_rtc_type },
{ MP_
ROM
_QSTR(MP_QSTR_RTC),
MP_ROM_PTR(
&pyb_rtc_type
)
},
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_ADC),
(mp_obj_t)
&pyb_adc_type },
{ MP_
ROM
_QSTR(MP_QSTR_ADC),
MP_ROM_PTR(
&pyb_adc_type
)
},
#endif
#endif
// TODO: Per new API, I2C types below, if called with 1 arg (ID), should still
// TODO: Per new API, I2C types below, if called with 1 arg (ID), should still
// initialize master mode on the peripheral.
// initialize master mode on the peripheral.
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_I2C
),
(
mp_obj_t
)
&
machine_i2c_type
},
{
MP_
ROM
_QSTR
(
MP_QSTR_I2C
),
MP_ROM_PTR
(
&
machine_i2c_type
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_SPI
),
(
mp_obj_t
)
&
machine_hard_spi_type
},
{
MP_
ROM
_QSTR
(
MP_QSTR_SPI
),
MP_ROM_PTR
(
&
machine_hard_spi_type
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_WDT
),
(
mp_obj_t
)
&
pyb_wdt_type
},
{
MP_
ROM
_QSTR
(
MP_QSTR_WDT
),
MP_ROM_PTR
(
&
pyb_wdt_type
)
},
#if 0
#if 0
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_UART),
(mp_obj_t)
&pyb_uart_type },
{ MP_
ROM
_QSTR(MP_QSTR_UART),
MP_ROM_PTR(
&pyb_uart_type
)
},
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_Timer),
(mp_obj_t)
&pyb_timer_type },
{ MP_
ROM
_QSTR(MP_QSTR_Timer),
MP_ROM_PTR(
&pyb_timer_type
)
},
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_HeartBeat),
(mp_obj_t)
&pyb_heartbeat_type },
{ MP_
ROM
_QSTR(MP_QSTR_HeartBeat),
MP_ROM_PTR(
&pyb_heartbeat_type
)
},
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_SD),
(mp_obj_t)
&pyb_sd_type },
{ MP_
ROM
_QSTR(MP_QSTR_SD),
MP_ROM_PTR(
&pyb_sd_type
)
},
// class constants
// class constants
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_IDLE), MP_
OBJ_NEW_SMALL
_INT(PYB_PWR_MODE_ACTIVE) },
{ MP_
ROM
_QSTR(MP_QSTR_IDLE), MP_
ROM
_INT(PYB_PWR_MODE_ACTIVE) },
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_SLEEP), MP_
OBJ_NEW_SMALL
_INT(PYB_PWR_MODE_LPDS) },
{ MP_
ROM
_QSTR(MP_QSTR_SLEEP), MP_
ROM
_INT(PYB_PWR_MODE_LPDS) },
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_DEEPSLEEP), MP_
OBJ_NEW_SMALL
_INT(PYB_PWR_MODE_HIBERNATE) },
{ MP_
ROM
_QSTR(MP_QSTR_DEEPSLEEP), MP_
ROM
_INT(PYB_PWR_MODE_HIBERNATE) },
#endif
#endif
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_PWRON_RESET
),
MP_
OBJ_NEW_SMALL
_INT
(
PYB_RESET_POWER_ON
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_PWRON_RESET
),
MP_
ROM
_INT
(
PYB_RESET_POWER_ON
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_HARD_RESET
),
MP_
OBJ_NEW_SMALL
_INT
(
PYB_RESET_HARD
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_HARD_RESET
),
MP_
ROM
_INT
(
PYB_RESET_HARD
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_WDT_RESET
),
MP_
OBJ_NEW_SMALL
_INT
(
PYB_RESET_WDT
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_WDT_RESET
),
MP_
ROM
_INT
(
PYB_RESET_WDT
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_DEEPSLEEP_RESET
),
MP_
OBJ_NEW_SMALL
_INT
(
PYB_RESET_DEEPSLEEP
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_DEEPSLEEP_RESET
),
MP_
ROM
_INT
(
PYB_RESET_DEEPSLEEP
)
},
{
MP_
OBJ_NEW
_QSTR
(
MP_QSTR_SOFT_RESET
),
MP_
OBJ_NEW_SMALL
_INT
(
PYB_RESET_SOFT
)
},
{
MP_
ROM
_QSTR
(
MP_QSTR_SOFT_RESET
),
MP_
ROM
_INT
(
PYB_RESET_SOFT
)
},
#if 0
#if 0
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_WLAN_WAKE), MP_
OBJ_NEW_SMALL
_INT(PYB_SLP_WAKED_BY_WLAN) },
{ MP_
ROM
_QSTR(MP_QSTR_WLAN_WAKE), MP_
ROM
_INT(PYB_SLP_WAKED_BY_WLAN) },
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_PIN_WAKE), MP_
OBJ_NEW_SMALL
_INT(PYB_SLP_WAKED_BY_GPIO) },
{ MP_
ROM
_QSTR(MP_QSTR_PIN_WAKE), MP_
ROM
_INT(PYB_SLP_WAKED_BY_GPIO) },
{ MP_
OBJ_NEW
_QSTR(MP_QSTR_RTC_WAKE), MP_
OBJ_NEW_SMALL
_INT(PYB_SLP_WAKED_BY_RTC) },
{ MP_
ROM
_QSTR(MP_QSTR_RTC_WAKE), MP_
ROM
_INT(PYB_SLP_WAKED_BY_RTC) },
#endif
#endif
};
};
...
...
stmhal/modnetwork.c
View file @
09866754
...
@@ -71,17 +71,17 @@ STATIC mp_obj_t network_route(void) {
...
@@ -71,17 +71,17 @@ STATIC mp_obj_t network_route(void) {
}
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_0
(
network_route_obj
,
network_route
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_0
(
network_route_obj
,
network_route
);
STATIC
const
mp_map_elem_t
mp_module_network_globals_table
[]
=
{