Skip to content

Fix ttgo twatch & tbeam board definition error #4212

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

Merged
merged 2 commits into from
Oct 1, 2020
Merged

Fix ttgo twatch & tbeam board definition error #4212

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
914a50f
Fix ttgo twatch & tbeam board definition error
Jul 29, 2020
6d97b06
Merge branch 'master' into master
me-no-dev Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3544,8 +3544,8 @@ t-beam.serial.disableRTS=true

t-beam.build.mcu=esp32
t-beam.build.core=esp32
t-beam.build.variant=t-beam
t-beam.build.board=T-Beam
t-beam.build.variant=tbeam
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't this break building for this board? AFAIK build.variant is used as a directory name under the variants directory, but there is only variants/t-beam, not variants/tbeam. So IIUC, this change must either be reverted, or the variant directory should be renamed?

t-beam.build.board=TBeam

t-beam.build.f_cpu=240000000L
t-beam.build.flash_mode=dio
Expand Down Expand Up @@ -4100,6 +4100,7 @@ twatch.serial.disableRTS=true
twatch.build.mcu=esp32
twatch.build.core=esp32
twatch.build.variant=twatch
twatch.build.board=TWatch

twatch.menu.Revision.TWATCH_BASE=T-Watch Base
twatch.menu.Revision.TWATCH_BASE.build.board=TWATCH_BASE
Expand Down