mirror of
https://git.mirrors.martin98.com/https://github.com/luc-github/ESP3D.git
synced 2025-08-04 22:10:36 +08:00
39e06975f2
### 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
75 lines
2.2 KiB
Python
75 lines
2.2 KiB
Python
#!/usr/bin/env python3
|
|
|
|
# Applies a commit or commits on branch or branches
|
|
# USAGE:
|
|
# patch.py -c <commit-list> -b <branch-list> [-p] [-t]
|
|
# - <commit-list>: list of commit SHAs to apply.
|
|
# - <branch-list>: branches where the commit should be applied. * can be used as wildchar
|
|
# - p: push the changes to <branch-list>
|
|
# - t: increment version number and create a tag
|
|
|
|
|
|
import os, subprocess, com, re
|
|
|
|
push = False
|
|
|
|
def clone(repo):
|
|
com.cmd("git clone --recurse-submodules https://github.com/lvgl/" + repo)
|
|
os.chdir("./" + repo)
|
|
com.cmd("git checkout master")
|
|
com.cmd("git remote update origin --prune")
|
|
com.cmd("git pull origin --tags")
|
|
os.chdir("..")
|
|
|
|
# Get the list of related minor version branches
|
|
|
|
#clone("lvgl")
|
|
os.chdir("lvgl")
|
|
|
|
cmd = "git branch --remotes | grep origin/release/v8"
|
|
branches, error = subprocess.Popen(cmd, shell=True, executable="/bin/bash", stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
|
|
|
|
branches = str(branches)
|
|
branches = branches.replace("b'", "")
|
|
branches = branches.replace("'", "")
|
|
branches = branches.replace("origin/", "")
|
|
branches = branches.replace(" ", " ")
|
|
branches = branches.replace("\\n", "")
|
|
branches = branches.split(" ")
|
|
branches = list(filter(len, branches))
|
|
|
|
commits = []
|
|
with open('../commits.txt') as f:
|
|
for line in f:
|
|
commits.insert(0, line)
|
|
|
|
print(commits)
|
|
|
|
for br in branches:
|
|
com.cmd("git checkout " + br)
|
|
|
|
print("Applying commits")
|
|
for c in commits:
|
|
h = c.split(" ")
|
|
com.cmd("git cherry-pick " + h[0])
|
|
|
|
ver = com.get_lvgl_version(br)
|
|
ver_new = ver.copy()
|
|
ver_new[2] = str(int(ver_new[2]) + 1)
|
|
print("Updating branch '" + br + "' from '" + com.ver_format(ver) + "' to '" + com.ver_format(ver_new) + "'")
|
|
com.update_version(ver_new)
|
|
com.cmd("git tag -a " + com.ver_format(ver_new) + "-m \"Release " + com.ver_format(ver_new) + "\"")
|
|
|
|
if push:
|
|
com.cmd("git push origin " + br + "--tags")
|
|
|
|
com.cmd("git checkout master")
|
|
ver = com.get_lvgl_version("master")
|
|
ver = com.get_lvgl_version(br)
|
|
ver_new[2] = str(int(ver_new[2]) + 1)
|
|
t = com.ver_format(ver_new) + "-dev"
|
|
com.cmd("git tag -a " + t + " -m \"Start " + t + "\"")
|
|
|
|
if push:
|
|
com.cmd("git push origin master --tags")
|