Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 073ba4e

Browse files
committed
Updated 'ethernet' module
 updated all modules using network to work on any network interface, including ethernet ftpserver and telnet server now also works over ethernet Updated 'uos.sdconfig()' SPI host can be selected if SDCard mode is SPI Updated 'Curl' module added 'getmail' method added option to set maximum write buffer size, lower size can make it more usable on boards without psRAM tab character (0x09) is now accepted in response body Updated 'machine' module fixed bug in 'deepsleep' method, deepslep for all timeout values now works as expected Updated 'DAC' module fixed bug in 'waveform' method, the 'duration' argument now works for waveform types Updated 'machine.Pin' module fixed bug in handling the 'debounce' argument Added 'requests' module implemented in C, based on 'esp_http_client' componnent get, post, head, put, patch methods Refactored 'display' module added full support for FTDI EVE chips (FT8xx) prepared for implementation of e-paper displays support Updated sdcard support Updated esp-idf to version v3.1-rc1-53509c7b
1 parent 210efe9 commit 073ba4e

File tree

93 files changed

+9652
-2699
lines changed

Some content is hidden

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

93 files changed

+9652
-2699
lines changed

‎MicroPython_BUILD/.settings/language.settings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
7-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"keep-relative-paths="false"name="CDT GCC Build Output Parser"parameter="(g?cc)|([gc]\+\+)|(clang)"prefer-non-shared="true"/>
8-
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1072481106224612254" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
7+
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1072297972298084254" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎MicroPython_BUILD/BUILD.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
# size - display static memory footprint of the firmware
2727
# size-components - display detailed memory footprint of the firmware
2828
# size-files - display detailed memory footprint of the firmware
29+
# miniterm - start pySerial command line program miniterm
30+
# monitor - start esp-idf terminal emulator
2931

3032
# Options:
3133
# -jN - make with multicore option, N should be the number of cores used
@@ -50,8 +52,8 @@
5052

5153

5254
#=======================
53-
TOOLS_VER=ver20180628.id
54-
BUILD_VER=ver20180628.id
55+
TOOLS_VER=ver20180827.id
56+
BUILD_VER=ver20180827.id
5557
#=======================
5658

5759
# -----------------------------

‎MicroPython_BUILD/build_func.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,13 @@ executeCommand() {
660660
echo "======================"
661661
make erase_flash${BUILD_COMPORT}${BUILD_BDRATE}
662662

663+
# ------------------------------------
664+
elif [ "${arg}" == "miniterm" ]; then
665+
echo "====================="
666+
echo "Executing miniterm..."
667+
echo "====================="
668+
make simple_monitor${BUILD_COMPORT}
669+
663670
# ----------------------------------
664671
elif [ "${arg}" == "monitor" ]; then
665672
echo "============================"

‎MicroPython_BUILD/components/curl/include/curl/curl.h‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
* https://cool.haxx.se/mailman/listinfo/curl-library/
3131
*/
3232

33+
#include "sdkconfig.h"
34+
3335
#define SIZEOF_CURL_OFF_T 4
3436

3537
#ifdef CURL_NO_OLDIES
@@ -218,7 +220,7 @@ typedef int (*curl_xferinfo_callback)(void *clientp,
218220

219221
#ifndef CURL_MAX_READ_SIZE
220222
/* The maximum receive buffer size configurable via CURLOPT_BUFFERSIZE. */
221-
#define CURL_MAX_READ_SIZE 524288
223+
#define CURL_MAX_READ_SIZE 16384
222224
#endif
223225

224226
#ifndef CURL_MAX_WRITE_SIZE
@@ -228,8 +230,12 @@ typedef int (*curl_xferinfo_callback)(void *clientp,
228230
time for those who feel adventurous. The practical minimum is about
229231
400 bytes since libcurl uses a buffer of this size as a scratch area
230232
(unrelated to network send operations). */
233+
#ifdef CONFIG_MICROPY_CURL_MAX_WRITE_SIZE
234+
#define CURL_MAX_WRITE_SIZE CONFIG_MICROPY_CURL_MAX_WRITE_SIZE
235+
#else
231236
#define CURL_MAX_WRITE_SIZE 16384
232237
#endif
238+
#endif
233239

234240
#ifndef CURL_MAX_HTTP_HEADER
235241
/* The only reason to have a max limit for this is to avoid the risk of a bad

‎MicroPython_BUILD/components/curl/lib/connect.c‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,11 +1409,13 @@ void Curl_conncontrol(struct connectdata *conn,
14091409
bool closeit = (ctrl == CONNCTRL_CONNECTION) ||
14101410
((ctrl == CONNCTRL_STREAM) && !(conn->handler->flags & PROTOPT_STREAM));
14111411
if((ctrl == CONNCTRL_STREAM) &&
1412-
(conn->handler->flags & PROTOPT_STREAM))
1413-
DEBUGF(infof(conn->data, "Kill stream: %s\n", reason));
1412+
(conn->handler->flags & PROTOPT_STREAM)) {
1413+
//DEBUGF(infof(conn->data, "Kill stream: %s\n", reason));
1414+
DEBUGF(infof(conn->data, "Kill stream\n"));
1415+
}
14141416
else if(closeit != conn->bits.close) {
1415-
DEBUGF(infof(conn->data, "Marked for [%s]: %s\n",
1416-
closeit?"closure":"keep alive", reason));
1417+
//DEBUGF(infof(conn->data, "Marked for [%s]: %s\n", closeit?"closure":"keep alive", reason));
1418+
DEBUGF(infof(conn->data, "Marked for [%s]\n", closeit?"closure":"keep alive"));
14171419
conn->bits.close = closeit; /* the only place in the source code that
14181420
should assign this bit */
14191421
}

‎MicroPython_BUILD/components/micropython/Kconfig.projbuild‎

Lines changed: 79 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,14 +322,73 @@ menu "MicroPython"
322322
default n
323323
help
324324
Include Display module into build
325-
Display module includes support for various SPI TFT displays
325+
326+
config MICROPY_USE_TFT
327+
depends on MICROPY_USE_DISPLAY
328+
bool "Enable support for SPI TFT displays"
329+
default y
330+
help
331+
Include support for various SPI TFT displays
332+
333+
config MICROPY_USE_EPD
334+
depends on MICROPY_USE_DISPLAY
335+
bool "Enable support for ePaper displays (NOT COMPLETE, DO NOT ENABLE)"
336+
default n
337+
help
338+
Include support for ePaper displays into build
326339

327340
config MICROPY_USE_EVE
328-
bool "Use EVE display module (experimental, do not enable)"
341+
depends on MICROPY_USE_DISPLAY
342+
bool "Enable support for EVE (FT8xx) displays"
329343
default n
330344
help
331-
Include EVE display module into build
332-
Display module includes support for EVE displays (FT80x, FT81x)
345+
Includes support for EVE displays (FT80x, FT81x)
346+
347+
menu "EVE Configuration"
348+
depends on MICROPY_USE_EVE
349+
config MICROPY_EVE_FT81X
350+
bool "EVE FT81X type"
351+
depends on MICROPY_USE_EVE
352+
default y
353+
help
354+
Used FT8xx chip is FT81x
355+
If not set, the code for FT80x will be compiled
356+
357+
config EVE_MODE_TYPE
358+
int
359+
default 0 if FT8_USER_TYPE
360+
default 1 if FT8_FT810CB_HY50HD
361+
default 2 if FT8_FT811CB_HY50HD
362+
default 3 if FT8_VM800B35A
363+
default 4 if FT8_VM800B43A
364+
default 5 if FT8_VM800B50A
365+
default 6 if FT8_EVE2_50G
366+
default 6 if FT8_EVE2_TEST
367+
368+
choice
369+
prompt "Select predefined EVE display type"
370+
default EVE_MODE_TYPE1
371+
help
372+
Select predefined EVE display type
373+
374+
config FT8_USER_TYPE
375+
bool "User defined"
376+
config FT8_FT810CB_HY50HD
377+
bool "FT810CB-HY50HD: FT810 800x480 5\", HAOYU"
378+
config FT8_FT811CB_HY50HD
379+
bool "FT811CB-HY50HD: FT810 800x480 5\", HAOYU"
380+
config FT8_VM800B35A
381+
bool "VM800B35A: FT800 320x240 3.5\", FTDI"
382+
config FT8_VM800B43A
383+
bool "VM800B43A: FT800 480x272 4.4\", FTDI/BRT"
384+
config FT8_VM800B50A
385+
bool "VM800B50A: FT800 480x272 5\", FTDI/BRT"
386+
config FT8_EVE2_50G
387+
bool "800x480 5.0\" capacitive touch, FT813"
388+
config FT8_EVE2_TEST
389+
bool "TEST display"
390+
endchoice
391+
endmenu
333392

334393
config MICROPY_USE_GSM
335394
bool "Use GSM module"
@@ -384,13 +443,29 @@ menu "MicroPython"
384443
help
385444
Include mDNS module into build
386445

446+
config MICROPY_USE_REQUESTS
447+
bool "Use requests module"
448+
default y
449+
help
450+
Include requests module into build
451+
The module ofers less features than curl, but uses far les resources
452+
387453
config MICROPY_USE_CURL
388454
bool "Use Curl module"
389455
default n
390456
help
391457
Include CURL module into build
392458
Using CURL module will add ~230 KB to your flash code size
393459

460+
config MICROPY_CURL_MAX_WRITE_SIZE
461+
int "Curl max write buffer size"
462+
depends on MICROPY_USE_CURL
463+
range 1024 16384
464+
default 8192
465+
help
466+
Curl buffer size used in many Curl functions
467+
If not using SPIRAM, it may be necessary to set the size to the lower value
468+
394469
config MICROPY_USE_CURL_TLS
395470
bool "Enable TLS in Curl module"
396471
depends on MICROPY_USE_CURL

‎MicroPython_BUILD/components/micropython/component.mk‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,9 @@ LIBS_SRC_C = $(addprefix esp32/libs/,\
261261
littleflash.c \
262262
)
263263

264-
ifdef CONFIG_MICROPY_USE_DISPLAY
264+
ifdef CONFIG_MICROPY_USE_TFT
265265
LIBS_SRC_C += \
266+
esp32/moddisplay_tft.c \
266267
esp32/libs/tft/tftspi.c \
267268
esp32/libs/tft/tft.c \
268269
esp32/libs/tft/comic24.c \
@@ -278,7 +279,8 @@ endif
278279

279280
ifdef CONFIG_MICROPY_USE_EVE
280281
LIBS_SRC_C += \
281-
esp32/libs/eve/FT8_commands.c
282+
esp32/libs/eve/FT8_commands.c \
283+
esp32/moddisplay_eve.c
282284
endif
283285

284286
ifeq ($(MICROPY_PY_BTREE),1)

‎MicroPython_BUILD/components/micropython/esp32/libs/curl_mail.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,8 @@ const char* curlmail_protocol_send(curl_mail mail_object, const char* smtpserver
640640
if (curl_progress) curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 0L);
641641
curl_easy_setopt(curl, CURLOPT_FORBID_REUSE, 1L);
642642

643+
curl_easy_setopt(curl, CURLOPT_BUFFERSIZE, 2048);
644+
643645
//send the message
644646
MP_THREAD_GIL_EXIT();
645647
result = curl_easy_perform(curl);

‎MicroPython_BUILD/components/micropython/esp32/libs/curl_mail.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ extern "C" {
3939

4040
#define CURLMAIL_PROTOCOL_SMTP 1
4141
#define CURLMAIL_PROTOCOL_SMTPS 2
42+
#define CURLMAIL_PROTOCOL_IMAP 3
43+
#define CURLMAIL_PROTOCOL_IMAPS 4
44+
4245
#define CURLMAIL_MAX_ATTACHMENTS 4
4346

4447

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /