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.

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

On T114 do no wake into loader instead of application. #4997

Merged
merged 2 commits into from
Oct 8, 2024

Conversation

jhps
Copy link
Contributor

@jhps jhps commented Oct 8, 2024

In shutdown, on button press, wake back to application rather than into the loader.
Suggested by lyusupov and implemented by todd-herbert.
fixes #4651

@thebentern thebentern merged commit 37f294d into meshtastic:master Oct 8, 2024
44 of 45 checks passed
@caveman99
Copy link
Member

Just to follow up on this - we clean up stale issues once in a while. No ill is meant by that. Sometimes it brings them back to life, like this one :-)

panaceya added a commit to mesh-mk-ua/meshtastic-firmware that referenced this pull request Oct 8, 2024
* Add RAK4631 Ethernet Gateway with working JSON output to MQTT

* Update platformio.ini

Fix default build environment

* Fix default build platform

* Fix #ifndef and rename the variant

* Fix traceroute, neighborinfo and waypoint

* Disable SCREEN and enable TZ

* Fix platformio.ini conflict

* Fix formatting

* Another try to get the code format correct.

* Trunk fmt

* Remove accelerometer lib

* Toggle Bluetooth with Fn+b shortcut (meshtastic#4977)

* Toggle Blutooth with Fn+b shortcut

Problem:
As many are aware, ESP32 devices are known for their high power consumption. For instance, the Heltec ESP32 V3 draws around 110mA when powered on with the screen active and connected to a phone via Bluetooth. The Bluetooth radio alone is responsible for approximately 50mA of that consumption. For keyboard-based standalone devices, which rarely need Bluetooth other than for changing settings, users were forced to keep Bluetooth on regardless of necessity. There was no way to toggle Bluetooth on or off without physically connecting the device to a computer via serial or using the admin channel, which required another node for access.

Solution:
I implemented a new feature that allows users to turn off Bluetooth on keyboard devices by pressing Fn+b and turn it back on when needed. This enhancement significantly improves power efficiency for these devices.

Result:
With Bluetooth off, the device now consumes only 55mA. When combined with Power Save mode, the consumption can drop as low as 11mA, a substantial reduction from the previous 110mA. Users can still easily reconnect to a phone using the shortcut when necessary, offering greater flexibility and extended battery life.

* Remove 1 reboot at least.

I was able to prevent a reboot using the disableBluetooth(); command, current tested at 47-55mA, it doesn't require a reboot to turn off, but it does need reboot to turn back on.

* Update CannedMessageModule.cpp

* Add health telemetry module (meshtastic#4927)

* Add stub health telemetry module

* Add detection for MAX30102 Health Sensor

It lives on I2C bus at 0x57, which conflicts with an existing
sensor. Add code to check the PARTID register for its response 0x15
per spec.

* Add detection for MLX90614

An IR Temperature sensor suitable for livestock monitoring.

* Add libraries for MLX90614 and MAX30102 sensors

* Fix Trunk

* Add support for MLX90614 IR Temperature Sensor

* Add support for MAX30102 (Temperature)

* Make it build - our first HealthTelemetry on the mesh.

If a MAX30102 is connected, its temperature will be sent to the
mesh as HealthTelemetry.

* Add spo2 and heart rate calculations to MAX30102

* Switch MLX90614 to Adafruit library

Sparkfun was having fun with SDA/SCL variables which we can avoid
by switching to this highly similar library.

* Enable HealthTelemetry if MLX90614 detected

* Change MLX90614 emissivity for human skin.

* Add health screen!

* Remove autogenerated file from branch

* Preparing for review

* Fix MeshService master sync from before.

* Prepare for review

* For the americans

* Fix native build

* Fix for devices with no screen

* Remove extra log causing issues

---------

Co-authored-by: Tom Fifield <tom@tomfifield.net>

* In shutdown, on button press, wake back to application rather than into the loader. (meshtastic#4997)

Suggested by lyusupov and implemented by todd-herbert.
meshtastic#4651

* De-conflict MLX90614_ADDR macro

* First version of a DeepSleep state for the RP2040 (meshtastic#4976)

* Adding pico-extra utils

* RP2040 can now go to deepsleep

* First RP2040 DeepSleep code - TODO : do better and restore

* FIX RAK11310 compilation (revert SDK + missing defines)

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>

* Posthumous tronkination

* No idea why trunk wants to disturb these PNGs but...

* preliminary Othernet Dreamcatcher Support (meshtastic#4933)

* preliminary Othernet Dreamcatcher 2206 Support
Need to adapt to 2301 final version

* second target for latest revision

* preliminary Othernet Dreamcatcher 2206 Support
Need to adapt to 2301 final version

* second target for latest revision

* preliminary Othernet Dreamcatcher 2206 Support
Need to adapt to 2301 final version

* second target for latest revision

* address comments

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Tom Fifield <tom@tomfifield.net>

---------

Co-authored-by: beegee-tokyo <bernd@giesecke.tk>
Co-authored-by: Bernd Giesecke <bernd.giesecke@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: GUVWAF <thijs@havinga.eu>
Co-authored-by: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
Co-authored-by: Tom Fifield <tom@tomfifield.net>
Co-authored-by: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com>
Co-authored-by: jhps <jhanna@pangolin-systems.com>
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: TheMalkavien <themalkavien@gmail.com>
panaceya added a commit to mesh-mk-ua/meshtastic-firmware that referenced this pull request Oct 9, 2024
* Add RAK4631 Ethernet Gateway with working JSON output to MQTT

* Update platformio.ini

Fix default build environment

* Fix default build platform

* Fix #ifndef and rename the variant

* Fix traceroute, neighborinfo and waypoint

* Disable SCREEN and enable TZ

* Fix platformio.ini conflict

* Fix formatting

* Another try to get the code format correct.

* Trunk fmt

* Remove accelerometer lib

* Toggle Bluetooth with Fn+b shortcut (meshtastic#4977)

* Toggle Blutooth with Fn+b shortcut

Problem:
As many are aware, ESP32 devices are known for their high power consumption. For instance, the Heltec ESP32 V3 draws around 110mA when powered on with the screen active and connected to a phone via Bluetooth. The Bluetooth radio alone is responsible for approximately 50mA of that consumption. For keyboard-based standalone devices, which rarely need Bluetooth other than for changing settings, users were forced to keep Bluetooth on regardless of necessity. There was no way to toggle Bluetooth on or off without physically connecting the device to a computer via serial or using the admin channel, which required another node for access.

Solution:
I implemented a new feature that allows users to turn off Bluetooth on keyboard devices by pressing Fn+b and turn it back on when needed. This enhancement significantly improves power efficiency for these devices.

Result:
With Bluetooth off, the device now consumes only 55mA. When combined with Power Save mode, the consumption can drop as low as 11mA, a substantial reduction from the previous 110mA. Users can still easily reconnect to a phone using the shortcut when necessary, offering greater flexibility and extended battery life.

* Remove 1 reboot at least.

I was able to prevent a reboot using the disableBluetooth(); command, current tested at 47-55mA, it doesn't require a reboot to turn off, but it does need reboot to turn back on.

* Update CannedMessageModule.cpp

* Add health telemetry module (meshtastic#4927)

* Add stub health telemetry module

* Add detection for MAX30102 Health Sensor

It lives on I2C bus at 0x57, which conflicts with an existing
sensor. Add code to check the PARTID register for its response 0x15
per spec.

* Add detection for MLX90614

An IR Temperature sensor suitable for livestock monitoring.

* Add libraries for MLX90614 and MAX30102 sensors

* Fix Trunk

* Add support for MLX90614 IR Temperature Sensor

* Add support for MAX30102 (Temperature)

* Make it build - our first HealthTelemetry on the mesh.

If a MAX30102 is connected, its temperature will be sent to the
mesh as HealthTelemetry.

* Add spo2 and heart rate calculations to MAX30102

* Switch MLX90614 to Adafruit library

Sparkfun was having fun with SDA/SCL variables which we can avoid
by switching to this highly similar library.

* Enable HealthTelemetry if MLX90614 detected

* Change MLX90614 emissivity for human skin.

* Add health screen!

* Remove autogenerated file from branch

* Preparing for review

* Fix MeshService master sync from before.

* Prepare for review

* For the americans

* Fix native build

* Fix for devices with no screen

* Remove extra log causing issues

---------

Co-authored-by: Tom Fifield <tom@tomfifield.net>

* In shutdown, on button press, wake back to application rather than into the loader. (meshtastic#4997)

Suggested by lyusupov and implemented by todd-herbert.
meshtastic#4651

* De-conflict MLX90614_ADDR macro

* First version of a DeepSleep state for the RP2040 (meshtastic#4976)

* Adding pico-extra utils

* RP2040 can now go to deepsleep

* First RP2040 DeepSleep code - TODO : do better and restore

* FIX RAK11310 compilation (revert SDK + missing defines)

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>

* Posthumous tronkination

* No idea why trunk wants to disturb these PNGs but...

* preliminary Othernet Dreamcatcher Support (meshtastic#4933)

* preliminary Othernet Dreamcatcher 2206 Support
Need to adapt to 2301 final version

* second target for latest revision

* preliminary Othernet Dreamcatcher 2206 Support
Need to adapt to 2301 final version

* second target for latest revision

* preliminary Othernet Dreamcatcher 2206 Support
Need to adapt to 2301 final version

* second target for latest revision

* address comments

---------

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: Tom Fifield <tom@tomfifield.net>

* Ignore packets coming from the broadcast address (meshtastic#4998)

---------

Co-authored-by: beegee-tokyo <bernd@giesecke.tk>
Co-authored-by: Bernd Giesecke <bernd.giesecke@gmail.com>
Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
Co-authored-by: GUVWAF <thijs@havinga.eu>
Co-authored-by: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>
Co-authored-by: Tom Fifield <tom@tomfifield.net>
Co-authored-by: HarukiToreda <116696711+HarukiToreda@users.noreply.github.com>
Co-authored-by: jhps <jhanna@pangolin-systems.com>
Co-authored-by: Thomas Göttgens <tgoettgens@gmail.com>
Co-authored-by: TheMalkavien <themalkavien@gmail.com>
@Monolith18
Copy link

I think this is a bug not a feature when it comes to T-Echo not autostarting. Since day 1 (don't remember which FW was that with my first T-Echo) autostart was something normal, out of the box. To put T-Echo unit into DFU mode user can quickly double press reset (RST) button. That's it. I don't know how RAK units work and what is the button configuration, but for T-Echo there was absolutely no problem nor conflict between autostart and using buttons for other functions. Switch on is one press RST button. Double press RST is DFU mode. Long press other button is shutdown.
Applications? Simple one. Unit can operate autonomously. I am not saying even about solar panels or power banks. Imagine T-Echo unit in remote cabin somehwere in the country, but with AC supply from the main grid. T-Echo can be powered with USB cable permanently and when there will be long power outage (remote locations are prone for that) eventually battery will run out of juice. Once power outage is finished and restored unit could start without anyones attention connecting back to the meshtastic grid.
I am not coder, so don't know how to fix that or revert back apart from going back to 2.5.4 FW which is last good one I know, but that means loosing new stuff and fixes from new FWs. If it is possible, I would like to have this feature back for T-Echo units.
Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Heltec T114 does not resume to application after forced shutdown
5 participants