mirror
/
meshtastic-firmware
kopia lustrzana https://github.com/meshtastic/firmware
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #120 from geeksville/master 

fix busted build on heltec style devices (0.6.1)
pull/122/head^2 0.6.1
Kevin Hester 2020-05-01 17:01:52 -07:00 zatwierdzone przez GitHub
rodzic fad496378c 4735b3ff5b
commit 916e62398d
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
4 zmienionych plików z 9 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
bin/build-all.sh
Wyświetl plik

@ -39,6 +39,9 @@ function do_build {
cp $SRCELF $OUTDIR/elfs/firmware-$ENV_NAME-$COUNTRY-$VERSION.elf cp $SRCELF $OUTDIR/elfs/firmware-$ENV_NAME-$COUNTRY-$VERSION.elf
} }
# Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
platformio lib update
for COUNTRY in $COUNTRIES; do for COUNTRY in $COUNTRIES; do
for BOARD in $BOARDS; do for BOARD in $BOARDS; do
do_build $BOARD do_build $BOARD

2
bin/version.sh
Wyświetl plik

@ -1,3 +1,3 @@
export VERSION=0.6.0 export VERSION=0.6.1

11
src/screen.cpp
Wyświetl plik

@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <OLEDDisplay.h> #include <OLEDDisplay.h>
#include <Wire.h>
#include "GPS.h" #include "GPS.h"
#include "NodeDB.h" #include "NodeDB.h"
@ -55,7 +54,6 @@ static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int1
// draw an xbm image. // draw an xbm image.
// Please note that everything that should be transitioned // Please note that everything that should be transitioned
// needs to be drawn relative to x and y // needs to be drawn relative to x and y
display->drawXbm(x + 32, y, icon_width, icon_height, (const uint8_t *)icon_bits); display->drawXbm(x + 32, y, icon_width, icon_height, (const uint8_t *)icon_bits);
display->setFont(ArialMT_Plain_16); display->setFont(ArialMT_Plain_16);
@ -320,11 +318,11 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
uint32_t agoSecs = sinceLastSeen(node); uint32_t agoSecs = sinceLastSeen(node);
static char lastStr[20]; static char lastStr[20];
if (agoSecs < 120) // last 2 mins? if (agoSecs < 120) // last 2 mins?
snprintf(lastStr, sizeof(lastStr), "%lu seconds ago", agoSecs); snprintf(lastStr, sizeof(lastStr), "%u seconds ago", agoSecs);
else if (agoSecs < 120 * 60) // last 2 hrs else if (agoSecs < 120 * 60) // last 2 hrs
snprintf(lastStr, sizeof(lastStr), "%lu minutes ago", agoSecs / 60); snprintf(lastStr, sizeof(lastStr), "%u minutes ago", agoSecs / 60);
else else
snprintf(lastStr, sizeof(lastStr), "%lu hours ago", agoSecs / 60 / 60); snprintf(lastStr, sizeof(lastStr), "%u hours ago", agoSecs / 60 / 60);
static float simRadian; static float simRadian;
simRadian += 0.1; // For testing, have the compass spin unless both simRadian += 0.1; // For testing, have the compass spin unless both
@ -412,6 +410,7 @@ void Screen::handleSetOn(bool on)
if (on) { if (on) {
DEBUG_MSG("Turning on screen\n"); DEBUG_MSG("Turning on screen\n");
dispdev.displayOn(); dispdev.displayOn();
dispdev.displayOn();
} else { } else {
DEBUG_MSG("Turning off screen\n"); DEBUG_MSG("Turning off screen\n");
dispdev.displayOff(); dispdev.displayOff();
@ -594,7 +593,7 @@ void Screen::handleStartBluetoothPinScreen(uint32_t pin)
static FrameCallback btFrames[] = {drawFrameBluetooth}; static FrameCallback btFrames[] = {drawFrameBluetooth};
snprintf(btPIN, sizeof(btPIN), "%06lu", pin); snprintf(btPIN, sizeof(btPIN), "%06u", pin);
ui.disableAllIndicators(); ui.disableAllIndicators();
ui.setFrames(btFrames, 1); ui.setFrames(btFrames, 1);

1
src/sleep.cpp
Wyświetl plik

@ -8,7 +8,6 @@
#include "main.h" #include "main.h"
#include "target_specific.h" #include "target_specific.h"
#include <Wire.h>
#ifndef NO_ESP32 #ifndef NO_ESP32
#include "esp32/pm.h" #include "esp32/pm.h"