small fixes
This commit is contained in:
parent
51865df64f
commit
59d2fe7cdc
10
.vscode/extensions.json
vendored
Normal file
10
.vscode/extensions.json
vendored
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
// See http://go.microsoft.com/fwlink/?LinkId=827846
|
||||||
|
// for the documentation about the extensions.json format
|
||||||
|
"recommendations": [
|
||||||
|
"platformio.platformio-ide"
|
||||||
|
],
|
||||||
|
"unwantedRecommendations": [
|
||||||
|
"ms-vscode.cpptools-extension-pack"
|
||||||
|
]
|
||||||
|
}
|
||||||
39
include/README
Normal file
39
include/README
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
|
||||||
|
This directory is intended for project header files.
|
||||||
|
|
||||||
|
A header file is a file containing C declarations and macro definitions
|
||||||
|
to be shared between several project source files. You request the use of a
|
||||||
|
header file in your project source file (C, C++, etc) located in `src` folder
|
||||||
|
by including it, with the C preprocessing directive `#include'.
|
||||||
|
|
||||||
|
```src/main.c
|
||||||
|
|
||||||
|
#include "header.h"
|
||||||
|
|
||||||
|
int main (void)
|
||||||
|
{
|
||||||
|
...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Including a header file produces the same results as copying the header file
|
||||||
|
into each source file that needs it. Such copying would be time-consuming
|
||||||
|
and error-prone. With a header file, the related declarations appear
|
||||||
|
in only one place. If they need to be changed, they can be changed in one
|
||||||
|
place, and programs that include the header file will automatically use the
|
||||||
|
new version when next recompiled. The header file eliminates the labor of
|
||||||
|
finding and changing all the copies as well as the risk that a failure to
|
||||||
|
find one copy will result in inconsistencies within a program.
|
||||||
|
|
||||||
|
In C, the usual convention is to give header files names that end with `.h'.
|
||||||
|
It is most portable to use only letters, digits, dashes, and underscores in
|
||||||
|
header file names, and at most one dot.
|
||||||
|
|
||||||
|
Read more about using header files in official GCC documentation:
|
||||||
|
|
||||||
|
* Include Syntax
|
||||||
|
* Include Operation
|
||||||
|
* Once-Only Headers
|
||||||
|
* Computed Includes
|
||||||
|
|
||||||
|
https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html
|
||||||
46
lib/README
Normal file
46
lib/README
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
|
||||||
|
This directory is intended for project specific (private) libraries.
|
||||||
|
PlatformIO will compile them to static libraries and link into executable file.
|
||||||
|
|
||||||
|
The source code of each library should be placed in a an own separate directory
|
||||||
|
("lib/your_library_name/[here are source files]").
|
||||||
|
|
||||||
|
For example, see a structure of the following two libraries `Foo` and `Bar`:
|
||||||
|
|
||||||
|
|--lib
|
||||||
|
| |
|
||||||
|
| |--Bar
|
||||||
|
| | |--docs
|
||||||
|
| | |--examples
|
||||||
|
| | |--src
|
||||||
|
| | |- Bar.c
|
||||||
|
| | |- Bar.h
|
||||||
|
| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html
|
||||||
|
| |
|
||||||
|
| |--Foo
|
||||||
|
| | |- Foo.c
|
||||||
|
| | |- Foo.h
|
||||||
|
| |
|
||||||
|
| |- README --> THIS FILE
|
||||||
|
|
|
||||||
|
|- platformio.ini
|
||||||
|
|--src
|
||||||
|
|- main.c
|
||||||
|
|
||||||
|
and a contents of `src/main.c`:
|
||||||
|
```
|
||||||
|
#include <Foo.h>
|
||||||
|
#include <Bar.h>
|
||||||
|
|
||||||
|
int main (void)
|
||||||
|
{
|
||||||
|
...
|
||||||
|
}
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
PlatformIO Library Dependency Finder will find automatically dependent
|
||||||
|
libraries scanning project source files.
|
||||||
|
|
||||||
|
More information about PlatformIO Library Dependency Finder
|
||||||
|
- https://docs.platformio.org/page/librarymanager/ldf.html
|
||||||
@ -13,3 +13,4 @@ platform = atmelavr
|
|||||||
board = uno
|
board = uno
|
||||||
framework = arduino
|
framework = arduino
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
|
lib_deps = arduino-libraries/LiquidCrystal@^1.0.7
|
||||||
59
src/main.cpp
59
src/main.cpp
@ -1,4 +1,4 @@
|
|||||||
//#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
#include <LiquidCrystal.h>
|
#include <LiquidCrystal.h>
|
||||||
#include <EEPROM.h>
|
#include <EEPROM.h>
|
||||||
|
|
||||||
@ -140,6 +140,25 @@ void displayMenuTop(){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void stopAlarm() {
|
||||||
|
alarmState = ALARM_OFF;
|
||||||
|
noTone(BUZZER_PIN);
|
||||||
|
digitalWrite(ALARM_LED_PIN, LOW);
|
||||||
|
}
|
||||||
|
|
||||||
|
void snoozeAlarm() {
|
||||||
|
alarmState = ALARM_SNOOZE;
|
||||||
|
noTone(BUZZER_PIN);
|
||||||
|
alarmStartTime = millis();
|
||||||
|
}
|
||||||
|
|
||||||
|
void saveAlarmSettings() {
|
||||||
|
// Save alarm settings and the alarm set flag to EEPROM
|
||||||
|
EEPROM.write(ALARM_SETTINGS_ADDRESS, alarmHour);
|
||||||
|
EEPROM.write(ALARM_SETTINGS_ADDRESS + 1, alarmMinute);
|
||||||
|
EEPROM.write(ALARM_SET_FLAG_ADDRESS, isAlarmSet);
|
||||||
|
}
|
||||||
|
|
||||||
void displayMenuInfo(){
|
void displayMenuInfo(){
|
||||||
lcd.setCursor(0, 1);
|
lcd.setCursor(0, 1);
|
||||||
char str[16];
|
char str[16];
|
||||||
@ -183,6 +202,7 @@ void handleMenuButton() {
|
|||||||
lcd.clear();
|
lcd.clear();
|
||||||
menuState = MENU_ALARM_TIME;
|
menuState = MENU_ALARM_TIME;
|
||||||
editModeState = EDIT_HOUR;
|
editModeState = EDIT_HOUR;
|
||||||
|
saveAlarmSettings();
|
||||||
editMode = false;
|
editMode = false;
|
||||||
break;
|
break;
|
||||||
case MENU_ALARM_TIME:
|
case MENU_ALARM_TIME:
|
||||||
@ -242,6 +262,7 @@ void handleSetButton() {
|
|||||||
break;
|
break;
|
||||||
case EDIT_MINUTE:
|
case EDIT_MINUTE:
|
||||||
editModeState = EDIT_HOUR;
|
editModeState = EDIT_HOUR;
|
||||||
|
saveAlarmSettings();
|
||||||
editMode = false;
|
editMode = false;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -373,18 +394,6 @@ void checkAlarm() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void stopAlarm() {
|
|
||||||
alarmState = ALARM_OFF;
|
|
||||||
noTone(BUZZER_PIN);
|
|
||||||
digitalWrite(ALARM_LED_PIN, LOW);
|
|
||||||
}
|
|
||||||
|
|
||||||
void snoozeAlarm() {
|
|
||||||
alarmState = ALARM_SNOOZE;
|
|
||||||
noTone(BUZZER_PIN);
|
|
||||||
alarmStartTime = millis();
|
|
||||||
}
|
|
||||||
|
|
||||||
void restoreAlarmSettings() {
|
void restoreAlarmSettings() {
|
||||||
// Read alarm settings from EEPROM and set variables accordingly
|
// Read alarm settings from EEPROM and set variables accordingly
|
||||||
// If no settings are found, use default values
|
// If no settings are found, use default values
|
||||||
@ -392,6 +401,8 @@ void restoreAlarmSettings() {
|
|||||||
byte storedMinute = EEPROM.read(ALARM_SETTINGS_ADDRESS + 1);
|
byte storedMinute = EEPROM.read(ALARM_SETTINGS_ADDRESS + 1);
|
||||||
isAlarmSet = EEPROM.read(ALARM_SET_FLAG_ADDRESS);
|
isAlarmSet = EEPROM.read(ALARM_SET_FLAG_ADDRESS);
|
||||||
|
|
||||||
|
Serial.println(storedHour + ", " + storedMinute);
|
||||||
|
|
||||||
// Check if EEPROM contains valid alarm settings
|
// Check if EEPROM contains valid alarm settings
|
||||||
if (isAlarmSet && storedHour != 255 && storedMinute != 255) {
|
if (isAlarmSet && storedHour != 255 && storedMinute != 255) {
|
||||||
alarmHour = storedHour;
|
alarmHour = storedHour;
|
||||||
@ -404,28 +415,6 @@ void restoreAlarmSettings() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void saveAlarmSettings() {
|
|
||||||
// Save alarm settings and the alarm set flag to EEPROM
|
|
||||||
EEPROM.write(ALARM_SETTINGS_ADDRESS, alarmHour);
|
|
||||||
EEPROM.write(ALARM_SETTINGS_ADDRESS + 1, alarmMinute);
|
|
||||||
EEPROM.write(ALARM_SET_FLAG_ADDRESS, isAlarmSet);
|
|
||||||
}
|
|
||||||
|
|
||||||
void setAlarm() {
|
|
||||||
isAlarmSet = true;
|
|
||||||
|
|
||||||
// Save alarm settings and the alarm set flag to EEPROM when the alarm is set
|
|
||||||
saveAlarmSettings();
|
|
||||||
}
|
|
||||||
|
|
||||||
void clearAlarm() {
|
|
||||||
// Clear the alarm and update the alarm set flag in EEPROM
|
|
||||||
alarmHour = 6;
|
|
||||||
alarmMinute = 0;
|
|
||||||
isAlarmSet = false;
|
|
||||||
saveAlarmSettings();
|
|
||||||
}
|
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
//For debugging
|
//For debugging
|
||||||
Serial.begin(115200);
|
Serial.begin(115200);
|
||||||
|
|||||||
11
test/README
Normal file
11
test/README
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
|
||||||
|
This directory is intended for PlatformIO Test Runner and project tests.
|
||||||
|
|
||||||
|
Unit Testing is a software testing method by which individual units of
|
||||||
|
source code, sets of one or more MCU program modules together with associated
|
||||||
|
control data, usage procedures, and operating procedures, are tested to
|
||||||
|
determine whether they are fit for use. Unit testing finds problems early
|
||||||
|
in the development cycle.
|
||||||
|
|
||||||
|
More information about PlatformIO Unit Testing:
|
||||||
|
- https://docs.platformio.org/en/latest/advanced/unit-testing/index.html
|
||||||
Loading…
x
Reference in New Issue
Block a user