Added usqlite3 module

some bug fixes and improvements if file system drivers
  - added 'trim' method to LittleFS

Author: loboris

README.md

@@ -22,6 +22,7 @@ Based on *kendryte-freertos-sdk* (modified to include some needed features not y
 * **Display** module ported from my [MicroPython for ESP32]
 (https://github.com/loboris/MicroPython_ESP32_psRAM_LoBo/wiki/display) display module
 * Full **network** support for **WiFi** (based on ESP8266/ESP8285) and **GSM** modules.
+* **sqlite3** support
 * **pye**, full screen file editor (as python frozen module) is provided
 * **MPyTerm**, serial terminal emulator specially designed for MicroPython is provided.<br>
 Included are commands to syncronize MicroPython time from PC, change the REPL baudrate, transfer files to/from MicroPython filesystem (including transfering whole directories).<br>Fast block file transfer is used, protected with CRC.
@@ -54,8 +55,8 @@ You will not be able to use `git pull` to update the repository, but otherwise t
 ## Build the MicroPython firmware
 <br>
 
-> *Kendryte toolchain will be automatically downloaded and unpacked on* **first run** *of* **BUILD.sh** *script. It can take some time on slow Internet connection (~32 MB will be downloaded).*<br>
-> *kendryte-freertos-sdk* is included in the repository
+> _**Kendryte toolchain** will be automatically downloaded and unpacked on **first run** of **BUILD.sh** script.<br> It can take some time on slow Internet connection (~32 MB will be downloaded)._<br>
+> _**kendryte-freertos-sdk** is included in the repository._
 
 
 Change the working directory to **MicroPython_K210_LoBo/k210-freertos**.
@@ -65,7 +66,7 @@ To build the MicroPython firmware, run:
 ./BUILD.sh
 ```
 
-To flush the built firmware to your K210 board, run:
+To flash the built firmware to your K210 board, run:
 ```
 ./kflash.py -p /dev/ttyUSB0 -b 2000000 -t MaixPy.bin
 ```
@@ -74,7 +75,7 @@ Change */dev/ttyUSB0* to the port used to connect to the your board if needed.
 
 ---
 
-```
+```console
 M (1371) [MAIXPY]: Configuration loaded from flash
 M (9298) [MAIXPY]: Heaps: FreeRTOS=3840 KB (1196 KB free), MPy=2560 KB, other=379 KB
 

firmware/README.md

@@ -1,7 +1,7 @@
 # MicroPython for Kendryte K210
 
 
-To flush the pre-built firmware to your K210 board, run (in this directory):
+To flash the pre-built firmware to your K210 board, run (in this directory):
 
 ```
 ./kflash.py -p /dev/ttyUSB0 -b 2000000 -t MaixPy.bin

firmware/wifi/README.md

@@ -0,0 +1,5 @@
+# ESP8266 AT FIRMWARE
+
+
+For detailed instructions about flashing the WiFi firmware see README.md in **flash** directory.
+

firmware/wifi/flash/README.md

@@ -40,7 +40,7 @@ The latest stable _esptool.py_ release can be installed from _pypi_ via pip:
 pip install esptool
 ```
 
-The initial firmware must be flashed to the ESP8266/ESP8285.<br>
+The **initial firmware** must be **flashed** to the ESP8266/ESP8285.<br>
 Bash script `flash.sh` is provided to make the flashing as easy as possible.<br>
 The correct `flash.sh` options must be specified, depending on the Flash type used:<br>
 Change the working directory to `this directory` and run `flash.sh`:<br>
@@ -83,15 +83,15 @@ Flash to ESP8266, 512KB, single firmware, no OTA:
 ![Sipeed_DanDock](Sipeed_DanDock_wifi.jpg)
 
 
-1 Connect some _USBtoSerial_ adapter to the board, connetc adapter's Tx to the Rx pin on the image, adapter's Rx to the Tx pin on the image
-1 Connect the **ESP8285 boot** pin (the M1 module's corner pin near the WiFi antenna) to the ground before powering the the board, after power on, the pin can be released
-1 Power on the board (connect USB cable to the board's USB-C connector)
-1 Execute `.\flash.sh -eo -t 1MB -m DOUT` to erase the existing firmware
-1 Power off the board (disconnect USB cable from the board's USB-C connector)
-1 Connect the **ESP8285 boot** pin to the ground before powering the the board, after power on, the pin can be released
-1 Power on the board (connect USB cable to the board's USB-C connector)
-1 Execute `.\flash.sh -t 1MB -m DOUT` to flash the new firmware
-1 Power off the board
+1. Connect some _USBtoSerial_ adapter to the board, connetc adapter's Tx to the Rx pin on the image, adapter's Rx to the Tx pin on the image
+1. Connect the **ESP8285 boot** pin (the M1 module's corner pin near the WiFi antenna) to the ground before powering the the board, after power on, the pin can be released
+1. Power on the board (connect USB cable to the board's USB-C connector)
+1. Execute `.\flash.sh -eo -t 1MB -m DOUT` to erase the existing firmware
+1. Power off the board (disconnect USB cable from the board's USB-C connector)
+1. Connect the **ESP8285 boot** pin to the ground before powering the the board, after power on, the pin can be released
+1. Power on the board (connect USB cable to the board's USB-C connector)
+1. Execute `.\flash.sh -t 1MB -m DOUT` to flash the new firmware
+1. Power off the board
 
 After booting to MicroPython, test the WiFi functionality:
 

k210-freertos/MPyTerm.py

@@ -130,7 +130,7 @@ def EnterRawREPL(self, imprt, cmd, bdr=0):
         self.ReceiverToStdout = False
         time.sleep(0.1)
         dummy = self.uart.read()
-        self.uart.timeout = 2
+        self.uart.timeout = 4
         # enter raw REPL
         self.uart.write(b'\x01')
         resp = self.uart.read(28)

k210-freertos/main.c

@@ -83,6 +83,11 @@
 #include <filesystem.h>
 #endif
 
+// === FreeRTOS heap ===
+size_t configTOTAL_HEAP_SIZE = FREE_RTOS_TOTAL_HEAP_SIZE;
+// This is used by 'heap_4.c'
+uint8_t __attribute__((aligned(8))) ucHeap[FREE_RTOS_TOTAL_HEAP_SIZE];
+
 static void *sys_rambuf;
 
 extern handle_t mp_rtc_rtc0;
@@ -113,6 +118,7 @@ static bool task0_started = false;
 static bool flash_fs_ok = false;
 static bool exec_boot_py = true;
 static bool exec_main_py = true;
+static bool use_default_config = false;
 
 //----------------------------
 size_t _check_remaining_heap()
@@ -422,8 +428,7 @@ int main()
     filesystem_rtc = mp_rtc_rtc0;
     #endif
 
-    sysctl_t sysctl __attribute__((unused));
-    sysctl.peri.jtag_clk_bypass = 1;
+    sysctl->peri.jtag_clk_bypass = 1;
 
     // ==== Initialize GPIOHS for boot menu pin check====
     if (mpy_config.config.boot_menu_pin) {
@@ -444,13 +449,15 @@ int main()
             char sel_f = ' ';
             char sel_b = ' ';
             char sel_m = ' ';
+            char sel_d = ' ';
             // boot menu pin is low, display the menu
         start_menu:
             timeout = mp_hal_ticks_ms() + 10000;
             mp_printf(&mp_plat_print, LOG_BOLD(LOG_COLOR_CYAN)"\nBoot menu, select an option\n"LOG_RESET_COLOR);
             mp_printf(&mp_plat_print, "%c"LOG_BOLD(LOG_COLOR_BROWN)"F"LOG_RESET_COLOR" - force format File system\n", sel_f);
             mp_printf(&mp_plat_print, "%c"LOG_BOLD(LOG_COLOR_BROWN)"B"LOG_RESET_COLOR" - do not execute 'boot.py'\n", sel_b);
             mp_printf(&mp_plat_print, "%c"LOG_BOLD(LOG_COLOR_BROWN)"M"LOG_RESET_COLOR" - do not execute 'main.py'\n", sel_m);
+            mp_printf(&mp_plat_print, "%c"LOG_BOLD(LOG_COLOR_BROWN)"D"LOG_RESET_COLOR" - use default configuration\n", sel_d);
             mp_printf(&mp_plat_print, LOG_BOLD(LOG_COLOR_RED)" Q"LOG_RESET_COLOR" - exit the menu\n");
             while (1) {
                 if (mp_hal_ticks_ms() > timeout) break;
@@ -473,10 +480,25 @@ int main()
                     sel_f = '*';
                     goto start_menu;
                 }
+                else if ((key == 'd') || (key == 'D')) {
+                    use_default_config = true;
+                    sel_d = '*';
+                    goto start_menu;
+                }
             }
         }
     }
 
+    if (use_default_config) {
+        vTaskDelay(2);
+        mpy_config_set_default();
+        vTaskDelay(2);
+        sysctl->soft_reset.soft_reset = 1;
+        while (1) {
+            ;
+        }
+    }
+
     // ======================================
     // ==== Allocate MicroPython heap(s) ====
     // ======================================
@@ -495,11 +517,11 @@ int main()
             configASSERT(mp_task_pystack2);
         }
         LOGM(TAG_MAIN, "Heaps: FreeRTOS=%lu KB (%lu KB free), MPy_1=%u KB, MPy_2=%u KB, other=%lu KB",
-                configTOTAL_HEAP_SIZE/1024, xPortGetFreeHeapSize()/1024, mpy_config.config.heap_size1/1024, mpy_config.config.heap_size2/1024, _check_remaining_heap()/1024);
+                FREE_RTOS_TOTAL_HEAP_SIZE/1024, xPortGetFreeHeapSize()/1024, mpy_config.config.heap_size1/1024, mpy_config.config.heap_size2/1024, _check_remaining_heap()/1024);
     }
     else {
         LOGM(TAG_MAIN, "Heaps: FreeRTOS=%lu KB (%lu KB free), MPy=%u KB, other=%lu KB",
-                configTOTAL_HEAP_SIZE/1024, xPortGetFreeHeapSize()/1024, mpy_config.config.heap_size1/1024, _check_remaining_heap()/1024);
+                FREE_RTOS_TOTAL_HEAP_SIZE/1024, xPortGetFreeHeapSize()/1024, mpy_config.config.heap_size1/1024, _check_remaining_heap()/1024);
     }
 
     // ======================================================

k210-freertos/mpy_support/modules/upysh.py

@@ -1,6 +1,7 @@
 import sys
 import os
 import time
+import gc
 
 class LS:
 
@@ -99,6 +100,7 @@ def __call__(self, srcf, destf):
             return
         try:
             st = os.stat(srcf)
+            src_size = st[6]
         except:
             print("Source not found", srcf)
             return
@@ -117,19 +119,48 @@ def __call__(self, srcf, destf):
                 print("Error opening '{}'".format(destf))
                 return
             try:
+                size = src_size
+                wrsize = 0
+                n_try = 0
+                buf = bytearray(4096)
                 while True:
-                    buf = fs.read(1024)
-                    if len(buf) == 0:
-                        break
+                    try:
+                        x = fs.readinto(buf)
+                    except:
+                        print("Read Error during copy at {}".format(size))
+                        n_try += 1
+                        if n_try > 3:
+                            try:
+                                fd.close()
+                                fs.close()
+                                os.remove(destf)
+                            except:
+                                pass
+                            return
+                        time.sleep_ms(300)
+                        continue
+                    n_try = 0
+                    wrsize += x
+                    size -= x
+                    if x < len(buf) :
+                        if x > 0:
+                            buf = memoryview(buf)[:x]
+                            fd.write(buf)
                     else:
                         fd.write(buf)
-            except:
+                    print("{} of {}".format(wrsize, src_size), end='\r')
+                    if size <= 0:
+                        print("")
+                        break
+            except Exception as err:
                 try:
+                    fs.close()
                     fd.close()
                     os.remove(destf)
                 except:
                     pass
-                print("Error during copy")
+                print("Error during copy at {} [{}]".format(size, err))
+                return
             fd.close()
             fs.close()
         except: