mirror of
https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git
synced 2025-08-05 00:00:42 +08:00

### Maintenance page * Add add tab color for mobile view * Add spellcheck off / autocorect off in input * Add disconnect button when authenticate enabled * Add Invalid user or password message when authentication failed ### Board support * Add ESP32 S2 support * Add ESP32 S3 support * Add ESP32 C3 support ### ESP commands * Add command 701 to control GCODE streaming * Remove command 901 as duplicate * Update command 420 to add more details * Use text as default output * All json on all commands for formated output ### Core * Add benchmak function to check transfer speed (for test only-not production) * Merge code for ESP3DLib support * Add better printer display support (M117 / Serial TFT) * Use ESP32 analogWrite instead of emulated one ### Modules * Display * Refactor code * Remove SPI ILI 9341 / 9488 support as not suitable * Add ST7789 support (135x240 / 240x240) * Filesystem * Bug fixes due to esp core updates * Better SD sharing mecanism * Better global FS management * FTP * Add SD sharing support * Better global FS management * GCODE Host * Add basic support for macro files * Add ESP command support * Use not blocking method to stream commands / handle response * Notifications * Add IFTTT notification service * Add WebUI notification * Add ESP3D display notification * WebDav * Add SD sharing support * Add bug fix from https://github.com/d-a-v/ESPWebDAV * Better global FS management * Websocket * Add function to handle zombies connections * WiFi * Fix connection to AP sometime fail * Fix low signal not diplayed in ESP420 even connected * Add AP Setup mode ### Libraries * Update SDFat-2.0.6 to 2.1.2 * Update ESP32SSDP 1.1.1 to 1.2.0 * Update TFT_eSPI-1.4.11 to 2.4.61 * Update arduinoWebSockets-2.3.5 to 2.3.6 * Update esp8266-oled-ssd1306-4.0.0 to 4.3.0 * Remove lvgl support ### Tools * Add I2C scanner script * Add python script to simulate/stress printer serial communication ### PlatformIO * Use latest 4.4.0 Espressif32 release (ESP32-arduino core 2.0.3) * Add fix for Flash more than 4MB * Add Esp32 S2/S3/C3 env * Add ESP32-ST7789 / esp32-TTGO_T_Display env
109 lines
2.9 KiB
Python
109 lines
2.9 KiB
Python
#!/usr/bin/env python3
|
|
|
|
import sys
|
|
import os.path
|
|
from os import path
|
|
import os, fnmatch
|
|
import re
|
|
import subprocess
|
|
import com
|
|
|
|
def cmd(c, ask_on_err = True):
|
|
print("\n" + c)
|
|
r = os.system(c)
|
|
if r:
|
|
print("### Error: " + str(r))
|
|
if ask_on_err:
|
|
input("Press Enter to continue execution...")
|
|
|
|
def define_set(fn, name, value):
|
|
print("In " + fn + " set " + name + " to " + value)
|
|
|
|
new_content = ""
|
|
s = r'^ *# *define +' + str(name).rstrip() + ' +'
|
|
|
|
f = open(fn, "r")
|
|
for i in f.read().splitlines():
|
|
r = re.search(s, i)
|
|
if r:
|
|
d = i.split("define")
|
|
i = d[0] + "define " + name + " " + value
|
|
new_content += i + '\n'
|
|
|
|
f.close()
|
|
|
|
f = open(fn, "w")
|
|
f.write(new_content)
|
|
f.close()
|
|
|
|
def ver_format(ver):
|
|
s = "v" + str(ver[0]) + "." + str(ver[1]) + "." + str(ver[2])
|
|
if(ver[3] != ""): s = s + "-" + ver[3]
|
|
return s
|
|
|
|
def get_lvgl_version():
|
|
print("Get lvgl's version ")
|
|
|
|
ver = [0, 0, 0, ""]
|
|
|
|
f = open("./lvgl.h", "r")
|
|
|
|
lastNum = re.compile(r'(?:[^\d]*(\d+)[^\d]*)+')
|
|
for i in f.read().splitlines():
|
|
r = re.search(r'^#define LVGL_VERSION_MAJOR ', i)
|
|
if r:
|
|
m = lastNum.search(i)
|
|
if m: ver[0] = m.group(1)
|
|
|
|
r = re.search(r'^#define LVGL_VERSION_MINOR ', i)
|
|
if r:
|
|
m = lastNum.search(i)
|
|
if m: ver[1] = m.group(1)
|
|
|
|
r = re.search(r'^#define LVGL_VERSION_PATCH ', i)
|
|
if r:
|
|
m = lastNum.search(i)
|
|
if m: ver[2] = m.group(1)
|
|
|
|
f.close()
|
|
|
|
print("Version found: " + ver_format(ver))
|
|
|
|
return ver
|
|
|
|
def push(c):
|
|
cmd("git push " + c)
|
|
|
|
def update_version(ver):
|
|
ver_str = ver_format(ver)
|
|
ver_num = ver[0] + "." + ver[1] + "." + ver[2]
|
|
|
|
templ = fnmatch.filter(os.listdir('.'), '*_templ*.h')
|
|
|
|
if len(templ) > 0 and templ[0]:
|
|
print("Updating version in " + templ[0])
|
|
cmd("sed -i -r 's/v[0-9]+\.[0-9]+\.[0-9]+.*/"+ "v" + ver_num + "/' " + templ[0])
|
|
|
|
if os.path.exists("library.json"):
|
|
print("Updating version in library.json")
|
|
cmd("sed -i -r 's/[0-9]+\.[0-9]+\.[0-9]+/"+ ver_num +"/' library.json")
|
|
|
|
if path.exists("library.properties"):
|
|
print("Updating version in library.properties")
|
|
cmd("sed -i -r 's/version=[0-9]+\.[0-9]+\.[0-9]+/"+ "version=" + ver_num + "/' library.properties")
|
|
|
|
if path.exists("conf.py"):
|
|
cmd("sed -i -r 's/v[0-9]+\.[0-9]+\.[0-9]+.*/" + ver_str + "/' conf.py")
|
|
|
|
if path.exists("Kconfig"):
|
|
cmd("sed -i -r 's/v[0-9]+\.[0-9]+\.[0-9]+.*/" + ver_str + "/' Kconfig")
|
|
|
|
if path.exists("lvgl.h"):
|
|
define_set("./lvgl.h", "LVGL_VERSION_MAJOR", str(ver[0]))
|
|
define_set("./lvgl.h", "LVGL_VERSION_MINOR", str(ver[1]))
|
|
define_set("./lvgl.h", "LVGL_VERSION_PATCH", str(ver[2]))
|
|
define_set("./lvgl.h", "LVGL_VERSION_INFO", "\"" + ver[3] + "\"")
|
|
|
|
cmd("git commit -am 'Update versions to " + ver_str + "'")
|
|
|