From 4d7fba83a6192df95f8728e87d5923b11c29ece6 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sun, 22 Jan 2017 10:18:25 +1100
Subject: [PATCH] cc3200: Convert to use builtin help function.
---
cc3200/application.mk | 1 -
cc3200/misc/help.c | 19 ++-----------------
cc3200/mpconfigport.h | 3 ++-
3 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/cc3200/application.mk b/cc3200/application.mk
index f2801c337..b4d659fa1 100644
--- a/cc3200/application.mk
+++ b/cc3200/application.mk
@@ -153,7 +153,6 @@ APP_LIB_SRC_C = $(addprefix lib/,\
netutils/netutils.c \
timeutils/timeutils.c \
utils/pyexec.c \
- utils/pyhelp.c \
)
APP_STM_SRC_C = $(addprefix stmhal/,\
diff --git a/cc3200/misc/help.c b/cc3200/misc/help.c
index 4601818bd..cce515898 100644
--- a/cc3200/misc/help.c
+++ b/cc3200/misc/help.c
@@ -25,23 +25,8 @@
* THE SOFTWARE.
*/
-#include <stdio.h>
+#include "py/builtin.h"
-#include "lib/utils/pyhelp.h"
-
-STATIC const char help_text[] = "Welcome to MicroPython!\n"
+const char *cc3200_help_text = "Welcome to MicroPython!\n"
"For online help please visit http://micropython.org/help/.\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);
diff --git a/cc3200/mpconfigport.h b/cc3200/mpconfigport.h
index 5b6a035d5..4bf0b1061 100644
--- a/cc3200/mpconfigport.h
+++ b/cc3200/mpconfigport.h
@@ -80,6 +80,8 @@
#define MICROPY_PY_ASYNC_AWAIT (0)
#define MICROPY_PY_BUILTINS_TIMEOUTERROR (1)
#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
+#define MICROPY_PY_BUILTINS_HELP (1)
+#define MICROPY_PY_BUILTINS_HELP_TEXT cc3200_help_text
#ifndef DEBUG
#define MICROPY_PY_BUILTINS_STR_UNICODE (1)
#define MICROPY_PY_BUILTINS_STR_SPLITLINES (1)
@@ -120,7 +122,6 @@
// extra built in names to add to the global namespace
#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_open), (mp_obj_t)&mp_builtin_open_obj }, \
--
GitLab