Fixed code for PlatformIO
This commit is contained in:
parent
3d68f483ce
commit
bd7a616e2b
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1,3 @@
|
||||
*.sublime-workspace
|
||||
.pioenvs
|
||||
.piolibdeps
|
@ -10,11 +10,15 @@
|
||||
|
||||
[env:attiny85]
|
||||
platform = atmelavr
|
||||
board = atmega328p
|
||||
board = pro16MHzatmega328
|
||||
framework = arduino
|
||||
upload_protocol = stk500v1
|
||||
upload_flags = -P$UPLOAD_PORT -b$UPLOAD_SPEED
|
||||
board_f_cpu = 1000000L
|
||||
|
||||
lib_deps =
|
||||
Bounce2
|
||||
Encoder
|
||||
|
||||
upload_port = COM7
|
||||
upload_speed = 19200
|
@ -46,7 +46,7 @@ void ScreenCountdown::onEncoder(long lastPosition, long newPosition)
|
||||
|
||||
void ScreenCountdown::onTick()
|
||||
{
|
||||
int elapsed = (getCurrentTime() - ExposureTimerStart) / 1000;
|
||||
long elapsed = (getCurrentTime() - ExposureTimerStart) / 1000;
|
||||
|
||||
if (elapsed >= ExposureTime)
|
||||
{
|
||||
|
@ -26,6 +26,8 @@ class BaseScreen
|
||||
mScreenManager = screenManager;
|
||||
}
|
||||
|
||||
virtual ~BaseScreen() {}
|
||||
|
||||
virtual void onShow() = 0;
|
||||
virtual void onHide() = 0;
|
||||
|
||||
@ -69,7 +71,7 @@ class ScreenManager
|
||||
}
|
||||
|
||||
|
||||
template<class T> void ScreenManager::show()
|
||||
template<class T> void show()
|
||||
{
|
||||
if (mCurrent != NULL)
|
||||
{
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <Arduino.h>
|
||||
#include <Bounce2.h>
|
||||
#include <Encoder.h>
|
||||
#include <LiquidCrystal.h>
|
||||
#include <EEPROM.h>
|
||||
#include "Config.h"
|
||||
#include "ScreenManager.h"
|
||||
#include "ScreenSetTime.h"
|
||||
|
Loading…
Reference in New Issue
Block a user