Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream merge #1

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Upstream merge #1

wants to merge 27 commits into from

Conversation

hpsaturn
Copy link

@hpsaturn hpsaturn commented Jul 19, 2022 •
edited
Loading

Overview

Testing the current development I found that it has some issues. Also the M5 developers updated the original repo and fixed some issues regarding Espressif framework.

Tasks

  • fixed issue with arduino-framework espressif 4.4.4
  • merge with the current original main repo
  • fixed merge issues and some minimal improvements for Linux on .ini file
  • clang format (original changes from M5 team)
  • widgets can remove or add via build flags on pio ini.
  • DEBUG_LEVEL to 0 for reduce verbose

Tests

  • Over M5paper black edition

fcapano and others added 27 commits January 2, 2021 15:40
@fcapano
Add M5EPD as a platformio dependency
fb93bca
@Gitshaoxiang
Merge pull request m5stack#4 from fcapano/patch-1
99bceaf 
Add M5EPD as a platformio dependency
@eggfly
Support TXT when filesystem reports uppercase
739b1e1
@eggfly
Auto shutdown for power saving
c0a9780
@Gitshaoxiang
Merge pull request m5stack#6 from eggfly/main
4a403f2 
Auto power save: shutdown in 1 minute
@Gitshaoxiang
update sleep logo and change page refresh mode
588d8f2
@TRex22
Update platformio.ini to resolve upload failure
860c8f0 
A fatal error occurred: Invalid head of packet would occur because the upload speed or baud rate was too fast.
My M5Paper would not accept uploads at that higher baud rate
@Tinyu-Zhao
Compatible with CH9102 chip
485d7fc 
Update platformio.ini to resolve upload failure
@Tinyu-Zhao
Fixed problem of compile error in new environment
c6cdcb5
@hpsaturn
Merge remote-tracking branch 'zenreader/master' into test_zenreader_main
4fe44ad
@hpsaturn
fixed some merge issues and remove usb ports for OS compatibility
82d7694
@hpsaturn
added build flags for remove/add widgets (i.e keyboard for WiFi config)
2d2b5b6
@cat-in-136
fix bug where 5th file item and later on a folder are not displayed o…
4537be0 
…n Frame_FileIndex
@Tinyu-Zhao
Update frame_fileindex.cpp
a059c2d
@Tinyu-Zhao
Fix bug where 5th file item and later on a folder are not displayed o…
f3eb8fa 
…n Frame_FileIndex

Fix bug where 5th file item and later on a folder are not displayed on Frame_FileIndex
@tobozo
Create M5Paper_FactoryTest.ino
85ce8c4
Merge pull request m5stack#13 from tobozo/main
64db8c6 
Arduino IDE compat
Update: Update platformio.ini for limit some pacs
3f75bd5 
Limit some packages' problems.
Merge pull request m5stack#14 from IcingTomato/main
e8cd6f4 
Update: Update platformio.ini for limit some pacs
@SomeoneToIgnore
Use latest working platform package version
8fbfa02
@Tinyu-Zhao
Use latest working platform package version
e375ac6 
Use latest working platform package version
Update platformio.ini
67e2346
Merge pull request m5stack#17 from IcingTomato/main
7d22adb 
Update: Update platformio.ini to fix some unexpected error
Update: Update framework in platformio.ini
b9b8d55 
![](https://user-images.githubusercontent.com/24474531/206952547-659f218d-44cf-4d18-83fa-317a080046d4.png)
Update platformio.ini
5247147
Merge pull request m5stack#19 from IcingTomato/main
7ad43f1 
Update platformio.ini
@hpsaturn
Merge remote-tracking branch 'upstream/main' into upstream_merge
d1d809a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@hpsaturn @fcapano @Gitshaoxiang @eggfly @TRex22 @Tinyu-Zhao @cat-in-136 @tobozo @SomeoneToIgnore