Skip to content

Commit

Permalink
Merge pull request #17 from bmorcelli/main
Browse files Browse the repository at this point in the history
BLE, Boot, CheckEscPress
  • Loading branch information
pr3y authored May 15, 2024
2 parents 86c6ab3 + 0f92c72 commit a5bfbd5
Show file tree
Hide file tree
Showing 11 changed files with 394 additions and 114 deletions.
13 changes: 5 additions & 8 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ default_envs =
m5stack-cplus1_1
m5stack-cplus2
m5stack-cardputer
m5stack-c
;m5stack-c

[common]
build_flags =
Expand All @@ -28,6 +28,7 @@ lib_deps =
Time
LibSSH-ESP32
PCA9554
h2zero/NimBLE-Arduino @ ^1.4.1

[env:m5stack-cplus2]
platform = espressif32
Expand All @@ -54,7 +55,7 @@ build_flags =
-DWIDTH=240
-DHEIGHT=135
-DBACKLIGHT=27
-DMINBRIGHT=190
-DMINBRIGHT=80

-DLED=19
-DLED_ON=HIGH
Expand Down Expand Up @@ -94,7 +95,6 @@ build_flags =
-DGROVE_SCL=33
lib_deps =
${common.lib_deps}
xylopyrographer/LiteLED@^1.2.0

[env:m5stack-cplus1_1]
platform = espressif32
Expand Down Expand Up @@ -154,7 +154,6 @@ build_flags =
lib_deps =
https://github.com/tanakamasayuki/I2C_AXP192
${common.lib_deps}
xylopyrographer/LiteLED@^1.2.0

[env:m5stack-cardputer]
platform = espressif32
Expand All @@ -175,7 +174,7 @@ build_flags =
-DWIDTH=240
-DHEIGHT=135
-DBACKLIGHT=38
-DMINBRIGHT=165
-DMINBRIGHT=80
-DMAX_MENU_SIZE=5

-DFP=1
Expand Down Expand Up @@ -260,7 +259,6 @@ build_flags =
-DGROVE_SCL=33
lib_deps =
${common.lib_deps}
xylopyrographer/LiteLED@^1.2.0

[env:m5stack-c-test]
platform = espressif32
Expand Down Expand Up @@ -289,7 +287,7 @@ build_flags =
-DLED_ON=HIGH
-DLED_OFF=LOW
-DBACKLIGHT=38
-DMINBRIGHT=165
-DMINBRIGHT=80
-DMAX_MENU_SIZE=5
-DUSER_SETUP_LOADED=1
-DST7789_2_DRIVER=1
Expand Down Expand Up @@ -320,4 +318,3 @@ build_flags =
-DGROVE_SCL=33
lib_deps =
${common.lib_deps}
xylopyrographer/LiteLED@^1.2.0
10 changes: 3 additions & 7 deletions src/TV-B-Gone.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,10 @@ void sendAllCodes()
displayRedStripe("Paused", TFT_WHITE, BGCOLOR);

while (!checkSelPress()){ // Se apertar Select denovo, continua
#ifndef CARDPUTER
if(checkPrevPress()) { // Cancela o TV-B-Gone
endingEarly = true;
break;
if(checkEscPress()) {
endingEarly= true;
break;
}
#else
if(Keyboard.isKeyPressed('`')) break;; // apertar ESC no Cardputer // Cancela o TV-B-Gone
#endif
}
while (checkSelPress()){
yield();
Expand Down
Loading

0 comments on commit a5bfbd5

Please sign in to comment.