rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-19 17:22:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'root/master'

Browse Source 
# Conflicts:
#	src/main.cpp
#	src/screen.cpp
#	src/screen.h
This commit is contained in:
geeksville
2020-03-18 18:44:12 -07:00
parent c8b95f7691 6bc8e1b10a
commit 534691f0c2
9 changed files with 394 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MeshService.cpp
View File

@@ -2,12 +2,12 @@
#include <Arduino.h>
#include <assert.h>
#include "main.h"
#include "mesh-pb-constants.h"
#include "MeshService.h"
#include "MeshBluetoothService.h"
#include "NodeDB.h"
#include "GPS.h"
#include "screen.h"
#include "Periodic.h"
#include "PowerFSM.h"
@@ -118,7 +118,7 @@ MeshPacket *MeshService::handleFromRadioUser(MeshPacket *mp)
sendOurOwner(mp->from);
String lcd = String("Joined: ") + mp->payload.variant.user.long_name + "\n";
screen_print(lcd.c_str());
screen.print(lcd.c_str());
}
return mp;
@@ -362,4 +362,4 @@ void MeshService::onNotify(Observable *o)
{
DEBUG_MSG("got gps notify\n");
onGPSChanged();
}
}