Commit 8678e3ed authored by Damien George's avatar Damien George
Browse files

stmhal: Convert to use builtin help function.

parent 9f04dfb5
...@@ -112,7 +112,6 @@ SRC_LIB = $(addprefix lib/,\ ...@@ -112,7 +112,6 @@ SRC_LIB = $(addprefix lib/,\
netutils/netutils.c \ netutils/netutils.c \
timeutils/timeutils.c \ timeutils/timeutils.c \
utils/pyexec.c \ utils/pyexec.c \
utils/pyhelp.c \
) )
SRC_C = \ SRC_C = \
......
...@@ -24,11 +24,9 @@ ...@@ -24,11 +24,9 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include <stdio.h> #include "py/builtin.h"
#include "lib/utils/pyhelp.h" const char *stmhal_help_text =
STATIC const char *help_text =
"Welcome to MicroPython!\n" "Welcome to MicroPython!\n"
"\n" "\n"
"For online help please visit http://micropython.org/help/.\n" "For online help please visit http://micropython.org/help/.\n"
...@@ -70,17 +68,3 @@ STATIC const char *help_text = ...@@ -70,17 +68,3 @@ STATIC const char *help_text =
"\n" "\n"
"For further help on a specific object, type help(obj)\n" "For further help on a specific object, type help(obj)\n"
; ;
STATIC mp_obj_t pyb_help(uint n_args, const mp_obj_t *args) {
if (n_args == 0) {
// print a general help message
printf("%s", help_text);
} else {
// try to print something sensible about the given object
pyhelp_print_obj(args[0]);
}
return mp_const_none;
}
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_help_obj, 0, 1, pyb_help);
...@@ -76,6 +76,8 @@ ...@@ -76,6 +76,8 @@
#define MICROPY_PY_BUILTINS_FROZENSET (1) #define MICROPY_PY_BUILTINS_FROZENSET (1)
#define MICROPY_PY_BUILTINS_EXECFILE (1) #define MICROPY_PY_BUILTINS_EXECFILE (1)
#define MICROPY_PY_BUILTINS_COMPILE (1) #define MICROPY_PY_BUILTINS_COMPILE (1)
#define MICROPY_PY_BUILTINS_HELP (1)
#define MICROPY_PY_BUILTINS_HELP_TEXT stmhal_help_text
#define MICROPY_PY_ALL_SPECIAL_METHODS (1) #define MICROPY_PY_ALL_SPECIAL_METHODS (1)
#define MICROPY_PY_MICROPYTHON_MEM_INFO (1) #define MICROPY_PY_MICROPYTHON_MEM_INFO (1)
#define MICROPY_PY_ARRAY_SLICE_ASSIGN (1) #define MICROPY_PY_ARRAY_SLICE_ASSIGN (1)
...@@ -130,7 +132,6 @@ ...@@ -130,7 +132,6 @@
// extra built in names to add to the global namespace // extra built in names to add to the global namespace
#define MICROPY_PORT_BUILTINS \ #define MICROPY_PORT_BUILTINS \
{ MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj },
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment