summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2020-04-27 17:43:32 -0700
committerScott Shawcroft <scott@tannewt.org>2020-04-27 17:43:32 -0700
commitde42e4af0239b394782e8ecbf7f2e65da2a53a05 (patch)
tree627727f1f2df36dbf9b9deb7ee9e9b48ff189b6a
parent755d404edf00ab99bb8497d2e4a36ba18dd17a69 (diff)
parent40a1f3edbcb4a5fe42e11d518f3ebca220cf98e9 (diff)
Merge remote-tracking branch 'adafruit/master' into lower_power
m---------extmod/ulab0
-rw-r--r--locale/ID.po2
-rw-r--r--locale/circuitpython.pot2
-rw-r--r--locale/de_DE.po2
-rw-r--r--locale/en_US.po2
-rw-r--r--locale/en_x_pirate.po2
-rw-r--r--locale/es.po2
-rw-r--r--locale/fil.po2
-rw-r--r--locale/fr.po2
-rw-r--r--locale/it_IT.po2
-rw-r--r--locale/ko.po2
-rw-r--r--locale/pl.po2
-rw-r--r--locale/pt_BR.po2
-rw-r--r--locale/zh_Latn_pinyin.po2
-rw-r--r--ports/stm/boards/espruino_pico/mpconfigboard.mk5
-rw-r--r--py/py.mk1
16 files changed, 19 insertions, 13 deletions
diff --git a/extmod/ulab b/extmod/ulab
-Subproject a746bd8e0953853056ee405e2fa02c8ebca4fb7
+Subproject cf61d728e70b9ec57e5711b40540793a89296f5
diff --git a/locale/ID.po b/locale/ID.po
index 3542542d9..f6edf52b0 100644
--- a/locale/ID.po
+++ b/locale/ID.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index be45eb223..81a77b759 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/locale/de_DE.po b/locale/de_DE.po
index bc9532391..454299b59 100644
--- a/locale/de_DE.po
+++ b/locale/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
"Last-Translator: Pascal Deneaux\n"
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
diff --git a/locale/en_US.po b/locale/en_US.po
index 30d9a005c..2c42b83d5 100644
--- a/locale/en_US.po
+++ b/locale/en_US.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/locale/en_x_pirate.po b/locale/en_x_pirate.po
index 7f1262e6e..e50fcbf1b 100644
--- a/locale/en_x_pirate.po
+++ b/locale/en_x_pirate.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
"Last-Translator: \n"
"Language-Team: @sommersoft, @MrCertainly\n"
diff --git a/locale/es.po b/locale/es.po
index 000d70256..49a3da572 100644
--- a/locale/es.po
+++ b/locale/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/locale/fil.po b/locale/fil.po
index 2ca5956a9..6d8737aad 100644
--- a/locale/fil.po
+++ b/locale/fil.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
"Last-Translator: Timothy <me@timothygarcia.ca>\n"
"Language-Team: fil\n"
diff --git a/locale/fr.po b/locale/fr.po
index a6dc11660..918538288 100644
--- a/locale/fr.po
+++ b/locale/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: 2019-04-14 20:05+0100\n"
"Last-Translator: Pierrick Couturier <arofarn@arofarn.info>\n"
"Language-Team: fr\n"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index c4e69a9d1..c0be24176 100644
--- a/locale/it_IT.po
+++ b/locale/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: 2018-10-02 16:27+0200\n"
"Last-Translator: Enrico Paganin <enrico.paganin@mail.com>\n"
"Language-Team: \n"
diff --git a/locale/ko.po b/locale/ko.po
index b3a0bac32..dc54cf17e 100644
--- a/locale/ko.po
+++ b/locale/ko.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: 2019-05-06 14:22-0700\n"
"Last-Translator: \n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/locale/pl.po b/locale/pl.po
index a6d5d139c..02463b1bc 100644
--- a/locale/pl.po
+++ b/locale/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: 2019-03-19 18:37-0700\n"
"Last-Translator: Radomir Dopieralski <circuitpython@sheep.art.pl>\n"
"Language-Team: pl\n"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 190b8008a..af3305328 100644
--- a/locale/pt_BR.po
+++ b/locale/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: 2018-10-02 21:14-0000\n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
index 3833a6532..48d48fc13 100644
--- a/locale/zh_Latn_pinyin.po
+++ b/locale/zh_Latn_pinyin.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: circuitpython-cn\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-20 16:57-0700\n"
+"POT-Creation-Date: 2020-04-27 17:43-0700\n"
"PO-Revision-Date: 2019-04-13 10:10-0700\n"
"Last-Translator: hexthat\n"
"Language-Team: Chinese Hanyu Pinyin\n"
diff --git a/ports/stm/boards/espruino_pico/mpconfigboard.mk b/ports/stm/boards/espruino_pico/mpconfigboard.mk
index b7937dd04..054937c33 100644
--- a/ports/stm/boards/espruino_pico/mpconfigboard.mk
+++ b/ports/stm/boards/espruino_pico/mpconfigboard.mk
@@ -13,3 +13,8 @@ MCU_PACKAGE = UFQFPN48
LD_COMMON = boards/common_default.ld
LD_FILE = boards/STM32F401xd_fs.ld # use for internal flash
+# Disable ulab as we're nearly out of space on this board due to
+# INTERNAL_FLASH_FILESYSTEM. It can probably be reenabled if we enable
+# lto for this port, and if other stuff hasn't been added in the
+# meantime
+CIRCUITPY_ULAB = 0
diff --git a/py/py.mk b/py/py.mk
index bca6ac14c..ec0625db6 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -107,6 +107,7 @@ endif
ifeq ($(CIRCUITPY_ULAB),1)
SRC_MOD += $(addprefix extmod/ulab/code/, \
+compare.c \
create.c \
extras.c \
fft.c \