Skip to content

Commit

Permalink
some minor cleanups
Browse files Browse the repository at this point in the history
* 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 ;)
* hopefully fix the broken platformio dependency detection for fsm that
  shows up in the CI builds?

Tested: `pio run` builds.
  • Loading branch information
girtsf committed Feb 28, 2020
1 parent bf26994 commit e5f20db
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
10 changes: 6 additions & 4 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,16 @@ debug_tool = jlink

debug_init_break = tbreak setup

; Note: some libraries are specified by #ID where there are conflicting library
; names.
lib_deps =
https://github.com/geeksville/RadioHead.git
TinyGPSPlus
1655 ; TinyGPSPlus
https://github.com/geeksville/esp8266-oled-ssd1306.git ; ESP8266_SSD1306
AXP202X_Library
SPI
OneButton
CRC32 ; explicitly needed because dependency is missing in the ble ota update lib
1260 ; OneButton
1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib
Wire ; explicitly needed here because the AXP202 library forgets to add it
https://github.com/geeksville/arduino-fsm.git

Expand All @@ -71,4 +73,4 @@ lib_deps =

;[env:heltec]
;build_type = debug ; to make it possible to step through our jtag debugger
;board = heltec_wifi_lora_32_V2
;board = heltec_wifi_lora_32_V2
4 changes: 2 additions & 2 deletions src/PowerFSM.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "Fsm.h"
#include <Fsm.h>

// See sw-design.md for documentation

Expand All @@ -16,4 +16,4 @@

extern Fsm powerFSM;

void PowerFSM_setup();
void PowerFSM_setup();
4 changes: 2 additions & 2 deletions src/screen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -709,4 +709,4 @@ void Screen::onPress()
targetFramerate = TRANSITION_FRAMERATE;
ui.setTargetFPS(targetFramerate);
}
}
}
3 changes: 2 additions & 1 deletion src/screen.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -36,4 +37,4 @@ class Screen : public PeriodicTask
void onPress();
};

extern Screen screen;
extern Screen screen;

0 comments on commit e5f20db

Please sign in to comment.