Electronics
/
UVControl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed code for PlatformIO

This commit is contained in:
Mark van Renswoude 2017-11-27 15:51:32 +01:00
parent 3d68f483ce
commit bd7a616e2b
5 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1,3 @@
*.sublime-workspace *.sublime-workspace
.pioenvs
.piolibdeps

6
platformio.ini
View File

@ -10,11 +10,15 @@
[env:attiny85] [env:attiny85]
platform = atmelavr platform = atmelavr
board = atmega328p board = pro16MHzatmega328
framework = arduino framework = arduino
upload_protocol = stk500v1 upload_protocol = stk500v1
upload_flags = -P$UPLOAD_PORT -b$UPLOAD_SPEED upload_flags = -P$UPLOAD_PORT -b$UPLOAD_SPEED
board_f_cpu = 1000000L board_f_cpu = 1000000L
lib_deps =
Bounce2
Encoder
upload_port = COM7 upload_port = COM7
upload_speed = 19200 upload_speed = 19200

2
src/ScreenCountdown.cpp
View File

@ -46,7 +46,7 @@ void ScreenCountdown::onEncoder(long lastPosition, long newPosition)
void ScreenCountdown::onTick() void ScreenCountdown::onTick()
{ {
int elapsed = (getCurrentTime() - ExposureTimerStart) / 1000; long elapsed = (getCurrentTime() - ExposureTimerStart) / 1000;
if (elapsed >= ExposureTime) if (elapsed >= ExposureTime)
{ {

4
src/ScreenManager.h
View File

@ -26,6 +26,8 @@ class BaseScreen
mScreenManager = screenManager; mScreenManager = screenManager;
} }
virtual ~BaseScreen() {}
virtual void onShow() = 0; virtual void onShow() = 0;
virtual void onHide() = 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) if (mCurrent != NULL)
{ {

2
src/main.cpp
View File

@ -1,7 +1,7 @@
#include <Arduino.h>
#include <Bounce2.h> #include <Bounce2.h>
#include <Encoder.h> #include <Encoder.h>
#include <LiquidCrystal.h> #include <LiquidCrystal.h>
#include <EEPROM.h>
#include "Config.h" #include "Config.h"
#include "ScreenManager.h" #include "ScreenManager.h"
#include "ScreenSetTime.h" #include "ScreenSetTime.h"