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

preliminary Othernet Dreamcatcher Support #4933

Merged
merged 15 commits into from
Oct 8, 2024
Merged

preliminary Othernet Dreamcatcher Support #4933

merged 15 commits into from
Oct 8, 2024

Conversation

caveman99
Copy link
Member

Need to adapt to 2301 final version. Will probably be able to autodetect that.

Need to adapt to 2301 final version
@fifieldt
Copy link
Contributor

fifieldt commented Oct 5, 2024

Saw your posts on https://forums.othernet.is/t/othernet-short-term-and-long-term-status-update/7946 :) Seems sad news for the Othernet project

@caveman99 caveman99 changed the title preliminary Othernet Dreamcatcher 2206 Support preliminary Othernet Dreamcatcher Support Oct 5, 2024
@markbirss
Copy link
Contributor

Awesome effort @caveman99

@caveman99 caveman99 marked this pull request as ready for review October 8, 2024 09:00
@caveman99 caveman99 requested a review from markbirss October 8, 2024 09:04
src/main.cpp Show resolved Hide resolved
Copy link
Contributor

@fifieldt fifieldt left a comment

Choose a reason for hiding this comment

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

Left some minor comments for you

@caveman99
Copy link
Member Author

Just adding a picture of the latest installment, so that people know what we are talking about.

d032d967bca847dd50fe0bb44e51071789297a97

@markbirss
Copy link
Contributor

@caveman99

i went to have a look also, just the product not in stock at the moment and the price is bit high

@markbirss
Copy link
Contributor

I still have the older version looks quite different as it was just sat add-on for Raspberry Pi
image

@caveman99
Copy link
Member Author

@caveman99

i went to have a look also, just the product not in stock at the moment and the price is bit high

I don't think it will come back into stock, these firmware images are for existing devices to be repurposed after the original service is discontinued at the end of 2024.

@caveman99
Copy link
Member Author

I still have the older version looks quite different as it was just sat add-on for Raspberry Pi !

yes, this was a regular sat RX without lora demod. At that stage you needed a satellite dish. They switched to Lora to allow reception with a bare antenna without reflector. The kit you have is a good data receiver, but there has not been coverage for these for years.

@thebentern thebentern merged commit 4f8f96a into master Oct 8, 2024
16 checks passed
@thebentern thebentern deleted the dreamcatcher-5 branch October 8, 2024 12:06
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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Tom Fifield <[email protected]>

---------

Co-authored-by: beegee-tokyo <[email protected]>
Co-authored-by: Bernd Giesecke <[email protected]>
Co-authored-by: Ben Meadors <[email protected]>
Co-authored-by: GUVWAF <[email protected]>
Co-authored-by: GUVWAF <[email protected]>
Co-authored-by: Jonathan Bennett <[email protected]>
Co-authored-by: Tom Fifield <[email protected]>
Co-authored-by: HarukiToreda <[email protected]>
Co-authored-by: jhps <[email protected]>
Co-authored-by: Thomas Göttgens <[email protected]>
Co-authored-by: TheMalkavien <[email protected]>
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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Tom Fifield <[email protected]>

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

---------

Co-authored-by: beegee-tokyo <[email protected]>
Co-authored-by: Bernd Giesecke <[email protected]>
Co-authored-by: Ben Meadors <[email protected]>
Co-authored-by: GUVWAF <[email protected]>
Co-authored-by: GUVWAF <[email protected]>
Co-authored-by: Jonathan Bennett <[email protected]>
Co-authored-by: Tom Fifield <[email protected]>
Co-authored-by: HarukiToreda <[email protected]>
Co-authored-by: jhps <[email protected]>
Co-authored-by: Thomas Göttgens <[email protected]>
Co-authored-by: TheMalkavien <[email protected]>
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.

4 participants