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:
Girts Folkmanis
2020-02-27 21:45:20 -08:00
parent bf26994d4e
commit 0b8d7768fd
5 changed files with 19 additions and 12 deletions

View File

@@ -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();

View File

@@ -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);
}
}
}

View File

@@ -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;