Skip to content

Commit

Permalink
Merge branch 'release/v1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
matteocarnelos committed Feb 2, 2022
2 parents 6e2a58d + 41ade6e commit c324eac
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ framework = arduino
lib_deps =
bblanchon/ArduinoJson@^6.18.2
https://github.com/metis-vela-unipd/epdiy.git
metisvela/SailTrack Module@^1.0.0
metisvela/SailTrack Module@^1.1.3
monitor_speed = 115200
build_flags =
-DBOARD_HAS_PSRAM
Expand Down
6 changes: 3 additions & 3 deletions src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#include <Arduino.h>
#include <ArduinoJson.h>
#include "epd_driver.h"
#include "epd_highlevel.h"
#include <epd_driver.h>
#include <epd_highlevel.h>
#include "DSEG14Classic_Regular_100.h"
#include "BebasNeue_Regular_40.h"
#include "SailtrackLogo.h"
#include "MetisLogo.h"
#include "SailtrackModule.h"
#include <SailtrackModule.h>

#define BATTERY_ADC_PIN 36
#define BATTERY_ADC_MULTIPLIER 1.7
Expand Down

0 comments on commit c324eac

Please sign in to comment.