djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix ulab commit

Browse Source
This commit is contained in:
Dan Halbert 2021-06-15 11:39:40 -04:00
parent a192f1ca2f
commit f97e0ec631
5 changed files with 11 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extmod/ulab

@ -1 +1 @@
Subproject commit e3bf07cabb728ecfa2b78ea5e468179f94dbf933
Subproject commit 161a7288482200c884623ed3cb59dd91f53be91a

36
lib/utils/linked_list.h
View File

@ -1,36 +0,0 @@
/*
* This file is part of the MicroPython project, http://micropython.org/
*
* The MIT License (MIT)
*
* Copyright (c) 2021 Dan Halbert for Adafruit Industries
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef MICROPY_INCLUDED_LINKED_LIST_H
#define MICROPY_INCLUDED_LINKED_LIST_H
#define LINKED_LIST_PREPEND(LIST_HEAD, OBJECT, NEXT_FIELD) \
OBJECT->NEXT_FIELD = LIST_HEAD; \
LIST_HEAD = OBJECT;
#define LINKED_LIST_DELETE(LIST_HEAD, OBJECT,
#endif // MICROPY_INCLUDED_LINKED_LIST_H

17
locale/circuitpython.pot
View File

@ -3058,6 +3058,10 @@ msgstr ""
msgid "first argument to super() must be type"
msgstr ""
#: extmod/ulab/code/scipy/linalg/linalg.c
msgid "first two arguments must be ndarrays"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "flattening order must be either 'C', or 'F'"
msgstr ""
@ -3237,10 +3241,11 @@ msgid "input matrix is asymmetric"
msgstr ""
#: extmod/ulab/code/numpy/linalg/linalg.c
#: extmod/ulab/code/scipy/linalg/linalg.c
msgid "input matrix is singular"
msgstr ""
#: extmod/ulab/code/user/user.c
#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c
msgid "input must be a dense ndarray"
msgstr ""
@ -3281,7 +3286,7 @@ msgid "integer required"
msgstr ""
#: extmod/ulab/code/numpy/approx/approx.c
msgid "interp is defined for 1D arrays of equal length"
msgid "interp is defined for 1D iterables of equal length"
msgstr ""
#: shared-bindings/_bleio/Adapter.c
@ -4137,11 +4142,11 @@ msgid "too many values to unpack (expected %d)"
msgstr ""
#: extmod/ulab/code/numpy/approx/approx.c
msgid "trapz is defined for 1D arrays"
msgid "trapz is defined for 1D arrays of equal length"
msgstr ""
#: extmod/ulab/code/numpy/approx/approx.c
msgid "trapz is defined for 1D arrays of equal length"
msgid "trapz is defined for 1D iterables"
msgstr ""
#: py/obj.c
@ -4324,10 +4329,6 @@ msgstr ""
msgid "wrong number of values to unpack"
msgstr ""
#: extmod/ulab/code/ndarray.c
msgid "wrong operand type"
msgstr ""
#: extmod/ulab/code/numpy/vector/vector.c
msgid "wrong output type"
msgstr ""

1
ports/stm/boards/espruino_pico/mpconfigboard.mk
View File

@ -22,7 +22,6 @@ CIRCUITPY_AUDIOPWMIO = 0
CIRCUITPY_BUSDEVICE = 0
CIRCUITPY_BITMAPTOOLS = 0
CIRCUITPY_FRAMEBUFFERIO = 0
CIRCUITPY_KEYPAD = 0
CIRCUITPY_MIDI = 0
CIRCUITPY_MSGPACK = 0
CIRCUITPY_ULAB = 0