pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-13 16:55:08 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #960 from mc-hamster/StoreAndForward

Browse Source 
Add channel bitrate to myNodeInfo #959 and Update lastlat/lastlong int32 #956
This commit is contained in:
Jm Casler 2021-12-05 17:14:27 -08:00 committed by GitHub
commit 6b184ed448
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/configuration.h
View File

@ -200,7 +200,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Leave undefined to disable our PMU IRQ handler. DO NOT ENABLE THIS because the pmuirq can cause sperious interrupts // Leave undefined to disable our PMU IRQ handler. DO NOT ENABLE THIS because the pmuirq can cause sperious interrupts
// and waking from light sleep // and waking from light sleep
// #define PMU_IRQ 35 // #define PMU_IRQ 35
// #define AXP192_SLAVE_ADDRESS 0x34 #define AXP192_SLAVE_ADDRESS 0x34
#elif defined(TBEAM_V07) #elif defined(TBEAM_V07)
// This string must exactly match the case used in release file names or the android updater won't work // This string must exactly match the case used in release file names or the android updater won't work

7
src/main.cpp
View File

@ -590,6 +590,13 @@ void setup()
else else
router->addInterface(rIf); router->addInterface(rIf);
// Calculate and save the bit rate to myNodeInfo
// TODO: This needs to be added what ever method changes the channel from the phone.
myNodeInfo.bitrate = (float(Constants_DATA_PAYLOAD_LEN) /
(float(rIf->getPacketTime(Constants_DATA_PAYLOAD_LEN)))
) * 1000;
DEBUG_MSG("myNodeInfo.bitrate = %f bytes / sec\n", myNodeInfo.bitrate);
// This must be _after_ service.init because we need our preferences loaded from flash to have proper timeout values // This must be _after_ service.init because we need our preferences loaded from flash to have proper timeout values
PowerFSM_setup(); // we will transition to ON in a couple of seconds, FIXME, only do this for cold boots, not waking from SDS PowerFSM_setup(); // we will transition to ON in a couple of seconds, FIXME, only do this for cold boots, not waking from SDS
powerFSMthread = new PowerFSMThread(); powerFSMthread = new PowerFSMThread();

4
src/plugins/PositionPlugin.h
View File

@ -14,8 +14,8 @@ class PositionPlugin : public ProtobufPlugin<Position>, private concurrency::OST
uint32_t lastGpsSend = 0; uint32_t lastGpsSend = 0;
// Store the latest good lat / long // Store the latest good lat / long
uint32_t lastGpsLatitude = 0; int32_t lastGpsLatitude = 0;
uint32_t lastGpsLongitude = 0; int32_t lastGpsLongitude = 0;
/// We force a rebroadcast if the radio settings change /// We force a rebroadcast if the radio settings change
uint32_t currentGeneration = 0; uint32_t currentGeneration = 0;