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

M5Stack Tough Support Added #413

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

M5Stack Tough Support Added #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7116aab
M5Tough Support Added
IncanusUK Mar 17, 2024
bf15eca
bitwise & should have been a logical && when checking if the display …
IncanusUK Mar 21, 2024
edd14a2
Merge branch 'raomin:main' into main
IncanusUK Apr 14, 2024
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
4 changes: 3 additions & 1 deletion include/mqttserial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
#include <M5StickCPlus.h>
#elif ARDUINO_M5Stick_C
#include <M5StickC.h>
#elif ARDUINO_M5Stack_Tough
#include <M5Tough.h>
#endif
class MQTTSerial: public Stream
{
Expand Down Expand Up @@ -61,7 +63,7 @@ MQTTSerial::MQTTSerial()
}
size_t MQTTSerial::write(const uint8_t *buffer, size_t size)
{
#ifdef ARDUINO_M5Stick_C
#if defined(ARDUINO_M5Stick_C) || defined(ARDUINO_M5Stack_Tough)
if (M5.Lcd.getCursorY()+13>M5.Lcd.height()){
M5.Lcd.fillScreen(TFT_BLACK);
M5.Lcd.setCursor(0,0);
Expand Down
16 changes: 16 additions & 0 deletions platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,22 @@ lib_deps =

build_flags = "-D ARDUINO_M5Stick_C_Plus2"

[env:m5stack-tough]
platform = espressif32
board = m5stack-core2
framework = arduino
monitor_speed = 115200
upload_speed = 115200
; Uncomment this line to allow for remote upgrade. If name resolution does not work for you, replace with the IP of ESPAltherma
; upload_port = ESPAltherma.local
; Uncomment this line if you want to define the protocol. Autodetected otherwise.
; upload_protocol = espota

lib_deps = https://github.com/m5stack/M5Tough.git
PubSubClient

build_flags = "-D ARDUINO_M5Stack_Tough"

[env:native]
# Used to run unit test; g++ must be in PATH.
platform = native
Expand Down
22 changes: 20 additions & 2 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
#include <M5StickCPlus.h>
#elif ARDUINO_M5Stick_C
#include <M5StickC.h>
#elif ARDUINO_M5Stack_Tough
#include <M5Tough.h>
#else
#include <Arduino.h>
#endif
Expand Down Expand Up @@ -35,7 +37,7 @@ Converter converter;
char registryIDs[32]; //Holds the registries to query
bool busy = false;

#if defined(ARDUINO_M5Stick_C) || defined(ARDUINO_M5Stick_C_Plus)
#if defined(ARDUINO_M5Stick_C) || defined(ARDUINO_M5Stick_C_Plus) || defined(ARDUINO_M5Stack_Tough)
long LCDTimeout = 40000;//Keep screen ON for 40s then turn off. ButtonA will turn it On again.
#endif

Expand Down Expand Up @@ -85,6 +87,7 @@ void updateValues(char regID)
}

uint16_t loopcount =0;
boolean display_sleeping = false;

void extraLoop()
{
Expand Down Expand Up @@ -115,6 +118,21 @@ void extraLoop()
}
M5.update();
#endif

#ifdef ARDUINO_M5Stack_Tough
if (M5.Touch.changed){//Turn back ON screen
M5.Lcd.setBrightness(12);
M5.Lcd.wakeup();
LCDTimeout = millis() + 30000;
display_sleeping = false;

}else if (LCDTimeout < millis() && !display_sleeping){//Turn screen off.
M5.Lcd.sleep();
M5.Lcd.setBrightness(0);
display_sleeping = true;
}
M5.update();
#endif
}

#ifdef ARDUINO_ARCH_ESP8266
Expand Down Expand Up @@ -258,7 +276,7 @@ void initRegistries(){
}

void setupScreen(){
#if !defined(ARDUINO_M5Stick_C_Plus2) && defined(ARDUINO_M5Stick_C) || defined(ARDUINO_M5Stick_C_Plus)
#if !defined(ARDUINO_M5Stick_C_Plus2) && defined(ARDUINO_M5Stick_C) || defined(ARDUINO_M5Stick_C_Plus) || defined(ARDUINO_M5Stack_Tough)
M5.begin();
#if !defined(ARDUINO_M5Stick_C_Plus2)
M5.Axp.EnableCoulombcounter();
Expand Down
2 changes: 1 addition & 1 deletion src/setup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#define FREQUENCY 30000 //query values every 30 sec

#if defined(ARDUINO_M5Stick_C) || defined(ARDUINO_M5Stick_C_Plus) || defined(ARDUINO_M5Stick_C_Plus2)
#if defined(ARDUINO_M5Stick_C) || defined(ARDUINO_M5Stick_C_Plus) || defined(ARDUINO_M5Stick_C_Plus2) || defined(ARDUINO_M5Stack_Tough)
// Values used when M5StickC, M5STickCPlus or M5Stick_C_Plus2 environment is selected:
#define RX_PIN 36// Pin connected to the TX pin of X10A
#define TX_PIN 26// Pin connected to the RX pin of X10A
Expand Down