diff --git a/.github/workflows/ports_windows.yml b/.github/workflows/ports_windows.yml index a2759880a2f65..be2a2a8dac332 100644 --- a/.github/workflows/ports_windows.yml +++ b/.github/workflows/ports_windows.yml @@ -56,14 +56,14 @@ jobs: - uses: actions/setup-python@v5 if: matrix.runner == 'windows-2019' with: - python-version: '3.9' + python-version: '3.9' - uses: actions/checkout@v4 - name: Build mpy-cross.exe run: msbuild mpy-cross\mpy-cross.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }} - name: Update submodules run: git submodule update --init lib/micropython-lib - name: Build micropython.exe - run: msbuild ports\windows\micropython.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }} -property:PyVariant=${{ matrix.variant }} + run: msbuild ports\windows\micropython.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }} -property:PyVariant=${{ matrix.variant }} - name: Get micropython.exe path id: get_path run: | @@ -123,7 +123,7 @@ jobs: msystem: ${{ matrix.sys }} update: true install: >- - make + make mingw-w64-${{ matrix.env }}-gcc pkg-config python3 diff --git a/docs/develop/gettingstarted.rst b/docs/develop/gettingstarted.rst index a17a320671f52..c1fd338c54cc0 100644 --- a/docs/develop/gettingstarted.rst +++ b/docs/develop/gettingstarted.rst @@ -112,7 +112,7 @@ Check that you have Python available on your system: .. code-block:: bash $ python3 - Python 3.5.0 (default, Jul 17 2020, 14:04:10) + Python 3.5.0 (default, Jul 17 2020, 14:04:10) [GCC 5.4.0 20160609] on linux Type "help", "copyright", "credits" or "license" for more information. >>> diff --git a/docs/differences/python_37.rst b/docs/differences/python_37.rst index 86d1b6e81f96d..2b9a089217f6d 100644 --- a/docs/differences/python_37.rst +++ b/docs/differences/python_37.rst @@ -105,4 +105,4 @@ Changes to built-in modules: .. rubric:: Notes -.. [#ftimenanosec] Only :func:`time.time_ns` is implemented. +.. [#ftimenanosec] Only :func:`time.time_ns` is implemented. diff --git a/docs/library/machine.ADCBlock.rst b/docs/library/machine.ADCBlock.rst index eb94362d5597c..e947f70815071 100644 --- a/docs/library/machine.ADCBlock.rst +++ b/docs/library/machine.ADCBlock.rst @@ -26,7 +26,7 @@ Constructors Access the ADC peripheral identified by *id*, which may be an integer or string. - + The *bits* argument, if given, sets the resolution in bits of the conversion process. If not specified then the previous or default resolution is used. diff --git a/docs/library/machine.PWM.rst b/docs/library/machine.PWM.rst index b9cf00240314c..5f592b8dff593 100644 --- a/docs/library/machine.PWM.rst +++ b/docs/library/machine.PWM.rst @@ -86,7 +86,7 @@ Specific PWM class implementations The following concrete class(es) implement enhancements to the PWM class. - | :ref:`pyb.Timer for PyBoard ` + | :ref:`pyb.Timer for PyBoard ` Limitations of PWM ------------------ @@ -103,7 +103,7 @@ Limitations of PWM Some ports like the RP2040 one use a fractional divider, which allow a finer granularity of the frequency at higher frequencies by switching the PWM pulse duration between two adjacent values, such that the resulting average - frequency is more close to the intended one, at the cost of spectral purity. + frequency is more close to the intended one, at the cost of spectral purity. * The duty cycle has the same discrete nature and its absolute accuracy is not achievable. On most hardware platforms the duty will be applied at the next diff --git a/docs/mimxrt/pinout.rst b/docs/mimxrt/pinout.rst index 16bb4722734a2..3ff892c64d688 100644 --- a/docs/mimxrt/pinout.rst +++ b/docs/mimxrt/pinout.rst @@ -319,7 +319,7 @@ MIXMXRT1050-EVKB D10/-/D11/D12/D13 (*) - - MIXMXRT1060-EVK D10/-/D11/D12/D13 (*) - - MIXMXRT1064-EVK D10/-/D11/D12/D13 (*) - - MIXMXRT1170-EVK D10/-/D11/D12/D13 D28/-/D25/D24/D26 -/-/D14/D15/D24 -Adafruit Metro M7 -/-/MOSI/MISO/SCK - - +Adafruit Metro M7 -/-/MOSI/MISO/SCK - - Olimex RT1010Py - CS0/-/SDO/SDI/SCK SDCARD with CS1 Seeed ARCH MIX J4_12/-/J4_14/J4_13/J4_15 J3_09/J3_05/J3_08_J3_11 ================= ========================= ======================= =============== @@ -375,7 +375,7 @@ Teensy 4.0 2 33 4 3 2 - - 5 Teensy 4.1 1 23 26 27 7 21 20 8 Teensy 4.1 2 33 4 3 2 - - 5 Seeed Arch MIX 1 J4_09 J4_14 J4_15 J14_13 J4_11 J4_10 J4_10 -Adafruit Metro M7 1 D8 D10 D9 D12 D14 D15 D13 +Adafruit Metro M7 1 D8 D10 D9 D12 D14 D15 D13 Olimex RT1010Py 1 D8 D6 D7 D4 D1 D2 D3 Olimex RT1010Py 3 - D10 D9 D11 - - - MIMXRT_DEV 1 "MCK" "SCK_TX" "WS_TX" "SD_TX" "SCK_RX" "WS_RX" "SD_RX" diff --git a/docs/mimxrt/quickref.rst b/docs/mimxrt/quickref.rst index 519313438321c..1a73929bedbe3 100644 --- a/docs/mimxrt/quickref.rst +++ b/docs/mimxrt/quickref.rst @@ -309,7 +309,7 @@ rates (up to 30Mhz). Hardware SPI is accessed via the For the assignment of Pins to SPI signals, refer to :ref:`Hardware SPI pinout `. The keyword option cs=n can be used to enable the cs pin 0 or 1 for an automatic cs signal. The -default is cs=-1. Using cs=-1 the automatic cs signal is not created. +default is cs=-1. Using cs=-1 the automatic cs signal is not created. In that case, cs has to be set by the script. Clearing that assignment requires a power cycle. Notes: diff --git a/docs/samd/pinout.rst b/docs/samd/pinout.rst index 5ff72b83586ac..5da4ae78d45b5 100644 --- a/docs/samd/pinout.rst +++ b/docs/samd/pinout.rst @@ -17,12 +17,12 @@ Adafruit ItsyBitsy M0 Express pin assignment table === ==== ============ ==== ==== ====== ====== ====== ====== Pin GPIO Pin name IRQ ADC Serial Serial TCC/TC TCC/TC === ==== ============ ==== ==== ====== ====== ====== ====== - 2 PA02 A0 2 0 - - - - - 40 PB08 A1 8 2 - 4/0 4/0 - - 41 PB09 A2 9 3 - 4/1 4/1 - - 4 PA04 A3 4 4 - 0/0 0/0 - - 5 PA05 A4 5 5 - 0/1 0/1 - - 34 PB02 A5 2 10 - 5/0 6/0 - + 2 PA02 A0 2 0 - - - - + 40 PB08 A1 8 2 - 4/0 4/0 - + 41 PB09 A2 9 3 - 4/1 4/1 - + 4 PA04 A3 4 4 - 0/0 0/0 - + 5 PA05 A4 5 5 - 0/1 0/1 - + 34 PB02 A5 2 10 - 5/0 6/0 - 11 PA11 D0 11 19 0/3 2/3 1/1 0/3 10 PA10 D1 10 18 0/2 2/2 1/0 0/2 14 PA14 D2 14 - 2/2 4/2 3/0 0/4 @@ -30,31 +30,31 @@ Pin GPIO Pin name IRQ ADC Serial Serial TCC/TC TCC/TC 8 PA08 D4 - 16 0/0 2/0 0/0 1/2 15 PA15 D5 15 - 2/3 4/3 3/1 0/5 21 PA21 D7 5 - 5/3 3/3 7/1 0/7 - 7 PA07 D9 7 7 - 0/3 1/1 - + 7 PA07 D9 7 7 - 0/3 1/1 - 18 PA18 D10 2 - 1/2 3/2 3/0 0/2 16 PA16 D11 0 - 1/0 3/0 2/0 0/6 19 PA19 D12 3 - 1/3 3/3 3/1 0/3 17 PA17 D13 1 - 1/1 3/1 2/1 0/7 - 0 PA00 DOTSTAR_CLK 0 - - 1/0 2/0 - - 1 PA01 DOTSTAR_DATA 1 - - 1/1 2/1 - - 27 PA27 FLASH_CS 15 - - - - - - 35 PB03 FLASH_MISO 3 11 - 5/1 6/1 - - 54 PB22 FLASH_MOSI 6 - - 5/2 7/0 - - 55 PB23 FLASH_SCK 7 - - 5/3 7/1 - + 0 PA00 DOTSTAR_CLK 0 - - 1/0 2/0 - + 1 PA01 DOTSTAR_DATA 1 - - 1/1 2/1 - + 27 PA27 FLASH_CS 15 - - - - - + 35 PB03 FLASH_MISO 3 11 - 5/1 6/1 - + 54 PB22 FLASH_MOSI 6 - - 5/2 7/0 - + 55 PB23 FLASH_SCK 7 - - 5/3 7/1 - 12 PA12 MISO 12 - 2/0 4/0 2/0 0/6 42 PB10 MOSI 10 - - 4/2 5/0 0/4 43 PB11 SCK 11 - - 4/3 5/1 0/5 23 PA23 SCL 7 - 3/1 5/1 4/1 0/5 22 PA22 SDA 6 - 3/0 5/0 4/0 0/4 - 30 PA30 SWCLK 10 - - 1/2 1/0 - - 31 PA31 SWDIO 11 - - 1/3 1/1 - + 30 PA30 SWCLK 10 - - 1/2 1/0 - + 31 PA31 SWDIO 11 - - 1/3 1/1 - 24 PA24 USB_DM 12 - 3/2 5/2 5/0 1/2 25 PA25 USB_DP 13 - 3/3 5/3 5/1 1/3 - 3 PA03 3 1 - - - - - 6 PA06 6 6 - 0/2 1/0 - + 3 PA03 3 1 - - - - + 6 PA06 6 6 - 0/2 1/0 - 13 PA13 13 - 2/1 4/1 2/0 0/7 20 PA20 4 - 5/2 3/2 7/0 0/4 - 28 PA28 8 - - - - - + 28 PA28 8 - - - - - === ==== ============ ==== ==== ====== ====== ====== ====== @@ -348,12 +348,12 @@ Adafruit Metro M4 Airlift pin assignment table === ==== ============ ==== ==== ==== ====== ====== ===== ===== ===== Pin GPIO Pin name IRQ ADC ADC Serial Serial TC PWM PWM === ==== ============ ==== ==== ==== ====== ====== ===== ===== ===== - 2 PA02 A0 2 0 - - - - - - - 5 PA05 A1 5 5 - - 0/1 0/1 - - - 6 PA06 A2 6 6 - - 0/2 1/0 - - - 32 PB00 A3 9 12 - - 5/2 7/0 - - - 40 PB08 A4 8 2 0 - 4/0 4/0 - - - 41 PB09 A5 9 3 1 - 4/1 4/1 - - + 2 PA02 A0 2 0 - - - - - - + 5 PA05 A1 5 5 - - 0/1 0/1 - - + 6 PA06 A2 6 6 - - 0/2 1/0 - - + 32 PB00 A3 9 12 - - 5/2 7/0 - - + 40 PB08 A4 8 2 0 - 4/0 4/0 - - + 41 PB09 A5 9 3 1 - 4/1 4/1 - - 23 PA23 D0 7 - - 3/1 5/0 4/1 1/7 0/3 22 PA22 D1 6 - - 3/0 5/1 4/0 1/6 0/2 49 PB17 D2 1 - - 5/1 - 6/1 3/1 0/5 @@ -364,17 +364,17 @@ Pin GPIO Pin name IRQ ADC ADC Serial Serial TC PWM PWM 44 PB12 D7 12 - - 4/0 - 4/0 3/0 0/0 21 PA21 D8 5 - - 5/3 3/3 7/1 1/5 0/1 20 PA20 D9 4 - - 5/2 3/2 7/0 1/4 0/0 - 3 PA03 AREF 3 10 - - - - - - + 3 PA03 AREF 3 10 - - - - - - 18 PA18 D10 2 - - 1/2 3/2 3/0 1/2 0/6 19 PA19 D11 3 - - 1/3 3/3 3/1 1/3 0/7 16 PA16 D13 0 - - 1/0 3/1 2/0 1/0 0/4 - 36 PB04 ESP_BUSY 4 - 6 - - - - - + 36 PB04 ESP_BUSY 4 - 6 - - - - - 15 PA15 ESP_CS 15 - - 2/3 4/3 3/1 2/1 1/3 - 33 PB01 ESP_GPIO0 1 13 - - 5/3 7/1 - - - 37 PB05 ESP_RESET 5 - 7 - - - - - - 55 PB23 ESP_RTS 7 - - 1/3 5/3 7/1 - - - 7 PA07 ESP_RX 7 7 - - 0/3 1/1 - - - 4 PA04 ESP_TX 4 4 - - 0/0 0/0 - - + 33 PB01 ESP_GPIO0 1 13 - - 5/3 7/1 - - + 37 PB05 ESP_RESET 5 - 7 - - - - - + 55 PB23 ESP_RTS 7 - - 1/3 5/3 7/1 - - + 7 PA07 ESP_RX 7 7 - - 0/3 1/1 - - + 4 PA04 ESP_TX 4 4 - - 0/0 0/0 - - 43 PB11 FLASH_CS 12 - - - 4/3 5/1 0/5 1/1 11 PA11 FLASH_HOLD 11 11 - 0/3 2/3 1/1 0/3 1/7 9 PA09 FLASH_MISO 9 9 3 0/1 2/0 0/1 0/1 1/5 @@ -383,21 +383,21 @@ Pin GPIO Pin name IRQ ADC ADC Serial Serial TC PWM PWM 10 PA10 FLASH_WP 10 10 - 0/2 2/2 1/0 0/2 1/6 14 PA14 MISO 14 - - 2/2 4/2 3/0 2/0 1/2 12 PA12 MOSI 12 - - 2/0 4/1 2/0 0/6 1/2 - 54 PB22 NEOPIXEL 22 - - 1/2 5/2 7/0 - - - 38 PB06 RXLED 6 - 8 - - - - - + 54 PB22 NEOPIXEL 22 - - 1/2 5/2 7/0 - - + 38 PB06 RXLED 6 - 8 - - - - - 13 PA13 SCK 13 - - 2/1 4/0 2/1 0/7 1/3 - 35 PB03 SCL 9 15 - - 5/1 6/1 - - - 34 PB02 SDA 2 14 - - 5/0 6/0 2/2 - - 30 PA30 SWCLK 14 - - 7/2 1/2 6/0 2/0 - - 31 PA31 SWDIO 15 - - 7/3 1/3 6/1 2/1 - + 35 PB03 SCL 9 15 - - 5/1 6/1 - - + 34 PB02 SDA 2 14 - - 5/0 6/0 2/2 - + 30 PA30 SWCLK 14 - - 7/2 1/2 6/0 2/0 - + 31 PA31 SWDIO 15 - - 7/3 1/3 6/1 2/1 - 62 PB30 SWO 14 - - 7/0 5/1 0/0 4/0 0/6 - 39 PB07 TXLED 7 - 9 - - - - - - 24 PA24 USB_DM 8 - - 3/2 5/2 5/0 2/2 - - 25 PA25 USB_DP 9 - - 3/3 5/3 5/1 - - + 39 PB07 TXLED 7 - 9 - - - - - + 24 PA24 USB_DM 8 - - 3/2 5/2 5/0 2/2 - + 25 PA25 USB_DP 9 - - 3/3 5/3 5/1 - - 17 PA17 USB_HOSTEN 1 - - 1/1 3/0 2/1 1/1 0/5 - 0 PA00 - 0 - - - 1/0 2/0 - - - 1 PA01 - 1 - - - 1/1 2/1 - - - 27 PA27 - 11 - - - - - - - + 0 PA00 - 0 - - - 1/0 2/0 - - + 1 PA01 - 1 - - - 1/1 2/1 - - + 27 PA27 - 11 - - - - - - - 63 PB31 - 15 - - 7/1 5/0 0/1 4/1 0/7 === ==== ============ ==== ==== ==== ====== ====== ===== ===== ===== diff --git a/docs/wipy/tutorial/repl.rst b/docs/wipy/tutorial/repl.rst index 95b545d097830..aa3aea84a86df 100644 --- a/docs/wipy/tutorial/repl.rst +++ b/docs/wipy/tutorial/repl.rst @@ -119,7 +119,7 @@ Resetting the board If something goes wrong, you can reset the board in two ways. The first is to press CTRL-D at the MicroPython prompt, which performs a soft reset. You will see a message something like:: - >>> + >>> MPY: soft reboot MicroPython v1.4.6-146-g1d8b5e5 on 2015-10-21; WiPy with CC3200 Type "help()" for more information. diff --git a/extmod/axtls-include/config.h b/extmod/axtls-include/config.h index a0dd2b2b60f6d..4cb1aed9ca71c 100644 --- a/extmod/axtls-include/config.h +++ b/extmod/axtls-include/config.h @@ -46,7 +46,7 @@ #define CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME "" #undef CONFIG_SSL_HAS_PEM #undef CONFIG_SSL_USE_PKCS12 -#define CONFIG_SSL_EXPIRY_TIME +#define CONFIG_SSL_EXPIRY_TIME #define CONFIG_X509_MAX_CA_CERTS 0 #define CONFIG_SSL_MAX_CERTS 3 #undef CONFIG_SSL_CTX_MUTEXING @@ -58,11 +58,11 @@ #undef CONFIG_AXTLSWRAP #undef CONFIG_AXHTTPD #undef CONFIG_HTTP_STATIC_BUILD -#define CONFIG_HTTP_PORT -#define CONFIG_HTTP_HTTPS_PORT -#define CONFIG_HTTP_SESSION_CACHE_SIZE +#define CONFIG_HTTP_PORT +#define CONFIG_HTTP_HTTPS_PORT +#define CONFIG_HTTP_SESSION_CACHE_SIZE #define CONFIG_HTTP_WEBROOT "" -#define CONFIG_HTTP_TIMEOUT +#define CONFIG_HTTP_TIMEOUT #undef CONFIG_HTTP_HAS_CGI #define CONFIG_HTTP_CGI_EXTENSIONS "" #undef CONFIG_HTTP_ENABLE_LUA @@ -107,8 +107,8 @@ #undef CONFIG_BIGINT_BARRETT #undef CONFIG_BIGINT_CRT #undef CONFIG_BIGINT_KARATSUBA -#define MUL_KARATSUBA_THRESH -#define SQU_KARATSUBA_THRESH +#define MUL_KARATSUBA_THRESH +#define SQU_KARATSUBA_THRESH #undef CONFIG_BIGINT_SLIDING_WINDOW #undef CONFIG_BIGINT_SQUARE #undef CONFIG_BIGINT_CHECK_ON diff --git a/logo/FONT-LICENSE.txt b/logo/FONT-LICENSE.txt index 69c49d84c83c2..b63d4875e7757 100644 --- a/logo/FONT-LICENSE.txt +++ b/logo/FONT-LICENSE.txt @@ -22,7 +22,7 @@ with others. The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, +fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The diff --git a/ports/cc3200/README.md b/ports/cc3200/README.md index 53cad3ba0ff15..093feba4e243e 100644 --- a/ports/cc3200/README.md +++ b/ports/cc3200/README.md @@ -61,7 +61,7 @@ below). Flashing process using TI Uniflash: -- Open CCS_Uniflash and connect to the board (by default on port 22). +- Open CCS_Uniflash and connect to the board (by default on port 22). - Format the serial flash (select 1MB size in case of the CC3200-LAUNCHXL, 2MB in case of the WiPy, leave the rest unchecked). - Mark the following files for erasing: `/cert/ca.pem`, `/cert/client.pem`, `/cert/private.key` and `/tmp/pac.bin`. - Add a new file with the name of /sys/mcuimg.bin, and select the URL to point to cc3200\bootmgr\build\\bootloader.bin. @@ -94,7 +94,7 @@ Once the software is running, you have two options to access the MicroPython REP in boot.py, so you can override it at runtime regardless of MICROPY_STDIO_UART setting). -The board has a small file system of 192K (WiPy) or 64K (Launchpad) located in the serial flash connected to the CC3200. +The board has a small file system of 192K (WiPy) or 64K (Launchpad) located in the serial flash connected to the CC3200. SD cards are also supported, you can connect any SD card and configure the pinout using the SD class API. ## Uploading scripts: @@ -142,7 +142,7 @@ there. Make sure to use a **v4.1 (or higher) LAUNCHXL board** when trying this p ### Note regarding FileZilla -Do not use the quick connect button, instead, open the site manager and create a new configuration. In the "General" tab make -sure that encryption is set to: "Only use plain FTP (insecure)". In the Transfer Settings tab limit the max number of connections -to one, otherwise FileZilla will try to open a second command connection when retrieving and saving files, and for simplicity and +Do not use the quick connect button, instead, open the site manager and create a new configuration. In the "General" tab make +sure that encryption is set to: "Only use plain FTP (insecure)". In the Transfer Settings tab limit the max number of connections +to one, otherwise FileZilla will try to open a second command connection when retrieving and saving files, and for simplicity and to reduce code size, only one command and one data connections are possible. diff --git a/ports/cc3200/application.lds b/ports/cc3200/application.lds index 2d7dd04621306..b1ca73350eb29 100644 --- a/ports/cc3200/application.lds +++ b/ports/cc3200/application.lds @@ -36,7 +36,7 @@ MEMORY ENTRY(ResetISR) SECTIONS -{ +{ /* place the FreeRTOS heap (the MicroPython stack will live here) */ .rtos_heap (NOLOAD) : { @@ -92,7 +92,7 @@ SECTIONS . = ALIGN(8); _eboot = .; } > SRAM - + /* allocate the MicroPython heap */ .heap : { diff --git a/ports/cc3200/bootmgr/bootgen.sh b/ports/cc3200/bootmgr/bootgen.sh index f4bf32540c066..a802afef6e7c9 100644 --- a/ports/cc3200/bootmgr/bootgen.sh +++ b/ports/cc3200/bootmgr/bootgen.sh @@ -37,7 +37,7 @@ echo "Generating bootloader..." # Generate an all 0 bin file dd if=/dev/zero of=__tmp.bin ibs=1 count=256 conv=notrunc >/dev/null 2>&1 -# Generate a 0 padded version of the relocator +# Generate a 0 padded version of the relocator dd if=$RELOCATOR/relocator.bin of=__tmp.bin ibs=1 conv=notrunc >/dev/null 2>&1 # Concatenate the re-locator and the boot-manager diff --git a/ports/cc3200/bootmgr/bootloader.mk b/ports/cc3200/bootmgr/bootloader.mk index 3aeda062ce422..39a960ef4fb0a 100644 --- a/ports/cc3200/bootmgr/bootloader.mk +++ b/ports/cc3200/bootmgr/bootloader.mk @@ -53,7 +53,7 @@ BOOT_SL_SRC_C = $(addprefix simplelink/,\ BOOT_UTIL_SRC_C = $(addprefix util/,\ cryptohash.c \ - ) + ) BOOT_MAIN_SRC_C = \ bootmgr/main.c @@ -114,7 +114,7 @@ $(BUILD)/bootmgr.axf: $(OBJ) $(LINKER_SCRIPT) $(ECHO) "LINK $@" $(Q)$(CC) -o $@ $(LDFLAGS) $(OBJ) $(LIBS) $(Q)$(SIZE) $@ - + $(BUILD)/bootmgr.bin: $(BUILD)/bootmgr.axf $(ECHO) "Create $@" $(Q)$(OBJCOPY) -O binary $< $@ diff --git a/ports/cc3200/bootmgr/flc.h b/ports/cc3200/bootmgr/flc.h index 8f05bb320e726..2a319a42fd207 100644 --- a/ports/cc3200/bootmgr/flc.h +++ b/ports/cc3200/bootmgr/flc.h @@ -30,7 +30,7 @@ If building with a C++ compiler, make all of the definitions in this header have a C binding. - + *******************************************************************************/ #ifdef __cplusplus extern "C" @@ -84,9 +84,9 @@ typedef struct _sBootInfo_t /****************************************************************************** - + Mark the end of the C bindings section for C++ compilers. - + *******************************************************************************/ #ifdef __cplusplus } diff --git a/ports/cc3200/bootmgr/sl/user.h b/ports/cc3200/bootmgr/sl/user.h index be93029d1c0a5..6753188ee2dc3 100644 --- a/ports/cc3200/bootmgr/sl/user.h +++ b/ports/cc3200/bootmgr/sl/user.h @@ -1,40 +1,40 @@ /* * user.h - CC31xx/CC32xx Host Driver Implementation * - * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ - * - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions * are met: * - * Redistributions of source code must retain the above copyright + * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the * distribution. * * Neither the name of Texas Instruments Incorporated nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ - + #ifndef __USER_H__ #define __USER_H__ @@ -63,8 +63,8 @@ extern "C" { ****************************************************************************** */ - -#include + +#include #include "cc_pal.h" /*! @@ -90,8 +90,8 @@ extern "C" { /*! \def CPU_FREQ_IN_MHZ \brief Defines CPU frequency for Host side, for better accuracy of busy loops, if any - \sa - \note + \sa + \note \warning If not set the default CPU frequency is set to 200MHz This option will be deprecated in future release @@ -330,7 +330,7 @@ extern "C" { The enable/disable API provide mechanism to enable/disable the network processor - + PORTING ACTION: - None @{ @@ -568,9 +568,9 @@ extern "C" { */ #define sl_IfUnMaskIntHdlr() NwpUnMaskInterrupt() - + /*! - \brief Write Handers for statistics debug on write + \brief Write Handers for statistics debug on write \param interface handler - pointer to interrupt handler routine @@ -583,7 +583,7 @@ extern "C" { \note belongs to \ref ported_sec - \warning + \warning */ /* #define SL_START_WRITE_STAT */ @@ -921,7 +921,7 @@ typedef OsiLockObj_t _SlLockObj_t; \brief \sa \note belongs to \ref ported_sec - \warning + \warning */ #define sl_Malloc(Size) malloc(Size) @@ -929,7 +929,7 @@ typedef OsiLockObj_t _SlLockObj_t; \brief \sa \note belongs to \ref ported_sec - \warning + \warning */ #define sl_Free(pMem) free(pMem) #endif @@ -973,9 +973,9 @@ typedef OsiLockObj_t _SlLockObj_t; /*! \brief An event handler for WLAN connection or disconnection indication - This event handles async WLAN events. + This event handles async WLAN events. Possible events are: - SL_WLAN_CONNECT_EVENT - indicates WLAN is connected + SL_WLAN_CONNECT_EVENT - indicates WLAN is connected SL_WLAN_DISCONNECT_EVENT - indicates WLAN is disconnected \sa diff --git a/ports/cc3200/fatfs/src/drivers/stdcmd.h b/ports/cc3200/fatfs/src/drivers/stdcmd.h index 464e2ddfaaec8..a3e617b70adac 100644 --- a/ports/cc3200/fatfs/src/drivers/stdcmd.h +++ b/ports/cc3200/fatfs/src/drivers/stdcmd.h @@ -1,37 +1,37 @@ //***************************************************************************** // stdcmd.h // -// Defines standard SD Card commands for CC3200 SDHOST module. +// Defines standard SD Card commands for CC3200 SDHOST module. // -// Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ -// -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions +// Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ +// +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions // are met: // -// Redistributions of source code must retain the above copyright +// Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // // Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the // distribution. // // Neither the name of Texas Instruments Incorporated nor the names of // its contributors may be used to endorse or promote products derived // from this software without specific prior written permission. // -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // //***************************************************************************** @@ -40,7 +40,7 @@ #define __STDCMD_H__ //***************************************************************************** -// Standard MMC/SD Card Commands +// Standard MMC/SD Card Commands //***************************************************************************** #define CMD_GO_IDLE_STATE SDHOST_CMD_0 #define CMD_SEND_IF_COND SDHOST_CMD_8|SDHOST_RESP_LEN_48 diff --git a/ports/cc3200/hal/cc3200_hal.c b/ports/cc3200/hal/cc3200_hal.c index 8bfd2fda1c8ae..e149968a51d76 100644 --- a/ports/cc3200/hal/cc3200_hal.c +++ b/ports/cc3200/hal/cc3200_hal.c @@ -96,7 +96,7 @@ void HAL_SystemInit (void) { void HAL_SystemDeInit (void) { } - + void HAL_IncrementTick(void) { HAL_tickCount++; } diff --git a/ports/cc3200/hal/gpio.c b/ports/cc3200/hal/gpio.c index 59aa71aa57008..84af18e0fac3a 100644 --- a/ports/cc3200/hal/gpio.c +++ b/ports/cc3200/hal/gpio.c @@ -74,7 +74,7 @@ GPIOBaseValid(unsigned long ulPort) return((ulPort == GPIOA0_BASE) || (ulPort == GPIOA1_BASE) || (ulPort == GPIOA2_BASE) || - (ulPort == GPIOA3_BASE) || + (ulPort == GPIOA3_BASE) || (ulPort == GPIOA4_BASE)); } #else diff --git a/ports/cc3200/hal/inc/hw_memmap.h b/ports/cc3200/hal/inc/hw_memmap.h index 244905dd20ac3..b20a271287908 100644 --- a/ports/cc3200/hal/inc/hw_memmap.h +++ b/ports/cc3200/hal/inc/hw_memmap.h @@ -49,7 +49,7 @@ #define GPIOA1_BASE 0x40005000 #define GPIOA2_BASE 0x40006000 #define GPIOA3_BASE 0x40007000 -#define GPIOA4_BASE 0x40024000 +#define GPIOA4_BASE 0x40024000 #define UARTA0_BASE 0x4000C000 #define UARTA1_BASE 0x4000D000 #define I2CA0_BASE 0x40020000 diff --git a/ports/cc3200/hal/pin.h b/ports/cc3200/hal/pin.h index 784e9f46354b0..61b6446772f7f 100644 --- a/ports/cc3200/hal/pin.h +++ b/ports/cc3200/hal/pin.h @@ -116,8 +116,8 @@ extern "C" #define PIN_MODE_14 0x0000000E #define PIN_MODE_15 0x0000000F // Note : PIN_MODE_255 is a dummy define for pinmux utility code generation -// PIN_MODE_255 should never be used in any user code. -#define PIN_MODE_255 0x000000FF +// PIN_MODE_255 should never be used in any user code. +#define PIN_MODE_255 0x000000FF //***************************************************************************** // Macros that can be used with PinDirModeSet() and returned from diff --git a/ports/cc3200/hal/prcm.h b/ports/cc3200/hal/prcm.h index 2f700ae2c647f..d16538e4aff14 100644 --- a/ports/cc3200/hal/prcm.h +++ b/ports/cc3200/hal/prcm.h @@ -189,8 +189,8 @@ unsigned char ulRstReg; #define PRCM_SSPI 0x00000013 #define PRCM_I2CA0 0x00000014 // Note : PRCM_ADC is a dummy define for pinmux utility code generation -// PRCM_ADC should never be used in any user code. -#define PRCM_ADC 0x000000FF +// PRCM_ADC should never be used in any user code. +#define PRCM_ADC 0x000000FF //***************************************************************************** // User bits in the PRCM persistent registers diff --git a/ports/cc3200/hal/spi.c b/ports/cc3200/hal/spi.c index 8c8c6782897e4..3a6371fd82e02 100644 --- a/ports/cc3200/hal/spi.c +++ b/ports/cc3200/hal/spi.c @@ -762,7 +762,7 @@ SPIConfigSetExpClk(unsigned long ulBase,unsigned long ulSPIClk, // Enable software control Chip Select, Init delay // and 3-pin mode // - ulRegData |= (((ulConfig >> 24) | ulMode) & 0xFF); + ulRegData |= (((ulConfig >> 24) | ulMode) & 0xFF); // // Write the configuration diff --git a/ports/cc3200/simplelink/oslib/osi.h b/ports/cc3200/simplelink/oslib/osi.h index 11fe61bb63ac9..4ab811fc8ad7a 100644 --- a/ports/cc3200/simplelink/oslib/osi.h +++ b/ports/cc3200/simplelink/oslib/osi.h @@ -3,35 +3,35 @@ // // MACRO and Function prototypes for TI-RTOS and Free-RTOS API calls // -// Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ -// -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions +// Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ +// +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions // are met: // -// Redistributions of source code must retain the above copyright +// Redistributions of source code must retain the above copyright // notice, this list zof conditions and the following disclaimer. // // Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the // distribution. // // Neither the name of Texas Instruments Incorporated nor the names of // its contributors may be used to endorse or promote products derived // from this software without specific prior written permission. // -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // //***************************************************************************** @@ -367,23 +367,23 @@ OsiReturnVal_e osi_Spawn(P_OSI_SPAWN_ENTRY pEntry , void* pValue , unsigned long /******************************************************************************* This function creates a message queue that is typically used for inter thread -communication. +communication. Parameters: pMsgQ - pointer to the message queue control block pMsgQName - pointer to the name of the message queue - MsgSize - the size of the message. + MsgSize - the size of the message. NOTICE: THE MESSGAE SIZE MUST BE SMALLER THAN 16 MaxMsgs - maximum number of messages. -Please note that this function allocates the entire memory required -for the maximum number of messages (MsgSize * MaxMsgs). +Please note that this function allocates the entire memory required +for the maximum number of messages (MsgSize * MaxMsgs). ********************************************************************************/ -OsiReturnVal_e osi_MsgQCreate(OsiMsgQ_t* pMsgQ , +OsiReturnVal_e osi_MsgQCreate(OsiMsgQ_t* pMsgQ , char* pMsgQName, unsigned long MsgSize, unsigned long MaxMsgs); @@ -392,7 +392,7 @@ OsiReturnVal_e osi_MsgQCreate(OsiMsgQ_t* pMsgQ , This function deletes a specific message queue. All threads suspended waiting for a message from this queue are resumed with -an error return value. +an error return value. Parameters: @@ -406,11 +406,11 @@ OsiReturnVal_e osi_MsgQDelete(OsiMsgQ_t* pMsgQ); This function writes a message to a specific message queue. -Notice that the message is copied to the queue from the memory area specified +Notice that the message is copied to the queue from the memory area specified by pMsg pointer. -------------------------------------------------------------------------------- -THIS FUNCTION COULD BE CALLED FROM ISR AS LONG AS THE TIMEOUT PARAMETER IS +THIS FUNCTION COULD BE CALLED FROM ISR AS LONG AS THE TIMEOUT PARAMETER IS SET TO "OSI_NO_WAIT" -------------------------------------------------------------------------------- @@ -418,7 +418,7 @@ SET TO "OSI_NO_WAIT" pMsgQ - pointer to the message queue control block pMsg - pointer to the message - Timeout - numeric value specifies the maximum number of mSec to stay + Timeout - numeric value specifies the maximum number of mSec to stay suspended while waiting for available space for the message ********************************************************************************/ @@ -428,14 +428,14 @@ OsiReturnVal_e osi_MsgQWrite(OsiMsgQ_t* pMsgQ, void* pMsg , OsiTime_t Timeout); /******************************************************************************* This function retrieves a message from the specified message queue. The -retrieved message is copied from the queue into the memory area specified by -the pMsg pointer +retrieved message is copied from the queue into the memory area specified by +the pMsg pointer Parameters: pMsgQ - pointer to the message queue control block pMsg - pointer that specify the location where to copy the message - Timeout - numeric value specifies the maximum number of mSec to stay + Timeout - numeric value specifies the maximum number of mSec to stay suspended while waiting for a message to be available ********************************************************************************/ @@ -478,7 +478,7 @@ void mem_Free(void *pMem); \param Size - Size of the memory to be set \sa \note - \warning + \warning */ void mem_set(void *pBuf,int Val,size_t Size); @@ -489,7 +489,7 @@ void mem_set(void *pBuf,int Val,size_t Size); \param Size - Size of the memory to be copied \return void \note - \warning + \warning */ void mem_copy(void *pDst, void *pSrc,size_t Size); @@ -497,7 +497,7 @@ void mem_copy(void *pDst, void *pSrc,size_t Size); \brief Enter Critical Section \sa \note - \warning + \warning */ void osi_EnterCritical(void); @@ -505,7 +505,7 @@ void osi_EnterCritical(void); \brief Exit Critical Section \sa \note - \warning + \warning */ void osi_ExitCritical(void); @@ -563,7 +563,7 @@ typedef struct P_OSI_SPAWN_ENTRY pEntry; void* pValue; }tSimpleLinkSpawnMsg; - + /* The queue used to send message to simple link spawn task. */ extern void* xSimpleLinkSpawnQueue; diff --git a/ports/cc3200/simplelink/oslib/osi_freertos.c b/ports/cc3200/simplelink/oslib/osi_freertos.c index 53822add73d52..dcc7a2a7c7fbd 100644 --- a/ports/cc3200/simplelink/oslib/osi_freertos.c +++ b/ports/cc3200/simplelink/oslib/osi_freertos.c @@ -3,35 +3,35 @@ // // Interface APIs for free-rtos function calls // -// Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ -// -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions +// Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ +// +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions // are met: // -// Redistributions of source code must retain the above copyright +// Redistributions of source code must retain the above copyright // notice, this list of conditions and the following disclaimer. // // Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the // distribution. // // Neither the name of Texas Instruments Incorporated nor the names of // its contributors may be used to endorse or promote products derived // from this software without specific prior written permission. // -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // //***************************************************************************** @@ -57,7 +57,7 @@ static void vSimpleLinkSpawnTask( void *pvParameters ); //Queue Handler QueueHandle_t xSimpleLinkSpawnQueue = NULL; TaskHandle_t xSimpleLinkSpawnTaskHndl = NULL; -// Queue size +// Queue size #define slQUEUE_SIZE ( 3 ) #define SL_SPAWN_MAX_WAIT_MS ( 200 ) @@ -282,7 +282,7 @@ OsiReturnVal_e osi_TaskCreate(P_OSI_TASK_ENTRY pEntry,const signed char * const unsigned long uxPriority,OsiTaskHandle* pTaskHandle) { ASSERT (pdPASS == xTaskCreate( pEntry, (char const*)pcName, - (usStackDepth/(sizeof( portSTACK_TYPE ))), + (usStackDepth/(sizeof( portSTACK_TYPE ))), pvParameters,(unsigned portBASE_TYPE)uxPriority, (TaskHandle_t*)pTaskHandle )); return OSI_OK; @@ -417,7 +417,7 @@ OsiReturnVal_e osi_Spawn(P_OSI_SPAWN_ENTRY pEntry , void* pValue , unsigned long /*! - \brief This is the simplelink spawn task to call SL callback from a different context + \brief This is the simplelink spawn task to call SL callback from a different context \param pvParameters - pointer to the task parameter @@ -510,7 +510,7 @@ void VDeleteSimpleLinkSpawnTask( void ) \note \warning */ -OsiReturnVal_e osi_MsgQCreate(OsiMsgQ_t* pMsgQ , +OsiReturnVal_e osi_MsgQCreate(OsiMsgQ_t* pMsgQ , char* pMsgQName, unsigned long MsgSize, unsigned long MaxMsgs) @@ -607,8 +607,8 @@ void * mem_Malloc(unsigned long Size) \brief This function to call the memory de-allocation function of the FREERTOS \param pMem - pointer to the memory which needs to be freed - - \return - void + + \return - void \note \warning */ @@ -622,7 +622,7 @@ void mem_Free(void *pMem) \param pBuf - pointer to the memory to be fill \param Val - Value to be fill \param Size - Size of the memory which needs to be fill - \return - void + \return - void \note \warning */ @@ -637,8 +637,8 @@ void mem_set(void *pBuf,int Val,size_t Size) \param pDst - pointer to the destination \param pSrc - pointer to the source \param Size - Size of the memory which needs to be copy - - \return - void + + \return - void \note \warning */ @@ -650,8 +650,8 @@ void mem_copy(void *pDst, void *pSrc,size_t Size) /*! \brief This function use to entering into critical section - \param void - \return - void + \param void + \return - void \note \warning */ @@ -663,8 +663,8 @@ void osi_EnterCritical(void) /*! \brief This function use to exit critical section - \param void - \return - void + \param void + \return - void \note \warning */ diff --git a/ports/cc3200/simplelink/user.h b/ports/cc3200/simplelink/user.h index d3f6d4adfb6fd..3ab0b09a7780b 100644 --- a/ports/cc3200/simplelink/user.h +++ b/ports/cc3200/simplelink/user.h @@ -1,40 +1,40 @@ /* * user.h - CC31xx/CC32xx Host Driver Implementation * - * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ - * - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions + * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/ + * + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions * are met: * - * Redistributions of source code must retain the above copyright + * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the * distribution. * * Neither the name of Texas Instruments Incorporated nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * */ - + #ifndef __USER_H__ #define __USER_H__ @@ -63,8 +63,8 @@ extern "C" { ****************************************************************************** */ - -#include + +#include #include "cc_pal.h" #include "debug.h" @@ -91,8 +91,8 @@ extern "C" { /*! \def CPU_FREQ_IN_MHZ \brief Defines CPU frequency for Host side, for better accuracy of busy loops, if any - \sa - \note + \sa + \note \warning If not set the default CPU frequency is set to 200MHz This option will be deprecated in future release @@ -331,7 +331,7 @@ extern "C" { The enable/disable API provide mechanism to enable/disable the network processor - + PORTING ACTION: - None @{ @@ -569,9 +569,9 @@ extern "C" { */ #define sl_IfUnMaskIntHdlr() NwpUnMaskInterrupt() - + /*! - \brief Write Handers for statistics debug on write + \brief Write Handers for statistics debug on write \param interface handler - pointer to interrupt handler routine @@ -584,7 +584,7 @@ extern "C" { \note belongs to \ref ported_sec - \warning + \warning */ /* #define SL_START_WRITE_STAT */ @@ -921,7 +921,7 @@ typedef OsiLockObj_t _SlLockObj_t; \brief \sa \note belongs to \ref ported_sec - \warning + \warning */ #define sl_Malloc(Size) malloc(Size) @@ -929,7 +929,7 @@ typedef OsiLockObj_t _SlLockObj_t; \brief \sa \note belongs to \ref ported_sec - \warning + \warning */ #define sl_Free(pMem) free(pMem) #endif @@ -973,9 +973,9 @@ typedef OsiLockObj_t _SlLockObj_t; /*! \brief An event handler for WLAN connection or disconnection indication - This event handles async WLAN events. + This event handles async WLAN events. Possible events are: - SL_WLAN_CONNECT_EVENT - indicates WLAN is connected + SL_WLAN_CONNECT_EVENT - indicates WLAN is connected SL_WLAN_DISCONNECT_EVENT - indicates WLAN is disconnected \sa diff --git a/ports/embed/embed.mk b/ports/embed/embed.mk index 84d45accd2d71..bea5e5d65bbab 100644 --- a/ports/embed/embed.mk +++ b/ports/embed/embed.mk @@ -1,7 +1,7 @@ # This file is part of the MicroPython project, http://micropython.org/ # The MIT License (MIT) # Copyright (c) 2022-2023 Damien P. George -# +# # This file is intended to be included by a Makefile in a custom project. # Set the build output directory for the generated files. diff --git a/ports/esp32/README.ulp.md b/ports/esp32/README.ulp.md index cbc5771a9042f..ada19ec193188 100644 --- a/ports/esp32/README.ulp.md +++ b/ports/esp32/README.ulp.md @@ -13,7 +13,7 @@ ULP_LD_SCRIPT := esp32.ulp.ld SRC_PATH := src BUILD_PATH := build -include $(ESPIDF)/components/ulp/Makefile.projbuild +include $(ESPIDF)/components/ulp/Makefile.projbuild ULP_ELF := $(ULP_APP_NAME).elf ULP_MAP := $(ULP_ELF:.elf=.map) @@ -29,7 +29,7 @@ ULP_LISTINGS := $(notdir $(ULP_S_SOURCES:.S=.ulp.lst)) .PHONY: all clean -all: $(BUILD_PATH) $(BUILD_PATH)/$(ULP_BIN) +all: $(BUILD_PATH) $(BUILD_PATH)/$(ULP_BIN) clean: rm -rf $(BUILD_PATH) @@ -42,7 +42,7 @@ $(BUILD_PATH)/$(ULP_APP_NAME).ld: $(SRC_PATH)/$(ULP_LD_SCRIPT) cpp -P $< -o $@ # Generate preprocessed assembly files. -# To inspect these preprocessed files, add a ".PRECIOUS: %.ulp.pS" rule. +# To inspect these preprocessed files, add a ".PRECIOUS: %.ulp.pS" rule. $(BUILD_PATH)/%.ulp.pS: $(SRC_PATH)/%.S cpp $< -o $@ @@ -58,7 +58,7 @@ $(BUILD_PATH)/$(ULP_ELF): $(BUILD_PATH)/$(ULP_OBJECTS) $(BUILD_PATH)/$(ULP_APP_N $(ULP_SYM): $(ULP_ELF) $(ULP_NM) -g -f posix $< > $@ -# Dump the binary for inclusion into the project +# Dump the binary for inclusion into the project $(BUILD_PATH)/$(ULP_BIN): $(BUILD_PATH)/$(ULP_ELF) $(ULP_OBJCOPY) -O binary $< $@ ``` @@ -90,11 +90,11 @@ SECTIONS . = ALIGN(4); *(.bss) } >ram - + .header : AT(0) { LONG(ULP_BIN_MAGIC) - SHORT(LOADADDR(.text)) + SHORT(LOADADDR(.text)) SHORT(SIZEOF(.text)) SHORT(SIZEOF(.data)) SHORT(SIZEOF(.bss)) diff --git a/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md b/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md index 1238ded848c0a..92f3df57c9b84 100644 --- a/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md +++ b/ports/mimxrt/boards/OLIMEX_RT1010/deploy_olimex.md @@ -17,11 +17,11 @@ Now you have all files at hand that you will need for updating. 2. Push and hold the "Boot" button, then press "Reset", and release both buttons. -3. Run the commands: +3. Run the commands: ``` -sudo ./sdphost -u 0x1fc9,0x0145 -- write-file 0x20206400 tinyuf2-imxrt1010_evk-0.9.0.bin -sudo ./sdphost -u 0x1fc9,0x0145 -- jump-address 0x20207000 +sudo ./sdphost -u 0x1fc9,0x0145 -- write-file 0x20206400 tinyuf2-imxrt1010_evk-0.9.0.bin +sudo ./sdphost -u 0x1fc9,0x0145 -- jump-address 0x20207000 ``` Wait until a drive icon appears on the computer (or mount it explicitly), and then run: ``` @@ -32,7 +32,7 @@ You can put all of that in a script. Just add a short wait before the 3rd comman 4. Once the upload is finished, push Reset again. Using sudo is Linux specific. You may not need it at all, if the access rights are set properly, -and you will not need it for Windows. +and you will not need it for Windows. Once the generic boot-loader is available, this procedure is only required for the first firmware load or in case the flash is corrupted and the existing firmware is not functioning diff --git a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk index 2cf7d33c6331d..63e68e1e57994 100644 --- a/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk +++ b/ports/mimxrt/boards/SEEED_ARCH_MIX/mpconfigboard.mk @@ -4,7 +4,7 @@ MCU_VARIANT = MIMXRT1052DVL6B MICROPY_FLOAT_IMPL = double MICROPY_HW_FLASH_TYPE = qspi_nor_flash MICROPY_HW_FLASH_SIZE = 0x800000 # 8MB - + MICROPY_HW_SDRAM_AVAIL = 1 MICROPY_HW_SDRAM_SIZE = 0x2000000 # 32MB diff --git a/ports/mimxrt/boards/common.ld b/ports/mimxrt/boards/common.ld index 6c78fea319f96..587fc82a1953d 100644 --- a/ports/mimxrt/boards/common.ld +++ b/ports/mimxrt/boards/common.ld @@ -1,7 +1,7 @@ /* ** ################################################################### ** Linker script inspired by NXP linker script for MIMXRT10xx -** +** ** Copyright for original linker script: ** Copyright 2016 Freescale Semiconductor, Inc. ** Copyright 2016-2018 NXP @@ -26,7 +26,7 @@ HEAP_SIZE = DEFINED(__heap_size__) ? __heap_size__ : 0x0400; STACK_SIZE = DEFINED(__stack_size__) ? __stack_size__ : 0x0400; /* Reserved Area - * Users can create a reserved area at the end of the flash memory via + * Users can create a reserved area at the end of the flash memory via * 'reserved_size' variable. The size of the reserved area should be a multiple * of the sector size of the flash memory! */ @@ -41,7 +41,7 @@ MEMORY m_text (RX) : ORIGIN = text_start, LENGTH = text_size m_vfs (RX) : ORIGIN = vfs_start, LENGTH = vfs_size /* Teensy uses the last bit of flash for recovery. */ - m_reserved (RX) : ORIGIN = (vfs_start + vfs_size), LENGTH = reserved_size + m_reserved (RX) : ORIGIN = (vfs_start + vfs_size), LENGTH = reserved_size m_itcm (RX) : ORIGIN = itcm_start, LENGTH = itcm_size m_dtcm (RW) : ORIGIN = dtcm_start, LENGTH = dtcm_size m_ocrm (RW) : ORIGIN = ocrm_start, LENGTH = ocrm_size @@ -59,8 +59,8 @@ SECTIONS __sdram_start = sdram_start; #endif __vfs_start = ORIGIN(m_vfs); - __vfs_end = __vfs_start + LENGTH(m_vfs); - + __vfs_end = __vfs_start + LENGTH(m_vfs); + .flash_config : { . = ALIGN(4); @@ -177,7 +177,7 @@ SECTIONS KEEP (*(.fini_array*)) PROVIDE_HIDDEN (__fini_array_end = .); } > m_text - + __etext = .; /* define a global symbol at end of code */ __DATA_ROM = .; /* Symbol is used by startup for data initialization */ @@ -206,7 +206,7 @@ SECTIONS *(.text*) . = ALIGN(4); __ram_function_end__ = .; - } > m_itcm + } > m_itcm __NDATA_ROM = __RAM_FUNCTIONS_ROM + (__ram_function_end__ - __ram_function_start__); .ncache.init : AT(__NDATA_ROM) diff --git a/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk index 8e6f75b36ce42..cc7e7c3683da6 100644 --- a/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk +++ b/ports/nrf/boards/ACTINIUS_ICARUS/mpconfigboard.mk @@ -3,6 +3,6 @@ MCU_VARIANT = nrf91 MCU_SUB_VARIANT = nrf9160 LD_FILES += boards/nrf9160_1M_256k.ld -NRF_DEFINES += -DNRF9160_XXAA -DNRF_TRUSTZONE_NONSECURE +NRF_DEFINES += -DNRF9160_XXAA -DNRF_TRUSTZONE_NONSECURE MICROPY_VFS_LFS2 = 1 diff --git a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md index f993c7dc53623..ecf9259042e6a 100644 --- a/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md +++ b/ports/nrf/boards/NRF52840_MDK_USB_DONGLE/README.md @@ -45,4 +45,4 @@ built, the target can be deployed to the device as described in An alternative way to deploy to the device, is to open `firmware.hex` using *nRF Connect* and select *Write*. Detailed instructions can be found on the [developer -wiki](https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/programming/). +wiki](https://wiki.makerdiary.com/nrf52840-mdk-usb-dongle/programming/). diff --git a/ports/nrf/drivers/bluetooth/download_ble_stack.sh b/ports/nrf/drivers/bluetooth/download_ble_stack.sh index 6498278f496c7..7886682b718e0 100755 --- a/ports/nrf/drivers/bluetooth/download_ble_stack.sh +++ b/ports/nrf/drivers/bluetooth/download_ble_stack.sh @@ -78,13 +78,13 @@ function download_s140_nrf52_7_3_0 SCRIPT_DIR="$(cd -P "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -if [ $# -eq 0 ]; then +if [ $# -eq 0 ]; then echo "No Bluetooth LE stack defined, downloading all." download_s110_nrf51_8_0_0 ${SCRIPT_DIR} download_s132_nrf52_6_1_1 ${SCRIPT_DIR} download_s140_nrf52_6_1_1 ${SCRIPT_DIR} download_s140_nrf52_7_3_0 ${SCRIPT_DIR} -else +else case $1 in "s110_nrf51" ) download_s110_nrf51_8_0_0 ${SCRIPT_DIR} ;; diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile index 1e9cd2db5ba19..9580865b629bb 100644 --- a/ports/renesas-ra/Makefile +++ b/ports/renesas-ra/Makefile @@ -93,12 +93,12 @@ CFLAGS_CORTEX_M = -mthumb SUPPORTS_HARDWARE_FP_SINGLE = 0 SUPPORTS_HARDWARE_FP_DOUBLE = 0 ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),m4)) -CFLAGS_CORTEX_M += -mfpu=fpv4-sp-d16 -mfloat-abi=hard +CFLAGS_CORTEX_M += -mfpu=fpv4-sp-d16 -mfloat-abi=hard SUPPORTS_HARDWARE_FP_SINGLE = 1 endif ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),m33)) -CFLAGS_CORTEX_M += -mfpu=fpv5-sp-d16 -mfloat-abi=hard +CFLAGS_CORTEX_M += -mfpu=fpv5-sp-d16 -mfloat-abi=hard SUPPORTS_HARDWARE_FP_SINGLE = 1 endif diff --git a/ports/rp2/CMakeLists.txt b/ports/rp2/CMakeLists.txt index 3a46fdaa7f47b..392fed29b1ff4 100644 --- a/ports/rp2/CMakeLists.txt +++ b/ports/rp2/CMakeLists.txt @@ -41,7 +41,7 @@ endif() set(MICROPY_USER_FROZEN_MANIFEST ${MICROPY_FROZEN_MANIFEST}) # Include board config, it may override MICROPY_FROZEN_MANIFEST -include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake) +include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake) # Set the PICO_BOARD if it's not already set (allow a board to override it). if(NOT PICO_BOARD) diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile index 2947e4119beac..19f6f420e1fff 100644 --- a/ports/stm32/Makefile +++ b/ports/stm32/Makefile @@ -282,7 +282,7 @@ SRC_C += \ SRC_O += \ $(STARTUP_FILE) \ $(SYSTEM_FILE) - + ifeq ($(MCU_SERIES),$(filter $(MCU_SERIES),f0 g0 l0)) CSUPEROPT = -Os # save some code space SRC_O += \ diff --git a/ports/stm32/boards/stm32h7b3.ld b/ports/stm32/boards/stm32h7b3.ld index cccea983fa89e..83a261029fb8b 100644 --- a/ports/stm32/boards/stm32h7b3.ld +++ b/ports/stm32/boards/stm32h7b3.ld @@ -10,7 +10,7 @@ MEMORY FLASH_FS (r) : ORIGIN = 0x08020000, LENGTH = 128K /* sector 1, 128K */ FLASH_TEXT (rx) : ORIGIN = 0x08040000, LENGTH = 1792K /* sectors 6*128 + 8*128 */ DTCM (xrw) : ORIGIN = 0x20000000, LENGTH = 128K /* Used for storage cache */ - RAM (xrw) : ORIGIN = 0x24000000, LENGTH = 512K /* AXI SRAM */ + RAM (xrw) : ORIGIN = 0x24000000, LENGTH = 512K /* AXI SRAM */ RAM_D2 (xrw) : ORIGIN = 0x30000000, LENGTH = 288K } diff --git a/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h index d6c38bbd07e34..2c90ce165e2a7 100644 --- a/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h +++ b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h @@ -68,22 +68,22 @@ typedef struct _USBD_STORAGE { } USBD_StorageTypeDef; typedef struct { - uint32_t max_lun; - uint32_t interface; + uint32_t max_lun; + uint32_t interface; uint8_t bot_state; - uint8_t bot_status; + uint8_t bot_status; uint16_t bot_data_length; - uint8_t bot_data[MSC_MEDIA_PACKET]; + uint8_t bot_data[MSC_MEDIA_PACKET]; USBD_MSC_BOT_CBWTypeDef cbw; USBD_MSC_BOT_CSWTypeDef csw; - + USBD_SCSI_SenseTypeDef scsi_sense [SENSE_LIST_DEEPTH]; uint8_t scsi_sense_head; uint8_t scsi_sense_tail; - + uint16_t scsi_blk_size[USBD_MSC_MAX_LUN]; uint32_t scsi_blk_nbr[USBD_MSC_MAX_LUN]; - + uint32_t scsi_blk_addr_in_blks; uint32_t scsi_blk_len; diff --git a/tests/README.md b/tests/README.md index 3bc626bf9e416..54dd078053ef0 100644 --- a/tests/README.md +++ b/tests/README.md @@ -177,7 +177,7 @@ internal_bench/bytebuf: ## Test key/certificates -SSL/TLS tests in `multi_net` and `net_inet` use a +SSL/TLS tests in `multi_net` and `net_inet` use a self-signed key/cert pair that is randomly generated and to be used for testing/demonstration only. You should always generate your own key/cert. diff --git a/tests/basics/generator_throw.py b/tests/basics/generator_throw.py index 1b43c125eabc1..067ab2b8eb2a1 100644 --- a/tests/basics/generator_throw.py +++ b/tests/basics/generator_throw.py @@ -2,7 +2,7 @@ def gen(): yield 123 yield 456 - + g = gen() print(next(g)) try: @@ -31,7 +31,7 @@ def gen(): except GeneratorExit as e: print('GeneratorExit', repr(e.args)) yield 456 - + # thrown a class g = gen() print(next(g)) diff --git a/tests/basics/int_big_and2.py b/tests/basics/int_big_and2.py index f8c81fe0cd22d..045a90ef75035 100644 --- a/tests/basics/int_big_and2.py +++ b/tests/basics/int_big_and2.py @@ -1,4 +1,4 @@ -# test + + +# test + + print( 97989513389222316022151446562729620153292831887555425160965597396 & 23716683549865351578586448630079789776107310103486834795830390982) @@ -24,7 +24,7 @@ print( 40019818573920230246248826511203818792007462193311949166285967147 & 9487909752) -# test - - +# test - - print( -97989513389222316022151446562729620153292831887555425160965597396 & -23716683549865351578586448630079789776107310103486834795830390982) diff --git a/tests/basics/int_big_and3.py b/tests/basics/int_big_and3.py index 788ecd823bc8f..7a3b415af71d1 100644 --- a/tests/basics/int_big_and3.py +++ b/tests/basics/int_big_and3.py @@ -1,4 +1,4 @@ -# test - + +# test - + print( -97989513389222316022151446562729620153292831887555425160965597396 & 23716683549865351578586448630079789776107310103486834795830390982) @@ -24,7 +24,7 @@ print( -40019818573920230246248826511203818792007462193311949166285967147 & 9487909752) -# test + - +# test + - print( 97989513389222316022151446562729620153292831887555425160965597396 & -23716683549865351578586448630079789776107310103486834795830390982) diff --git a/tests/basics/int_big_or.py b/tests/basics/int_big_or.py index 17d9935265fce..ccded377812b0 100644 --- a/tests/basics/int_big_or.py +++ b/tests/basics/int_big_or.py @@ -3,7 +3,7 @@ a = 0xfffffffffffffffffffffffffffff print(a | (1 << 200)) -# test + + +# test + + print(0 | (1 << 80)) print((1 << 80) | (1 << 80)) @@ -15,7 +15,7 @@ print(a | a == 0) print(bool(a | a)) -# test - + +# test - + print((-1 << 80) | (1 << 80)) print((-1 << 80) | 0) @@ -25,7 +25,7 @@ print((-a) | a == 0) print(bool((-a) | a)) -# test + - +# test + - print(0 | (-1 << 80)) print((1 << 80) | (-1 << 80)) @@ -35,7 +35,7 @@ print(a | (-a) == 0) print(bool(a | (-a))) -# test - - +# test - - print((-1 << 80) | (-1 << 80)) diff --git a/tests/basics/int_big_or2.py b/tests/basics/int_big_or2.py index 255495150ab74..92d76c77034f1 100644 --- a/tests/basics/int_big_or2.py +++ b/tests/basics/int_big_or2.py @@ -1,4 +1,4 @@ -# test + + +# test + + print( 97989513389222316022151446562729620153292831887555425160965597396 | 23716683549865351578586448630079789776107310103486834795830390982) @@ -23,7 +23,7 @@ print( 40019818573920230246248826511203818792007462193311949166285967147 | 9487909752) -# test - - +# test - - print( -97989513389222316022151446562729620153292831887555425160965597396 | -23716683549865351578586448630079789776107310103486834795830390982) diff --git a/tests/basics/int_big_or3.py b/tests/basics/int_big_or3.py index 07edaea2df912..212b3da8a6442 100644 --- a/tests/basics/int_big_or3.py +++ b/tests/basics/int_big_or3.py @@ -1,4 +1,4 @@ -# test - + +# test - + print( -97989513389222316022151446562729620153292831887555425160965597396 | 23716683549865351578586448630079789776107310103486834795830390982) @@ -24,7 +24,7 @@ print( -40019818573920230246248826511203818792007462193311949166285967147 | 9487909752) -# test + - +# test + - print( 97989513389222316022151446562729620153292831887555425160965597396 | -23716683549865351578586448630079789776107310103486834795830390982) diff --git a/tests/basics/int_big_xor.py b/tests/basics/int_big_xor.py index cd1d9ae97fa75..28b191d3d948e 100644 --- a/tests/basics/int_big_xor.py +++ b/tests/basics/int_big_xor.py @@ -1,4 +1,4 @@ -# test + + +# test + + print(0 ^ (1 << 80)) print((1 << 80) ^ (1 << 80)) @@ -10,7 +10,7 @@ print(a ^ a == 0) print(bool(a ^ a)) -# test - + +# test - + print((-1 << 80) ^ (1 << 80)) print((-1 << 80) ^ 0) @@ -22,7 +22,7 @@ i = -1 print(i ^ 0xffffffffffffffff) # carry overflows to higher digit -# test + - +# test + - print(0 ^ (-1 << 80)) print((1 << 80) ^ (-1 << 80)) @@ -32,7 +32,7 @@ print(a ^ (-a) == 0) print(bool(a ^ (-a))) -# test - - +# test - - print((-1 << 80) ^ (-1 << 80)) diff --git a/tests/basics/int_big_xor2.py b/tests/basics/int_big_xor2.py index b5b3db60c69f7..21ef842f86620 100644 --- a/tests/basics/int_big_xor2.py +++ b/tests/basics/int_big_xor2.py @@ -1,4 +1,4 @@ -# test + + +# test + + print( 97989513389222316022151446562729620153292831887555425160965597396 ^ 23716683549865351578586448630079789776107310103486834795830390982) @@ -24,7 +24,7 @@ print( 40019818573920230246248826511203818792007462193311949166285967147 ^ 9487909752) -# test - - +# test - - print( -97989513389222316022151446562729620153292831887555425160965597396 ^ -23716683549865351578586448630079789776107310103486834795830390982) diff --git a/tests/basics/int_big_xor3.py b/tests/basics/int_big_xor3.py index 00881e3740985..ff5e9aeff2f9e 100644 --- a/tests/basics/int_big_xor3.py +++ b/tests/basics/int_big_xor3.py @@ -1,4 +1,4 @@ -# test - + +# test - + print( -97989513389222316022151446562729620153292831887555425160965597396 ^ 23716683549865351578586448630079789776107310103486834795830390982) @@ -24,7 +24,7 @@ print( -40019818573920230246248826511203818792007462193311949166285967147 ^ 9487909752) -# test + - +# test + - print( 97989513389222316022151446562729620153292831887555425160965597396 ^ -23716683549865351578586448630079789776107310103486834795830390982) diff --git a/tests/io/data/bigfile1 b/tests/io/data/bigfile1 index 5afbf01a6f4e5..777c436a21f2f 100644 --- a/tests/io/data/bigfile1 +++ b/tests/io/data/bigfile1 @@ -1,147 +1,147 @@ { "info": { - "maintainer": null, - "docs_url": "", - "requires_python": null, - "maintainer_email": null, - "cheesecake_code_kwalitee_id": null, - "keywords": null, - "package_url": "http://pypi.python.org/pypi/micropython-uasyncio", - "author": "MicroPython Developers", - "author_email": "micro-python@googlegroups.com", - "download_url": "UNKNOWN", - "platform": "UNKNOWN", - "version": "0.8.1", - "cheesecake_documentation_id": null, - "_pypi_hidden": false, - "description": "Lightweight asyncio-like library built around native Python coroutines, not around un-Python devices like callback mess.", - "release_url": "http://pypi.python.org/pypi/micropython-uasyncio/0.8.1", + "maintainer": null, + "docs_url": "", + "requires_python": null, + "maintainer_email": null, + "cheesecake_code_kwalitee_id": null, + "keywords": null, + "package_url": "http://pypi.python.org/pypi/micropython-uasyncio", + "author": "MicroPython Developers", + "author_email": "micro-python@googlegroups.com", + "download_url": "UNKNOWN", + "platform": "UNKNOWN", + "version": "0.8.1", + "cheesecake_documentation_id": null, + "_pypi_hidden": false, + "description": "Lightweight asyncio-like library built around native Python coroutines, not around un-Python devices like callback mess.", + "release_url": "http://pypi.python.org/pypi/micropython-uasyncio/0.8.1", "downloads": { - "last_month": 942, - "last_week": 173, + "last_month": 942, + "last_week": 173, "last_day": 29 - }, - "_pypi_ordering": 6, - "classifiers": [], - "name": "micropython-uasyncio", - "bugtrack_url": null, - "license": "MIT", - "summary": "uasyncio module for MicroPython", - "home_page": "https://github.com/micropython/micropython/issues/405", - "stable_version": null, + }, + "_pypi_ordering": 6, + "classifiers": [], + "name": "micropython-uasyncio", + "bugtrack_url": null, + "license": "MIT", + "summary": "uasyncio module for MicroPython", + "home_page": "https://github.com/micropython/micropython/issues/405", + "stable_version": null, "cheesecake_installability_id": null - }, + }, "releases": { "0.8": [ { - "has_sig": false, - "upload_time": "2015-01-01T23:52:41", - "comment_text": "", - "python_version": "source", - "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.8.tar.gz", - "md5_digest": "5df4d0d6b5fdb7c05fc418e5785e1336", - "downloads": 352, - "filename": "micropython-uasyncio-0.8.tar.gz", - "packagetype": "sdist", + "has_sig": false, + "upload_time": "2015-01-01T23:52:41", + "comment_text": "", + "python_version": "source", + "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.8.tar.gz", + "md5_digest": "5df4d0d6b5fdb7c05fc418e5785e1336", + "downloads": 352, + "filename": "micropython-uasyncio-0.8.tar.gz", + "packagetype": "sdist", "size": 2476 } - ], + ], "0.6.2": [ { - "has_sig": false, - "upload_time": "2014-10-18T11:26:52", - "comment_text": "", - "python_version": "source", - "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.6.2.tar.gz", - "md5_digest": "c85fa7c11ef437f4e73c1fcd639db066", - "downloads": 475, - "filename": "micropython-uasyncio-0.6.2.tar.gz", - "packagetype": "sdist", + "has_sig": false, + "upload_time": "2014-10-18T11:26:52", + "comment_text": "", + "python_version": "source", + "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.6.2.tar.gz", + "md5_digest": "c85fa7c11ef437f4e73c1fcd639db066", + "downloads": 475, + "filename": "micropython-uasyncio-0.6.2.tar.gz", + "packagetype": "sdist", "size": 3262 } - ], + ], "0.6.1": [ { - "has_sig": false, - "upload_time": "2014-10-11T02:21:17", - "comment_text": "", - "python_version": "source", - "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.6.1.tar.gz", - "md5_digest": "48cb0db7d8249d5f4a86db9c4b302d03", - "downloads": 507, - "filename": "micropython-uasyncio-0.6.1.tar.gz", - "packagetype": "sdist", + "has_sig": false, + "upload_time": "2014-10-11T02:21:17", + "comment_text": "", + "python_version": "source", + "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.6.1.tar.gz", + "md5_digest": "48cb0db7d8249d5f4a86db9c4b302d03", + "downloads": 507, + "filename": "micropython-uasyncio-0.6.1.tar.gz", + "packagetype": "sdist", "size": 3237 } - ], + ], "0.8.1": [ { - "has_sig": false, - "upload_time": "2015-01-04T20:02:03", - "comment_text": "", - "python_version": "source", - "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.8.1.tar.gz", - "md5_digest": "940d2647b8355289d54de543ff710b05", - "downloads": 249, - "filename": "micropython-uasyncio-0.8.1.tar.gz", - "packagetype": "sdist", + "has_sig": false, + "upload_time": "2015-01-04T20:02:03", + "comment_text": "", + "python_version": "source", + "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.8.1.tar.gz", + "md5_digest": "940d2647b8355289d54de543ff710b05", + "downloads": 249, + "filename": "micropython-uasyncio-0.8.1.tar.gz", + "packagetype": "sdist", "size": 2484 } - ], + ], "0.7": [ { - "has_sig": false, - "upload_time": "2014-10-23T22:02:11", - "comment_text": "", - "python_version": "source", - "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.7.tar.gz", - "md5_digest": "81250a0ee6649b5117878d5788ba96d3", - "downloads": 457, - "filename": "micropython-uasyncio-0.7.tar.gz", - "packagetype": "sdist", + "has_sig": false, + "upload_time": "2014-10-23T22:02:11", + "comment_text": "", + "python_version": "source", + "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.7.tar.gz", + "md5_digest": "81250a0ee6649b5117878d5788ba96d3", + "downloads": 457, + "filename": "micropython-uasyncio-0.7.tar.gz", + "packagetype": "sdist", "size": 2277 } - ], + ], "0.7.1": [ { - "has_sig": false, - "upload_time": "2014-11-04T00:56:16", - "comment_text": "", - "python_version": "source", - "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.7.1.tar.gz", - "md5_digest": "21eda0501142830730cd82e1b0fa1a33", - "downloads": 412, - "filename": "micropython-uasyncio-0.7.1.tar.gz", - "packagetype": "sdist", + "has_sig": false, + "upload_time": "2014-11-04T00:56:16", + "comment_text": "", + "python_version": "source", + "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.7.1.tar.gz", + "md5_digest": "21eda0501142830730cd82e1b0fa1a33", + "downloads": 412, + "filename": "micropython-uasyncio-0.7.1.tar.gz", + "packagetype": "sdist", "size": 2474 } - ], + ], "0.6": [ { - "has_sig": false, - "upload_time": "2014-08-27T00:17:45", - "comment_text": "", - "python_version": "source", - "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.6.tar.gz", - "md5_digest": "9d0b15108c5ade3a6902c9370c9dacf1", - "downloads": 668, - "filename": "micropython-uasyncio-0.6.tar.gz", - "packagetype": "sdist", + "has_sig": false, + "upload_time": "2014-08-27T00:17:45", + "comment_text": "", + "python_version": "source", + "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.6.tar.gz", + "md5_digest": "9d0b15108c5ade3a6902c9370c9dacf1", + "downloads": 668, + "filename": "micropython-uasyncio-0.6.tar.gz", + "packagetype": "sdist", "size": 3246 } ] - }, + }, "urls": [ { - "has_sig": false, - "upload_time": "2015-01-04T20:02:03", - "comment_text": "", - "python_version": "source", - "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.8.1.tar.gz", - "md5_digest": "940d2647b8355289d54de543ff710b05", - "downloads": 249, - "filename": "micropython-uasyncio-0.8.1.tar.gz", - "packagetype": "sdist", + "has_sig": false, + "upload_time": "2015-01-04T20:02:03", + "comment_text": "", + "python_version": "source", + "url": "https://pypi.python.org/packages/source/m/micropython-uasyncio/micropython-uasyncio-0.8.1.tar.gz", + "md5_digest": "940d2647b8355289d54de543ff710b05", + "downloads": 249, + "filename": "micropython-uasyncio-0.8.1.tar.gz", + "packagetype": "sdist", "size": 2484 } ] diff --git a/tests/ports/cc3200/pin.py b/tests/ports/cc3200/pin.py index 9ffd152e93ea7..43537bba5ce07 100644 --- a/tests/ports/cc3200/pin.py +++ b/tests/ports/cc3200/pin.py @@ -1,7 +1,7 @@ -""" -This test need a set of pins which can be set as inputs and have no external +""" +This test need a set of pins which can be set as inputs and have no external pull up or pull down connected. -GP12 and GP17 must be connected together +GP12 and GP17 must be connected together """ from machine import Pin import os diff --git a/tests/ports/cc3200/uart.py b/tests/ports/cc3200/uart.py index 94ac9051b24d3..c92c8041fc0ce 100644 --- a/tests/ports/cc3200/uart.py +++ b/tests/ports/cc3200/uart.py @@ -1,5 +1,5 @@ """ -UART test for the CC3200 based boards. +UART test for the CC3200 based boards. UART0 and UART1 must be connected together for this test to pass. """ diff --git a/tools/codestats.sh b/tools/codestats.sh index 74430739917b5..be796568a19d8 100755 --- a/tools/codestats.sh +++ b/tools/codestats.sh @@ -116,7 +116,7 @@ index 77d2945..dae0644 100644 @@ -55,10 +55,8 @@ void msec_sleep_tv(struct timeval *tv) { #define MP_CLOCKS_PER_SEC CLOCKS_PER_SEC #endif - + -#if defined(MP_CLOCKS_PER_SEC) && (MP_CLOCKS_PER_SEC == 1000000) // POSIX -#define CLOCK_DIV 1000.0 -#elif defined(MP_CLOCKS_PER_SEC) && (MP_CLOCKS_PER_SEC == 1000) // WIN32