Skip to content

Commit 0334058

Browse files
committedOct 11, 2015
Rename "Micro Python" to "MicroPython" in REPL, help, readme's and misc.
1 parent 6206f43 commit 0334058

22 files changed

+39
-39
lines changed
 

‎ACKNOWLEDGEMENTS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
The Micro Python project was proudly and successfully crowdfunded
1+
The MicroPython project was proudly and successfully crowdfunded
22
via a Kickstarter campaign which ended on 13th December 2013. The
33
project was supported by 1923 very generous backers, who pledged
44
for a total of 2320 pyboards.

‎CODECONVENTIONS.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ Names:
4141
- Use CAPS_WITH_UNDERSCORE for enums and macros.
4242
- When defining a type use underscore_case and put '_t' after it.
4343

44-
Integer types: Micro Python runs on 16, 32, and 64 bit machines, so it's
44+
Integer types: MicroPython runs on 16, 32, and 64 bit machines, so it's
4545
important to use the correctly-sized (and signed) integer types. The
4646
general guidelines are:
4747
- For most cases use mp_int_t for signed and mp_uint_t for unsigned
4848
integer values. These are guaranteed to be machine-word sized and
49-
therefore big enough to hold the value from a Micro Python small-int
49+
therefore big enough to hold the value from a MicroPython small-int
5050
object.
5151
- Use size_t for things that count bytes / sizes of objects.
5252
- You can use int/uint, but remember that they may be 16-bits wide.

‎README.md

+12-12
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
[istats-issue-img]: http://issuestats.com/github/micropython/micropython/badge/issue
99
[istats-issue-repo]: http://issuestats.com/github/micropython/micropython
1010

11-
The Micro Python project
12-
========================
11+
The MicroPython project
12+
=======================
1313
<p align="center">
1414
<img src="https://raw.githubusercontent.com/micropython/micropython/master/logo/upython-with-micro.jpg" alt="MicroPython Logo"/>
1515
</p>
1616

17-
This is the Micro Python project, which aims to put an implementation
17+
This is the MicroPython project, which aims to put an implementation
1818
of Python 3.x on microcontrollers and small embedded systems.
1919

2020
WARNING: this project is in beta stage and is subject to changes of the
2121
code-base, including project-wide name changes and API changes.
2222

23-
Micro Python implements the entire Python 3.4 syntax (including exceptions,
23+
MicroPython implements the entire Python 3.4 syntax (including exceptions,
2424
"with", "yield from", etc.). The following core datatypes are provided:
2525
str (including basic Unicode support), bytes, bytearray, tuple, list, dict,
2626
set, frozenset, array.array, collections.namedtuple, classes and instances.
@@ -33,19 +33,19 @@ Python board, the officially supported reference electronic circuit board.
3333
Major components in this repository:
3434
- py/ -- the core Python implementation, including compiler, runtime, and
3535
core library.
36-
- unix/ -- a version of Micro Python that runs on Unix.
37-
- stmhal/ -- a version of Micro Python that runs on the Micro Python board
36+
- unix/ -- a version of MicroPython that runs on Unix.
37+
- stmhal/ -- a version of MicroPython that runs on the MicroPython board
3838
with an STM32F405RG (using ST's Cube HAL drivers).
39-
- minimal/ -- a minimal Micro Python port. Start with this if you want
40-
to port Micro Python to another microcontroller.
39+
- minimal/ -- a minimal MicroPython port. Start with this if you want
40+
to port MicroPython to another microcontroller.
4141

4242
Additional components:
43-
- bare-arm/ -- a bare minimum version of Micro Python for ARM MCUs. Used
43+
- bare-arm/ -- a bare minimum version of MicroPython for ARM MCUs. Used
4444
mostly to control code size.
45-
- teensy/ -- a version of Micro Python that runs on the Teensy 3.1
45+
- teensy/ -- a version of MicroPython that runs on the Teensy 3.1
4646
(preliminary but functional).
47-
- pic16bit/ -- a version of Micro Python for 16-bit PIC microcontrollers.
48-
- cc3200/ -- a version of Micro Python that runs on the CC3200 from TI.
47+
- pic16bit/ -- a version of MicroPython for 16-bit PIC microcontrollers.
48+
- cc3200/ -- a version of MicroPython that runs on the CC3200 from TI.
4949
- esp8266/ -- an experimental port for ESP8266 WiFi modules.
5050
- tests/ -- test framework and test scripts.
5151
- tools/ -- various tools, including the pyboard.py module.

‎cc3200/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Build Instructions for the CC3200
22

3-
Currently the CC3200 port of Micro Python builds under Linux and OSX **but not under Windows**.
3+
Currently the CC3200 port of MicroPython builds under Linux and OSX **but not under Windows**.
44

55
The tool chain required for the build can be found at <https://launchpad.net/gcc-arm-embedded>.
66

@@ -25,7 +25,7 @@ make BTARGET=bootloader BTYPE=release BOARD=LAUNCHXL
2525
```
2626

2727
## Regarding old revisions of the CC3200-LAUNCHXL
28-
First silicon (pre-release) revisions of the CC3200 had issues with the ram blocks, and Micro Python cannot run
28+
First silicon (pre-release) revisions of the CC3200 had issues with the ram blocks, and MicroPython cannot run
2929
there. Make sure to use a **v4.1 (or higer) LAUNCHXL board** when trying this port, otherwise it won't work.
3030

3131
## Flashing the CC3200

‎cc3200/misc/help.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "py/mpconfig.h"
3131
#include "py/obj.h"
3232

33-
STATIC const char help_text[] = "Welcome to Micro Python!\n"
33+
STATIC const char help_text[] = "Welcome to MicroPython!\n"
3434
"For online help please visit http://micropython.org/help/.\n"
3535
"For further help on a specific object, type help(obj)\n";
3636

‎cc3200/telnet/telnet.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ typedef struct {
108108
DECLARE PRIVATE DATA
109109
******************************************************************************/
110110
static telnet_data_t telnet_data;
111-
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";
111+
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";
112112
static const char* telnet_request_user = "Login as: ";
113113
static const char* telnet_request_password = "Password: ";
114114
static const char* telnet_invalid_loggin = "\r\nInvalid credentials, try again.\r\n";

‎esp8266/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Micro Python port to ESP8266
2-
============================
1+
MicroPython port to ESP8266
2+
===========================
33

44
This is a highly experimental port of MicroPython for the WiFi modules based
55
on Espressif ESP8266 chip.
@@ -31,7 +31,7 @@ The tool chain required for the build is the OpenSource ESP SDK, which can be
3131
found at <https://github.com/pfalcon/esp-open-sdk>. Clone this repository and
3232
run `make` in its directory to build and install the SDK locally.
3333

34-
Then, to build Micro Python for the ESP8266, just run:
34+
Then, to build MicroPython for the ESP8266, just run:
3535
```bash
3636
$ make
3737
```

‎stmhal/help.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "py/obj.h"
3131

3232
STATIC const char *help_text =
33-
"Welcome to Micro Python!\n"
33+
"Welcome to MicroPython!\n"
3434
"\n"
3535
"For online help please visit http://micropython.org/help/.\n"
3636
"\n"

‎stmhal/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ static const char fresh_pybcdc_inf[] =
150150
;
151151

152152
static const char fresh_readme_txt[] =
153-
"This is a Micro Python board\r\n"
153+
"This is a MicroPython board\r\n"
154154
"\r\n"
155155
"You can get started right away by writing your Python code in 'main.py'.\r\n"
156156
"\r\n"

‎stmhal/pybcdc.inf_template

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,6 @@ ServiceBinary=%12%\usbser.sys
8787

8888
[Strings]
8989
MFGFILENAME="pybcdc"
90-
MFGNAME="Micro Python"
90+
MFGNAME="MicroPython"
9191
DESCRIPTION="Pyboard USB Comm Port"
9292
SERVICE="USB Serial Driver"

‎stmhal/pyexec.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ STATIC int pyexec_friendly_repl_process_char(int c) {
206206
} else if (ret == CHAR_CTRL_B) {
207207
// reset friendly REPL
208208
mp_hal_stdout_tx_str("\r\n");
209-
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");
209+
mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n");
210210
mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n");
211211
goto input_restart;
212212
} else if (ret == CHAR_CTRL_C) {
@@ -350,7 +350,7 @@ int pyexec_friendly_repl(void) {
350350
#endif
351351

352352
friendly_repl_reset:
353-
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");
353+
mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME "\r\n");
354354
mp_hal_stdout_tx_str("Type \"help()\" for more information.\r\n");
355355

356356
// to test ctrl-C

‎stmhal/usbd_desc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#define USBD_VID 0xf055
3939
#define USBD_PID 0x9800
4040
#define USBD_LANGID_STRING 0x409
41-
#define USBD_MANUFACTURER_STRING "Micro Python"
41+
#define USBD_MANUFACTURER_STRING "MicroPython"
4242
#define USBD_PRODUCT_HS_STRING "Pyboard Virtual Comm Port in HS Mode"
4343
#define USBD_SERIALNUMBER_HS_STRING "000000000010"
4444
#define USBD_PRODUCT_FS_STRING "Pyboard Virtual Comm Port in FS Mode"

‎teensy/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Build Instructions for Teensy 3.1
22

3-
Currently the Teensy 3.1 port of Micro Python builds under Linux and not under Windows.
3+
Currently the Teensy 3.1 port of MicroPython builds under Linux and not under Windows.
44

55
The tool chain required for the build can be found at <https://launchpad.net/gcc-arm-embedded>.
66

‎teensy/help.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "py/obj.h"
3030

3131
STATIC const char *help_text =
32-
"Welcome to Micro Python!\n"
32+
"Welcome to MicroPython!\n"
3333
"\n"
3434
"For online help please visit http://micropython.org/help/.\n"
3535
"\n"

‎tests/cmdline/repl_basic.py.exp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Micro Python \.\+ version
1+
MicroPython \.\+ version
22
>>> # basic REPL tests
33
>>> print(1)
44
1

‎tests/cmdline/repl_cont.py.exp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Micro Python \.\+ version
1+
MicroPython \.\+ version
22
>>> # check REPL allows to continue input
33
>>> 1 \\\\
44
... + 2

‎tests/cmdline/repl_emacs_keys.py.exp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Micro Python \.\+ version
1+
MicroPython \.\+ version
22
>>> # REPL tests of GNU-ish readline navigation
33
>>> # history buffer navigation
44
>>> 1

‎tests/feature_check/repl_emacs_check.py.exp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Micro Python \.\+ version
1+
MicroPython \.\+ version
22
>>> # Check for emacs keys in REPL
33
>>> t = \.\+
44
>>> t == 2

‎tests/run-bench-tests

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def run_tests(pyb, test_dict):
5858
return True
5959

6060
def main():
61-
cmd_parser = argparse.ArgumentParser(description='Run tests for Micro Python.')
61+
cmd_parser = argparse.ArgumentParser(description='Run tests for MicroPython.')
6262
cmd_parser.add_argument('--pyboard', action='store_true', help='run the tests on the pyboard')
6363
cmd_parser.add_argument('files', nargs='*', help='input test files')
6464
args = cmd_parser.parse_args()

‎tests/run-tests

+2-2
Original file line numberDiff line numberDiff line change
@@ -311,15 +311,15 @@ def run_tests(pyb, tests, args):
311311
return True
312312

313313
def main():
314-
cmd_parser = argparse.ArgumentParser(description='Run tests for Micro Python.')
314+
cmd_parser = argparse.ArgumentParser(description='Run tests for MicroPython.')
315315
cmd_parser.add_argument('--target', default='unix', help='the target platform')
316316
cmd_parser.add_argument('--device', default='/dev/ttyACM0', help='the serial device or the IP address of the pyboard')
317317
cmd_parser.add_argument('-b', '--baudrate', default=115200, help='the baud rate of the serial device')
318318
cmd_parser.add_argument('-u', '--user', default='micro', help='the telnet login username')
319319
cmd_parser.add_argument('-p', '--password', default='python', help='the telnet login password')
320320
cmd_parser.add_argument('-d', '--test-dirs', nargs='*', help='input test directories (if no files given)')
321321
cmd_parser.add_argument('--write-exp', action='store_true', help='save .exp files to run tests w/o CPython')
322-
cmd_parser.add_argument('--emit', default='bytecode', help='Micro Python emitter to use (bytecode or native)')
322+
cmd_parser.add_argument('--emit', default='bytecode', help='MicroPython emitter to use (bytecode or native)')
323323
cmd_parser.add_argument('files', nargs='*', help='input test files')
324324
args = cmd_parser.parse_args()
325325

‎tools/gen-changelog.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
echo "Micro Python change log"
3+
echo "MicroPython change log"
44

55
for t in $(git tag | grep -v v1.0-rc1 | sort -rV); do
66
echo ''

‎unix/main.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ STATIC char *strjoin(const char *s1, int sep_char, const char *s2) {
153153
#endif
154154

155155
STATIC int do_repl(void) {
156-
mp_hal_stdout_tx_str("Micro Python " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_PY_SYS_PLATFORM " version\n");
156+
mp_hal_stdout_tx_str("MicroPython " MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE "; " MICROPY_PY_SYS_PLATFORM " version\n");
157157

158158
#if MICROPY_USE_READLINE == 1
159159

0 commit comments

Comments
 (0)
Please sign in to comment.