mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-09 03:17:31 +00:00
some minor cleanups
* Suppress warnings about conflicting library names in platformio.ini by explicitly picking the libraries by id that we want. * fix unused static function warning by making it not static ;) * declare arduino-fsm as dependency for BluetoothOTA. Hopefully this fixes the CI builds? Tested: `pio run` builds.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "Fsm.h"
|
||||
#include <Fsm.h>
|
||||
|
||||
// See sw-design.md for documentation
|
||||
|
||||
@@ -16,4 +16,4 @@
|
||||
|
||||
extern Fsm powerFSM;
|
||||
|
||||
void PowerFSM_setup();
|
||||
void PowerFSM_setup();
|
||||
|
||||
@@ -510,7 +510,7 @@ void Screen::setOn(bool on)
|
||||
}
|
||||
}
|
||||
|
||||
static void screen_print(const char *text, uint8_t x, uint8_t y, uint8_t alignment)
|
||||
void screen_print(const char *text, uint8_t x, uint8_t y, uint8_t alignment)
|
||||
{
|
||||
DEBUG_MSG(text);
|
||||
|
||||
@@ -709,4 +709,4 @@ void Screen::onPress()
|
||||
targetFramerate = TRANSITION_FRAMERATE;
|
||||
ui.setTargetFPS(targetFramerate);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
#include "PeriodicTask.h"
|
||||
|
||||
void screen_print(const char * text);
|
||||
void screen_print(const char * text, uint8_t x, uint8_t y, uint8_t alignment);
|
||||
|
||||
|
||||
// Show the bluetooth PIN screen
|
||||
@@ -36,4 +37,4 @@ public:
|
||||
void onPress();
|
||||
};
|
||||
|
||||
extern Screen screen;
|
||||
extern Screen screen;
|
||||
|
||||
Reference in New Issue
Block a user