From 0334058fa43a8ac7c689007f5824510c2927c5cc Mon Sep 17 00:00:00 2001 From: Damien George Date: Mon, 12 Oct 2015 00:06:25 +0100 Subject: [PATCH] Rename "Micro Python" to "MicroPython" in REPL, help, readme's and misc. --- ACKNOWLEDGEMENTS | 2 +- CODECONVENTIONS.md | 4 ++-- README.md | 24 ++++++++++----------- cc3200/README.md | 4 ++-- cc3200/misc/help.c | 2 +- cc3200/telnet/telnet.c | 2 +- esp8266/README.md | 6 +++--- stmhal/help.c | 2 +- stmhal/main.c | 2 +- stmhal/pybcdc.inf_template | 2 +- stmhal/pyexec.c | 4 ++-- stmhal/usbd_desc.c | 2 +- teensy/README.md | 2 +- teensy/help.c | 2 +- tests/cmdline/repl_basic.py.exp | 2 +- tests/cmdline/repl_cont.py.exp | 2 +- tests/cmdline/repl_emacs_keys.py.exp | 2 +- tests/feature_check/repl_emacs_check.py.exp | 2 +- tests/run-bench-tests | 2 +- tests/run-tests | 4 ++-- tools/gen-changelog.sh | 2 +- unix/main.c | 2 +- 22 files changed, 39 insertions(+), 39 deletions(-) diff --git a/ACKNOWLEDGEMENTS b/ACKNOWLEDGEMENTS index cd2782a898..d03cb231c3 100644 --- a/ACKNOWLEDGEMENTS +++ b/ACKNOWLEDGEMENTS @@ -1,4 +1,4 @@ -The Micro Python project was proudly and successfully crowdfunded +The MicroPython project was proudly and successfully crowdfunded via a Kickstarter campaign which ended on 13th December 2013. The project was supported by 1923 very generous backers, who pledged for a total of 2320 pyboards. diff --git a/CODECONVENTIONS.md b/CODECONVENTIONS.md index 11cb114a91..951adee91f 100644 --- a/CODECONVENTIONS.md +++ b/CODECONVENTIONS.md @@ -41,12 +41,12 @@ Names: - Use CAPS_WITH_UNDERSCORE for enums and macros. - When defining a type use underscore_case and put '_t' after it. -Integer types: Micro Python runs on 16, 32, and 64 bit machines, so it's +Integer types: MicroPython runs on 16, 32, and 64 bit machines, so it's important to use the correctly-sized (and signed) integer types. The general guidelines are: - For most cases use mp_int_t for signed and mp_uint_t for unsigned integer values. These are guaranteed to be machine-word sized and - therefore big enough to hold the value from a Micro Python small-int + therefore big enough to hold the value from a MicroPython small-int object. - Use size_t for things that count bytes / sizes of objects. - You can use int/uint, but remember that they may be 16-bits wide. diff --git a/README.md b/README.md index 5588846099..be97a7759d 100644 --- a/README.md +++ b/README.md @@ -8,19 +8,19 @@ [istats-issue-img]: http://issuestats.com/github/micropython/micropython/badge/issue [istats-issue-repo]: http://issuestats.com/github/micropython/micropython -The Micro Python project -======================== +The MicroPython project +=======================

MicroPython Logo

-This is the Micro Python project, which aims to put an implementation +This is the MicroPython project, which aims to put an implementation of Python 3.x on microcontrollers and small embedded systems. WARNING: this project is in beta stage and is subject to changes of the code-base, including project-wide name changes and API changes. -Micro Python implements the entire Python 3.4 syntax (including exceptions, +MicroPython implements the entire Python 3.4 syntax (including exceptions, "with", "yield from", etc.). The following core datatypes are provided: str (including basic Unicode support), bytes, bytearray, tuple, list, dict, set, frozenset, array.array, collections.namedtuple, classes and instances. @@ -33,19 +33,19 @@ Python board, the officially supported reference electronic circuit board. Major components in this repository: - py/ -- the core Python implementation, including compiler, runtime, and core library. -- unix/ -- a version of Micro Python that runs on Unix. -- stmhal/ -- a version of Micro Python that runs on the Micro Python board +- unix/ -- a version of MicroPython that runs on Unix. +- stmhal/ -- a version of MicroPython that runs on the MicroPython board with an STM32F405RG (using ST's Cube HAL drivers). -- minimal/ -- a minimal Micro Python port. Start with this if you want - to port Micro Python to another microcontroller. +- minimal/ -- a minimal MicroPython port. Start with this if you want + to port MicroPython to another microcontroller. Additional components: -- bare-arm/ -- a bare minimum version of Micro Python for ARM MCUs. Used +- bare-arm/ -- a bare minimum version of MicroPython for ARM MCUs. Used mostly to control code size. -- teensy/ -- a version of Micro Python that runs on the Teensy 3.1 +- teensy/ -- a version of MicroPython that runs on the Teensy 3.1 (preliminary but functional). -- pic16bit/ -- a version of Micro Python for 16-bit PIC microcontrollers. -- cc3200/ -- a version of Micro Python that runs on the CC3200 from TI. +- pic16bit/ -- a version of MicroPython for 16-bit PIC microcontrollers. +- cc3200/ -- a version of MicroPython that runs on the CC3200 from TI. - esp8266/ -- an experimental port for ESP8266 WiFi modules. - tests/ -- test framework and test scripts. - tools/ -- various tools, including the pyboard.py module. diff --git a/cc3200/README.md b/cc3200/README.md index fa718d9836..94bab71637 100644 --- a/cc3200/README.md +++ b/cc3200/README.md @@ -1,6 +1,6 @@ # Build Instructions for the CC3200 -Currently the CC3200 port of Micro Python builds under Linux and OSX **but not under Windows**. +Currently the CC3200 port of MicroPython builds under Linux and OSX **but not under Windows**. The tool chain required for the build can be found at . @@ -25,7 +25,7 @@ make BTARGET=bootloader BTYPE=release BOARD=LAUNCHXL ``` ## Regarding old revisions of the CC3200-LAUNCHXL -First silicon (pre-release) revisions of the CC3200 had issues with the ram blocks, and Micro Python cannot run +First silicon (pre-release) revisions of the CC3200 had issues with the ram blocks, and MicroPython cannot run there. Make sure to use a **v4.1 (or higer) LAUNCHXL board** when trying this port, otherwise it won't work. ## Flashing the CC3200 diff --git a/cc3200/misc/help.c b/cc3200/misc/help.c index 0059a4002a..9bbd711a88 100644 --- a/cc3200/misc/help.c +++ b/cc3200/misc/help.c @@ -30,7 +30,7 @@ #include "py/mpconfig.h" #include "py/obj.h" -STATIC const char help_text[] = "Welcome to Micro Python!\n" +STATIC const char 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"; diff --git a/cc3200/telnet/telnet.c b/cc3200/telnet/telnet.c index 966dde130e..3c28666cd1 100644 --- a/cc3200/telnet/telnet.c +++ b/cc3200/telnet/telnet.c @@ -108,7 +108,7 @@ typedef struct { DECLARE PRIVATE DATA ******************************************************************************/ static telnet_data_t telnet_data; -static const char* telnet_welcome_msg = "Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n"; +static const char* telnet_welcome_msg = "MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n"; static const char* telnet_request_user = "Login as: "; static const char* telnet_request_password = "Password: "; static const char* telnet_invalid_loggin = "\r\nInvalid credentials, try again.\r\n"; diff --git a/esp8266/README.md b/esp8266/README.md index c207220d0d..17002eefe4 100644 --- a/esp8266/README.md +++ b/esp8266/README.md @@ -1,5 +1,5 @@ -Micro Python port to ESP8266 -============================ +MicroPython port to ESP8266 +=========================== This is a highly experimental port of MicroPython for the WiFi modules based on Espressif ESP8266 chip. @@ -31,7 +31,7 @@ The tool chain required for the build is the OpenSource ESP SDK, which can be found at . Clone this repository and run `make` in its directory to build and install the SDK locally. -Then, to build Micro Python for the ESP8266, just run: +Then, to build MicroPython for the ESP8266, just run: ```bash $ make ``` diff --git a/stmhal/help.c b/stmhal/help.c index 2a86a97855..32837972f0 100644 --- a/stmhal/help.c +++ b/stmhal/help.c @@ -30,7 +30,7 @@ #include "py/obj.h" STATIC const char *help_text = -"Welcome to Micro Python!\n" +"Welcome to MicroPython!\n" "\n" "For online help please visit http://micropython.org/help/.\n" "\n" diff --git a/stmhal/main.c b/stmhal/main.c index d6ae3d61f9..f814fdfc44 100644 --- a/stmhal/main.c +++ b/stmhal/main.c @@ -150,7 +150,7 @@ static const char fresh_pybcdc_inf[] = ; static const char fresh_readme_txt[] = -"This is a Micro Python board\r\n" +"This is a MicroPython board\r\n" "\r\n" "You can get started right away by writing your Python code in 'main.py'.\r\n" "\r\n" diff --git a/stmhal/pybcdc.inf_template b/stmhal/pybcdc.inf_template index 8e1803bef9..85279ada34 100644 --- a/stmhal/pybcdc.inf_template +++ b/stmhal/pybcdc.inf_template @@ -87,6 +87,6 @@ ServiceBinary=%12%\usbser.sys [Strings] MFGFILENAME="pybcdc" -MFGNAME="Micro Python" +MFGNAME="MicroPython" DESCRIPTION="Pyboard USB Comm Port" SERVICE="USB Serial Driver" diff --git a/stmhal/pyexec.c b/stmhal/pyexec.c index a809940a8a..0ab0e0ee15 100644 --- a/stmhal/pyexec.c +++ b/stmhal/pyexec.c @@ -206,7 +206,7 @@ STATIC int pyexec_friendly_repl_process_char(int c) { } else if (ret == CHAR_CTRL_B) { // reset friendly REPL mp_hal_stdout_tx_str("\r\n"); - mp_hal_stdout_tx_str("Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n"); + mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n"); mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n"); goto input_restart; } else if (ret == CHAR_CTRL_C) { @@ -350,7 +350,7 @@ int pyexec_friendly_repl(void) { #endif friendly_repl_reset: - mp_hal_stdout_tx_str("Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n"); + mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n"); mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n"); // to test ctrl-C diff --git a/stmhal/usbd_desc.c b/stmhal/usbd_desc.c index 9f2a84162a..23b6f3405c 100644 --- a/stmhal/usbd_desc.c +++ b/stmhal/usbd_desc.c @@ -38,7 +38,7 @@ #define USBD_VID 0xf055 #define USBD_PID 0x9800 #define USBD_LANGID_STRING 0x409 -#define USBD_MANUFACTURER_STRING "Micro Python" +#define USBD_MANUFACTURER_STRING "MicroPython" #define USBD_PRODUCT_HS_STRING "Pyboard Virtual Comm Port in HS Mode" #define USBD_SERIALNUMBER_HS_STRING "000000000010" #define USBD_PRODUCT_FS_STRING "Pyboard Virtual Comm Port in FS Mode" diff --git a/teensy/README.md b/teensy/README.md index c240f0d5fe..14a5e4a713 100644 --- a/teensy/README.md +++ b/teensy/README.md @@ -1,6 +1,6 @@ # Build Instructions for Teensy 3.1 -Currently the Teensy 3.1 port of Micro Python builds under Linux and not under Windows. +Currently the Teensy 3.1 port of MicroPython builds under Linux and not under Windows. The tool chain required for the build can be found at . diff --git a/teensy/help.c b/teensy/help.c index 38a8d550f9..d8fe3a1d9c 100644 --- a/teensy/help.c +++ b/teensy/help.c @@ -29,7 +29,7 @@ #include "py/obj.h" STATIC const char *help_text = -"Welcome to Micro Python!\n" +"Welcome to MicroPython!\n" "\n" "For online help please visit http://micropython.org/help/.\n" "\n" diff --git a/tests/cmdline/repl_basic.py.exp b/tests/cmdline/repl_basic.py.exp index 04887f44d9..1b4a497032 100644 --- a/tests/cmdline/repl_basic.py.exp +++ b/tests/cmdline/repl_basic.py.exp @@ -1,4 +1,4 @@ -Micro Python \.\+ version +MicroPython \.\+ version >>> # basic REPL tests >>> print(1) 1 diff --git a/tests/cmdline/repl_cont.py.exp b/tests/cmdline/repl_cont.py.exp index 185754799d..47a126643e 100644 --- a/tests/cmdline/repl_cont.py.exp +++ b/tests/cmdline/repl_cont.py.exp @@ -1,4 +1,4 @@ -Micro Python \.\+ version +MicroPython \.\+ version >>> # check REPL allows to continue input >>> 1 \\\\ ... + 2 diff --git a/tests/cmdline/repl_emacs_keys.py.exp b/tests/cmdline/repl_emacs_keys.py.exp index 8bbf08bd12..6edaf28130 100644 --- a/tests/cmdline/repl_emacs_keys.py.exp +++ b/tests/cmdline/repl_emacs_keys.py.exp @@ -1,4 +1,4 @@ -Micro Python \.\+ version +MicroPython \.\+ version >>> # REPL tests of GNU-ish readline navigation >>> # history buffer navigation >>> 1 diff --git a/tests/feature_check/repl_emacs_check.py.exp b/tests/feature_check/repl_emacs_check.py.exp index d3834429bd..e456ef3b0e 100644 --- a/tests/feature_check/repl_emacs_check.py.exp +++ b/tests/feature_check/repl_emacs_check.py.exp @@ -1,4 +1,4 @@ -Micro Python \.\+ version +MicroPython \.\+ version >>> # Check for emacs keys in REPL >>> t = \.\+ >>> t == 2 diff --git a/tests/run-bench-tests b/tests/run-bench-tests index 59074bb877..62f0833f41 100755 --- a/tests/run-bench-tests +++ b/tests/run-bench-tests @@ -58,7 +58,7 @@ def run_tests(pyb, test_dict): return True def main(): - cmd_parser = argparse.ArgumentParser(description='Run tests for Micro Python.') + cmd_parser = argparse.ArgumentParser(description='Run tests for MicroPython.') cmd_parser.add_argument('--pyboard', action='store_true', help='run the tests on the pyboard') cmd_parser.add_argument('files', nargs='*', help='input test files') args = cmd_parser.parse_args() diff --git a/tests/run-tests b/tests/run-tests index 0c344b96d8..371accb8a9 100755 --- a/tests/run-tests +++ b/tests/run-tests @@ -311,7 +311,7 @@ def run_tests(pyb, tests, args): return True def main(): - cmd_parser = argparse.ArgumentParser(description='Run tests for Micro Python.') + cmd_parser = argparse.ArgumentParser(description='Run tests for MicroPython.') cmd_parser.add_argument('--target', default='unix', help='the target platform') cmd_parser.add_argument('--device', default='/dev/ttyACM0', help='the serial device or the IP address of the pyboard') cmd_parser.add_argument('-b', '--baudrate', default=115200, help='the baud rate of the serial device') @@ -319,7 +319,7 @@ def main(): cmd_parser.add_argument('-p', '--password', default='python', help='the telnet login password') cmd_parser.add_argument('-d', '--test-dirs', nargs='*', help='input test directories (if no files given)') cmd_parser.add_argument('--write-exp', action='store_true', help='save .exp files to run tests w/o CPython') - cmd_parser.add_argument('--emit', default='bytecode', help='Micro Python emitter to use (bytecode or native)') + cmd_parser.add_argument('--emit', default='bytecode', help='MicroPython emitter to use (bytecode or native)') cmd_parser.add_argument('files', nargs='*', help='input test files') args = cmd_parser.parse_args() diff --git a/tools/gen-changelog.sh b/tools/gen-changelog.sh index f3ae22d7a1..6eca1b4b11 100755 --- a/tools/gen-changelog.sh +++ b/tools/gen-changelog.sh @@ -1,6 +1,6 @@ #!/bin/sh -echo "Micro Python change log" +echo "MicroPython change log" for t in $(git tag | grep -v v1.0-rc1 | sort -rV); do echo '' diff --git a/unix/main.c b/unix/main.c index a3f4cfe6cf..badbca1a92 100644 --- a/unix/main.c +++ b/unix/main.c @@ -153,7 +153,7 @@ STATIC char *strjoin(const char *s1, int sep_char, const char *s2) { #endif STATIC int do_repl(void) { - mp_hal_stdout_tx_str("Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_PY_SYS_PLATFORM " version\n"); + mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_PY_SYS_PLATFORM " version\n"); #if MICROPY_USE_READLINE == 1