Skip to content

Commit c0c3840

Browse files
loborisloboris
committed
Updated Display module, M5Stack display support added
Updated microWebServer frozen module, WebSockets support added Updated uftpserver frozen module Some missing licensing information added Other small changes and improvements
1 parent 6935d21 commit c0c3840

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+4590
-210
lines changed

‎MicroPython_BUILD/components/curl/LICENSE-MIXING.md‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
License Mixing
2+
==============
3+
4+
libcurl can be built to use a fair amount of various third party libraries,
5+
libraries that are written and provided by other parties that are distributed
6+
using their own licenses. Even libcurl itself contains code that may cause
7+
problems to some. This document attempts to describe what licenses libcurl and
8+
the other libraries use and what possible dilemmas linking and mixing them all
9+
can lead to for end users.
10+
11+
I am not a lawyer and this is not legal advice!
12+
13+
One common dilemma is that [GPL](https://www.gnu.org/licenses/gpl.html)
14+
licensed code is not allowed to be linked with code licensed under the
15+
[Original BSD license](https://spdx.org/licenses/BSD-4-Clause.html) (with the
16+
announcement clause). You may still build your own copies that use them all,
17+
but distributing them as binaries would be to violate the GPL license - unless
18+
you accompany your license with an
19+
[exception](https://www.gnu.org/licenses/gpl-faq.html#GPLIncompatibleLibs). This
20+
particular problem was addressed when the [Modified BSD
21+
license](https://opensource.org/licenses/BSD-3-Clause) was created, which does
22+
not have the announcement clause that collides with GPL.
23+
24+
## libcurl
25+
26+
Uses an [MIT style license](https://curl.haxx.se/docs/copyright.html) that is
27+
very liberal.
28+
29+
## OpenSSL
30+
31+
(May be used for SSL/TLS support) Uses an Original BSD-style license with an
32+
announcement clause that makes it "incompatible" with GPL. You are not
33+
allowed to ship binaries that link with OpenSSL that includes GPL code
34+
(unless that specific GPL code includes an exception for OpenSSL - a habit
35+
that is growing more and more common). If OpenSSL's licensing is a problem
36+
for you, consider using another TLS library.
37+
38+
## GnuTLS
39+
40+
(May be used for SSL/TLS support) Uses the
41+
[LGPL](https://www.gnu.org/licenses/lgpl.html) license. If this is a problem
42+
for you, consider using another TLS library. Also note that GnuTLS itself
43+
depends on and uses other libs (libgcrypt and libgpg-error) and they too are
44+
LGPL- or GPL-licensed.
45+
46+
## WolfSSL
47+
48+
(May be used for SSL/TLS support) Uses the GPL license or a proprietary
49+
license. If this is a problem for you, consider using another TLS library.
50+
51+
## NSS
52+
53+
(May be used for SSL/TLS support) Is covered by the
54+
[MPL](https://www.mozilla.org/MPL/) license, the GPL license and the LGPL
55+
license. You may choose to license the code under MPL terms, GPL terms, or
56+
LGPL terms. These licenses grant you different permissions and impose
57+
different obligations. You should select the license that best meets your
58+
needs.
59+
60+
## axTLS
61+
62+
(May be used for SSL/TLS support) Uses a Modified BSD-style license.
63+
64+
## mbedTLS
65+
66+
(May be used for SSL/TLS support) Uses the [Apache 2.0
67+
license](https://opensource.org/licenses/Apache-2.0) or the GPL license.
68+
You may choose to license the code under Apache 2.0 terms or GPL terms.
69+
These licenses grant you different permissions and impose different
70+
obligations. You should select the license that best meets your needs.
71+
72+
## BoringSSL
73+
74+
(May be used for SSL/TLS support) As an OpenSSL fork, it has the same
75+
license as that.
76+
77+
## libressl
78+
79+
(May be used for SSL/TLS support) As an OpenSSL fork, it has the same
80+
license as that.
81+
82+
## c-ares
83+
84+
(Used for asynchronous name resolves) Uses an MIT license that is very
85+
liberal and imposes no restrictions on any other library or part you may link
86+
with.
87+
88+
## zlib
89+
90+
(Used for compressed Transfer-Encoding support) Uses an MIT-style license
91+
that shouldn't collide with any other library.
92+
93+
## MIT Kerberos
94+
95+
(May be used for GSS support) MIT licensed, that shouldn't collide with any
96+
other parts.
97+
98+
## Heimdal
99+
100+
(May be used for GSS support) Heimdal is Original BSD licensed with the
101+
announcement clause.
102+
103+
## GNU GSS
104+
105+
(May be used for GSS support) GNU GSS is GPL licensed. Note that you may not
106+
distribute binary curl packages that uses this if you build curl to also link
107+
and use any Original BSD licensed libraries!
108+
109+
## libidn
110+
111+
(Used for IDNA support) Uses the GNU Lesser General Public License [3]. LGPL
112+
is a variation of GPL with slightly less aggressive "copyleft". This license
113+
requires more requirements to be met when distributing binaries, see the
114+
license for details. Also note that if you distribute a binary that includes
115+
this library, you must also include the full LGPL license text. Please
116+
properly point out what parts of the distributed package that the license
117+
addresses.
118+
119+
## OpenLDAP
120+
121+
(Used for LDAP support) Uses a Modified BSD-style license. Since libcurl uses
122+
OpenLDAP as a shared library only, I have not heard of anyone that ships
123+
OpenLDAP linked with libcurl in an app.
124+
125+
## libssh2
126+
127+
(Used for scp and sftp support) libssh2 uses a Modified BSD-style license.

‎MicroPython_BUILD/components/curl/README‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
_ _ ____ _
2+
___| | | | _ \| |
3+
/ __| | | | |_) | |
4+
| (__| |_| | _ <| |___
5+
\___|\___/|_| \_\_____|
6+
7+
README
8+
9+
Curl is a command line tool for transferring data specified with URL
10+
syntax. Find out how to use curl by reading the curl.1 man page or the
11+
MANUAL document. Find out how to install Curl by reading the INSTALL
12+
document.
13+
14+
libcurl is the library curl is using to do its job. It is readily
15+
available to be used by your software. Read the libcurl.3 man page to
16+
learn how!
17+
18+
You find answers to the most frequent questions we get in the FAQ document.
19+
20+
Study the COPYING file for distribution terms and similar. If you distribute
21+
curl binaries or other binaries that involve libcurl, you might enjoy the
22+
LICENSE-MIXING document.
23+
24+
CONTACT
25+
26+
If you have problems, questions, ideas or suggestions, please contact us
27+
by posting to a suitable mailing list. See https://curl.haxx.se/mail/
28+
29+
All contributors to the project are listed in the THANKS document.
30+
31+
WEB SITE
32+
33+
Visit the curl web site for the latest news and downloads:
34+
35+
https://curl.haxx.se/
36+
37+
GIT
38+
39+
To download the very latest source off the GIT server do this:
40+
41+
git clone https://github.com/curl/curl.git
42+
43+
(you'll get a directory named curl created, filled with the source code)
44+
45+
NOTICE
46+
47+
Curl contains pieces of source code that is Copyright (c) 1998, 1999
48+
Kungliga Tekniska Högskolan. This notice is included here to comply with the
49+
distribution terms.

‎MicroPython_BUILD/components/curl/README_curl.md‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
![curl logo](https://cdn.rawgit.com/curl/curl-www/master/logo/curl-logo.svg)
2+
3+
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/63/badge)](https://bestpractices.coreinfrastructure.org/projects/63)
4+
[![Coverity passed](https://scan.coverity.com/projects/curl/badge.svg)](https://scan.coverity.com/projects/curl)
5+
[![Build Status](https://travis-ci.org/curl/curl.svg?branch=master)](https://travis-ci.org/curl/curl)
6+
[![Coverage Status](https://coveralls.io/repos/github/curl/curl/badge.svg)](https://coveralls.io/github/curl/curl)
7+
8+
Curl is a command-line tool for transferring data specified with URL
9+
syntax. Find out how to use curl by reading [the curl.1 man
10+
page](https://curl.haxx.se/docs/manpage.html) or [the MANUAL
11+
document](https://curl.haxx.se/docs/manual.html). Find out how to install Curl
12+
by reading [the INSTALL document](https://curl.haxx.se/docs/install.html).
13+
14+
libcurl is the library curl is using to do its job. It is readily available to
15+
be used by your software. Read [the libcurl.3 man
16+
page](https://curl.haxx.se/libcurl/c/libcurl.html) to learn how!
17+
18+
You find answers to the most frequent questions we get in [the FAQ
19+
document](https://curl.haxx.se/docs/faq.html).
20+
21+
Study [the COPYING file](https://curl.haxx.se/docs/copyright.html) for
22+
distribution terms and similar. If you distribute curl binaries or other
23+
binaries that involve libcurl, you might enjoy [the LICENSE-MIXING
24+
document](https://curl.haxx.se/legal/licmix.html).
25+
26+
## Contact
27+
28+
If you have problems, questions, ideas or suggestions, please contact us by
29+
posting to a suitable [mailing list](https://curl.haxx.se/mail/).
30+
31+
All contributors to the project are listed in [the THANKS
32+
document](https://curl.haxx.se/docs/thanks.html).
33+
34+
## Website
35+
36+
Visit the [curl web site](https://curl.haxx.se/) for the latest news and
37+
downloads.
38+
39+
## Git
40+
41+
To download the very latest source off the Git server do this:
42+
43+
git clone https://github.com/curl/curl.git
44+
45+
(you'll get a directory named curl created, filled with the source code)
46+
47+
## Notice
48+
49+
Curl contains pieces of source code that is Copyright (c) 1998, 1999 Kungliga
50+
Tekniska Högskolan. This notice is included here to comply with the
51+
distribution terms.

‎MicroPython_BUILD/components/curl_old.zip‎

-1.13 MB
Binary file not shown.

‎MicroPython_BUILD/components/libssh2/COPYING‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/* Copyright (c) 2004-2007 Sara Golemon <[email protected]>
2+
* Copyright (c) 2005,2006 Mikhail Gusarov <[email protected]>
3+
* Copyright (c) 2006-2007 The Written Word, Inc.
4+
* Copyright (c) 2007 Eli Fant <[email protected]>
5+
* Copyright (c) 2009-2014 Daniel Stenberg
6+
* Copyright (C) 2008, 2009 Simon Josefsson
7+
* All rights reserved.
8+
*
9+
* Redistribution and use in source and binary forms,
10+
* with or without modification, are permitted provided
11+
* that the following conditions are met:
12+
*
13+
* Redistributions of source code must retain the above
14+
* copyright notice, this list of conditions and the
15+
* following disclaimer.
16+
*
17+
* Redistributions in binary form must reproduce the above
18+
* copyright notice, this list of conditions and the following
19+
* disclaimer in the documentation and/or other materials
20+
* provided with the distribution.
21+
*
22+
* Neither the name of the copyright holder nor the names
23+
* of any other contributors may be used to endorse or
24+
* promote products derived from this software without
25+
* specific prior written permission.
26+
*
27+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
28+
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
29+
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
30+
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
31+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
32+
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
33+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
34+
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
35+
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
36+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
37+
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
38+
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
39+
* USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
40+
* OF SUCH DAMAGE.
41+
*/
42+

‎MicroPython_BUILD/components/libssh2/README.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# libssh2 - SSH2 library
2+
3+
libssh2 is a library implementing the SSH2 protocol, available under
4+
the revised BSD license.
5+
6+
[Web site](https://www.libssh2.org/)
7+
8+
[Mailing list](https://cool.haxx.se/mailman/listinfo/libssh2-devel)
9+
10+
[BSD Licensed](https://libssh2.org/license.html)
11+
12+
[Web site source code](https://github.com/libssh2/www)
13+
14+
Installation instructions:
15+
- [for CMake](docs/INSTALL_CMAKE)
16+
- [for autotools](docs/INSTALL_AUTOTOOLS)

‎MicroPython_BUILD/components/libssh2/RELEASE-NOTES‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
libssh2 1.8.0
2+
3+
This release includes the following changes:
4+
5+
o added a basic dockerised test suite
6+
o crypto: add support for the mbedTLS backend
7+
8+
This release includes the following bugfixes:
9+
10+
o libgcrypt: fixed a NULL pointer dereference on OOM
11+
o VMS: can't use %zd for off_t format
12+
o VMS: update vms/libssh2_config.h
13+
o windows: link with crypt32.lib
14+
o libssh2_channel_open: speeling error fixed in channel error message
15+
o msvc: fixed 14 compilation warnings
16+
o tests: HAVE_NETINET_IN_H was not defined correctly
17+
o openssl: add OpenSSL 1.1.0 compatibility
18+
o cmake: Add CLEAR_MEMORY option, analogously to that for autoconf
19+
o configure: make the --with-* options override the OpenSSL default
20+
o libssh2_wait_socket: set err_msg on errors
21+
o libssh2_wait_socket: Fix comparison with api_timeout to use milliseconds
22+
23+
This release would not have looked like this without help, code, reports and
24+
advice from friends like these:
25+
26+
Alexander Lamaison, Antenore Gatta, Brad Harder, Charles Collicutt,
27+
Craig A. Berry, Dan Fandrich, Daniel Stenberg, Kamil Dudka, Keno Fischer,
28+
Taylor Holberton, Viktor Szakats, Will Cosgrove, Zenju
29+
(12 contributors)
30+
31+
Thanks! (and sorry if I forgot to mention someone)

‎MicroPython_BUILD/components/micropython/esp32/libs/tft/tftspi.c‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,23 @@ void _tft_setRotation(uint8_t rot) {
854854
break;
855855
}
856856
}
857+
else if (_invert_rot == 3) {
858+
// used for M5Stack display
859+
switch (rotation) {
860+
case PORTRAIT:
861+
madctl = (MADCTL_MX | MADCTL_MV | _rgb_bgr);
862+
break;
863+
case LANDSCAPE:
864+
madctl = (_rgb_bgr);
865+
break;
866+
case PORTRAIT_FLIP:
867+
madctl = (MADCTL_MY | MADCTL_MV | _rgb_bgr);
868+
break;
869+
case LANDSCAPE_FLIP:
870+
madctl = (MADCTL_MY | MADCTL_MX | _rgb_bgr);
871+
break;
872+
}
873+
}
857874
else {
858875
switch (rotation) {
859876
case PORTRAIT:

‎MicroPython_BUILD/components/micropython/esp32/libs/tft/tftspi.h‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@
4242
#include "sdkconfig.h"
4343
#include "stmpe610.h"
4444

45-
#define CONFIG_EXAMPLE_ESP_WROVER_KIT
46-
4745
// === Various display constants constants ===
4846
#define PORTRAIT 0
4947
#define LANDSCAPE 1
@@ -62,8 +60,9 @@
6260
//#define DISP_COLOR_BITS_16 0x55
6361

6462
#define DISP_COLOR_BITS_24 0x66
65-
#define TFT_RGB_BGR 0x00
63+
#define TFT_RGB_BGR 0x00 // default only, set when initializing the display
6664

65+
// Pins defaults (ESP32-WROVER-KIT v3)
6766
#define PIN_NUM_MISO 25 // SPI MISO
6867
#define PIN_NUM_MOSI 23 // SPI MOSI
6968
#define PIN_NUM_CLK 19 // SPI CLOCK pin

0 commit comments

Comments
 (0)