Full color support, rework the directory structure
This commit is contained in:
0
firmware/Application/Screens/DebugScreen.cpp
Normal file
0
firmware/Application/Screens/DebugScreen.cpp
Normal file
89
firmware/Application/Screens/DebugScreen.h
Normal file
89
firmware/Application/Screens/DebugScreen.h
Normal file
@@ -0,0 +1,89 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Max Regan
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "Bsp/macros.h"
|
||||
|
||||
#include "Application/SystemFonts.h"
|
||||
#include "Application/ScreenManager.h"
|
||||
#include "Application/Screens/Screen.h"
|
||||
|
||||
class DebugScreen : public Screen {
|
||||
public:
|
||||
|
||||
static constexpr std::size_t MAX_ITEMS = 10;
|
||||
|
||||
DebugScreen(BSP::DisplayDriver &display,
|
||||
ScreenManager &manager)
|
||||
: m_driver(display)
|
||||
, m_manager(manager)
|
||||
{}
|
||||
|
||||
Common::ReturnCode init() {
|
||||
return Common::ReturnCode::OK;
|
||||
}
|
||||
|
||||
void render() {
|
||||
const struct font &font = default_font;
|
||||
char buffer[32] = {0};
|
||||
|
||||
m_driver.clear();
|
||||
|
||||
uint32_t x = 0;
|
||||
uint32_t y = 0;
|
||||
// snprintf(buffer, sizeof(buffer), "Wakeups");
|
||||
m_driver.string_at(&x, y, buffer, &font);
|
||||
y += font.height;
|
||||
|
||||
m_driver.refresh();
|
||||
}
|
||||
|
||||
Common::Schedule::NextTime execute() override {
|
||||
render();
|
||||
return Common::Schedule::NextTime::never();
|
||||
}
|
||||
|
||||
void enable() override {
|
||||
render();
|
||||
}
|
||||
|
||||
void disable() override {
|
||||
m_driver.clear();
|
||||
}
|
||||
|
||||
void notify_up_button() override {
|
||||
}
|
||||
|
||||
void notify_middle_button() override {
|
||||
m_manager.pop_screen();
|
||||
}
|
||||
|
||||
void notify_down_button() override {
|
||||
m_manager.pop_screen();
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
BSP::DisplayDriver &m_driver;
|
||||
ScreenManager &m_manager;
|
||||
};
|
||||
129
firmware/Application/Screens/DisplayTimeScreen.cpp
Normal file
129
firmware/Application/Screens/DisplayTimeScreen.cpp
Normal file
@@ -0,0 +1,129 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Max Regan
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "Application/Screens/DisplayTimeScreen.h"
|
||||
#include "Application/SystemFonts.h"
|
||||
#include "Bsp/Drivers/RtcDriver.h"
|
||||
#include "Bsp/SystemTime.h"
|
||||
#include "Bsp/Drivers/LowPower.h"
|
||||
|
||||
using Common::ReturnCode;
|
||||
using Common::Time;
|
||||
using Common::Schedule::NextTime;
|
||||
using Color = BSP::DisplayDriver::Color;
|
||||
|
||||
DisplayTimeScreen::DisplayTimeScreen(BSP::DisplayDriver &driver,
|
||||
ScreenManager &manager,
|
||||
Screen &menu_screen)
|
||||
: m_driver(driver)
|
||||
, m_last_time()
|
||||
, m_manager(manager)
|
||||
, m_menu_screen(menu_screen)
|
||||
, m_display_seconds(true)
|
||||
{}
|
||||
|
||||
static char get_char_for_digit(uint8_t bcd_digit)
|
||||
{
|
||||
if (bcd_digit > 9) {
|
||||
return '0';
|
||||
}
|
||||
return bcd_digit + '0';
|
||||
}
|
||||
|
||||
ReturnCode DisplayTimeScreen::init()
|
||||
{
|
||||
SET(RCC->CFGR, RCC_CFGR_SW_HSI);
|
||||
|
||||
return ReturnCode::OK;
|
||||
}
|
||||
|
||||
void DisplayTimeScreen::display_number(uint32_t *x, uint32_t y, uint32_t tens, uint32_t ones, const struct font &f)
|
||||
{
|
||||
char time_str[3] = { 0 };
|
||||
|
||||
time_str[0] = get_char_for_digit(tens);
|
||||
time_str[1] = get_char_for_digit(ones);
|
||||
time_str[2] = '\0';
|
||||
|
||||
m_driver.string_at(x, y, time_str, &f, Color::WHITE);
|
||||
}
|
||||
|
||||
void DisplayTimeScreen::display_time()
|
||||
{
|
||||
Common::WallClockTime time;
|
||||
BSP::RtcDriver::get_time(time);
|
||||
const struct font &font = font_large_digits;
|
||||
const uint32_t y_space = (m_driver.get_height() - (2 * font.height)) / 3;
|
||||
const uint32_t x_space = (m_driver.get_width() - (2 * font.width)) / 2;
|
||||
|
||||
uint32_t x = 0;
|
||||
|
||||
m_driver.clear(Color::BLACK);
|
||||
|
||||
x = x_space;
|
||||
display_number(&x, y_space,
|
||||
time.get_hours_12_tens(), time.get_hours_12_ones(), font);
|
||||
|
||||
x = x_space;
|
||||
display_number(&x, y_space * 2 + font.height,
|
||||
time.get_minutes_tens(), time.get_minutes_ones(), font);
|
||||
|
||||
m_last_time = time;
|
||||
m_driver.refresh();
|
||||
}
|
||||
|
||||
NextTime DisplayTimeScreen::execute()
|
||||
{
|
||||
display_time();
|
||||
|
||||
Common::time_t now;
|
||||
BSP::SystemTimer::get_time(now);
|
||||
if (m_display_seconds) {
|
||||
return NextTime::in(Time::seconds(1));
|
||||
} else {
|
||||
|
||||
Common::WallClockTime wall_time;
|
||||
BSP::RtcDriver::get_time(wall_time);
|
||||
return NextTime::in(Time::seconds(61 - wall_time.get_seconds()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void DisplayTimeScreen::enable() {
|
||||
m_last_time = {};
|
||||
display_time();
|
||||
}
|
||||
|
||||
void DisplayTimeScreen::disable() {
|
||||
}
|
||||
|
||||
void DisplayTimeScreen::notify_up_button() {
|
||||
/* TODO: This should open a menu first */
|
||||
m_manager.push_screen(m_menu_screen);
|
||||
}
|
||||
|
||||
void DisplayTimeScreen::notify_middle_button() {
|
||||
|
||||
}
|
||||
|
||||
void DisplayTimeScreen::notify_down_button() {
|
||||
|
||||
}
|
||||
58
firmware/Application/Screens/DisplayTimeScreen.h
Normal file
58
firmware/Application/Screens/DisplayTimeScreen.h
Normal file
@@ -0,0 +1,58 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Max Regan
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "Bsp/macros.h"
|
||||
|
||||
#include "Application/ScreenManager.h"
|
||||
#include "Application/Screens/Screen.h"
|
||||
|
||||
class DisplayTimeScreen : public Screen {
|
||||
public:
|
||||
|
||||
DisplayTimeScreen(BSP::DisplayDriver &display,
|
||||
ScreenManager &m_manager,
|
||||
Screen &m_menu_screen);
|
||||
|
||||
Common::ReturnCode init();
|
||||
Common::Schedule::NextTime execute() override;
|
||||
|
||||
void enable() override;
|
||||
void disable() override;
|
||||
|
||||
void notify_up_button() override;
|
||||
void notify_middle_button() override;
|
||||
void notify_down_button() override;
|
||||
|
||||
private:
|
||||
|
||||
void display_time();
|
||||
void display_number(uint32_t *x, uint32_t y, uint32_t tens, uint32_t ones, const font &f);
|
||||
|
||||
BSP::DisplayDriver &m_driver;
|
||||
Common::WallClockTime m_last_time;
|
||||
|
||||
ScreenManager &m_manager;
|
||||
Screen &m_menu_screen;
|
||||
|
||||
const bool m_display_seconds;
|
||||
};
|
||||
184
firmware/Application/Screens/MenuScreen.h
Normal file
184
firmware/Application/Screens/MenuScreen.h
Normal file
@@ -0,0 +1,184 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Max Regan
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
|
||||
#include <initializer_list>
|
||||
|
||||
#include "Bsp/macros.h"
|
||||
|
||||
#include "Application/SystemFonts.h"
|
||||
#include "Application/ScreenManager.h"
|
||||
#include "Application/Screens/Screen.h"
|
||||
|
||||
struct MenuScreenItem {
|
||||
|
||||
enum class Type {
|
||||
NONE,
|
||||
SCREEN,
|
||||
FUNCTION,
|
||||
BACK,
|
||||
};
|
||||
|
||||
MenuScreenItem()
|
||||
: m_text(nullptr)
|
||||
, m_type(Type::NONE)
|
||||
{}
|
||||
|
||||
MenuScreenItem(const char *item, Screen &m_screen)
|
||||
: m_text(item)
|
||||
, m_screen(&m_screen)
|
||||
, m_type(Type::SCREEN)
|
||||
{}
|
||||
|
||||
MenuScreenItem(const char *item, void (*function)())
|
||||
: m_text(item)
|
||||
, m_function(function)
|
||||
, m_type(Type::FUNCTION)
|
||||
{}
|
||||
|
||||
MenuScreenItem(const char *item)
|
||||
: m_text(item)
|
||||
, m_type(Type::BACK)
|
||||
{}
|
||||
|
||||
const char *m_text;
|
||||
union {
|
||||
Screen *m_screen;
|
||||
void (* m_function)();
|
||||
};
|
||||
Type m_type;
|
||||
};
|
||||
|
||||
class MenuScreen : public Screen {
|
||||
public:
|
||||
|
||||
static constexpr std::size_t MAX_ITEMS = 5;
|
||||
|
||||
MenuScreen(BSP::DisplayDriver &display,
|
||||
ScreenManager &manager,
|
||||
const char *title,
|
||||
std::initializer_list<MenuScreenItem> items)
|
||||
: m_driver(display)
|
||||
, m_manager(manager)
|
||||
, m_title(title)
|
||||
, m_items()
|
||||
, m_num_items{0}
|
||||
, m_selected{0}
|
||||
{
|
||||
for (auto &item : items) {
|
||||
m_items[m_num_items++] = item;
|
||||
|
||||
// Leave room for "back"
|
||||
if (m_num_items == MAX_ITEMS - 1) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
new (&m_items[m_num_items++]) MenuScreenItem("Back");
|
||||
}
|
||||
|
||||
void render() {
|
||||
const struct font &font = default_font;
|
||||
|
||||
//m_driver.clear();
|
||||
|
||||
uint32_t x = 0;
|
||||
uint32_t y = 0;
|
||||
m_driver.string_at(&x, y, m_title, &font);
|
||||
y += font.height + 1;
|
||||
|
||||
m_driver.draw_hline(0, y++, m_driver.get_width());
|
||||
m_driver.draw_hline(0, y++, m_driver.get_width());
|
||||
|
||||
|
||||
for (std::size_t i = 0; i < m_num_items; i++) {
|
||||
const char *spacer = " ";
|
||||
if (i == m_selected) {
|
||||
spacer = ">";
|
||||
}
|
||||
x = 0;
|
||||
m_driver.string_at(&x, y, spacer, &font);
|
||||
m_driver.string_at(&x, y, m_items[i].m_text, &font);
|
||||
y += font.height;
|
||||
}
|
||||
m_driver.refresh();
|
||||
}
|
||||
|
||||
Common::ReturnCode init() {
|
||||
return Common::ReturnCode::OK;
|
||||
}
|
||||
|
||||
Common::Schedule::NextTime execute() override {
|
||||
return Common::Schedule::NextTime::never();
|
||||
}
|
||||
|
||||
void enable() override {
|
||||
m_selected = 0;
|
||||
m_driver.clear();
|
||||
render();
|
||||
}
|
||||
|
||||
void disable() override {
|
||||
}
|
||||
|
||||
void notify_up_button() override {
|
||||
if (m_selected == 0) {
|
||||
m_selected = m_num_items - 1;
|
||||
} else {
|
||||
m_selected--;
|
||||
}
|
||||
|
||||
render();
|
||||
}
|
||||
|
||||
void notify_middle_button() override {
|
||||
MenuScreenItem &item = m_items[m_selected];
|
||||
if (item.m_type == MenuScreenItem::Type::SCREEN) {
|
||||
m_manager.push_screen(*item.m_screen);
|
||||
} else if (item.m_type == MenuScreenItem::Type::FUNCTION) {
|
||||
item.m_function();
|
||||
m_manager.pop_screen();
|
||||
} else if (item.m_type == MenuScreenItem::Type::BACK) {
|
||||
m_manager.pop_screen();
|
||||
}
|
||||
}
|
||||
|
||||
void notify_down_button() override {
|
||||
if (m_selected == m_num_items - 1) {
|
||||
m_selected = 0;
|
||||
} else {
|
||||
m_selected++;
|
||||
}
|
||||
|
||||
render();
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
BSP::DisplayDriver &m_driver;
|
||||
ScreenManager &m_manager;
|
||||
const char *m_title;
|
||||
MenuScreenItem m_items[MAX_ITEMS];
|
||||
std::size_t m_num_items;
|
||||
std::size_t m_selected;
|
||||
};
|
||||
36
firmware/Application/Screens/Screen.h
Normal file
36
firmware/Application/Screens/Screen.h
Normal file
@@ -0,0 +1,36 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Max Regan
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "Bsp/ReturnCode.h"
|
||||
#include "Bsp/Task.h"
|
||||
|
||||
class Screen : public Common::Schedule::Task {
|
||||
public:
|
||||
|
||||
virtual void enable() = 0;
|
||||
virtual void disable() = 0;
|
||||
|
||||
virtual void notify_up_button() = 0;
|
||||
virtual void notify_middle_button() = 0;
|
||||
virtual void notify_down_button() = 0;
|
||||
};
|
||||
250
firmware/Application/Screens/SetDateScreen.cpp
Normal file
250
firmware/Application/Screens/SetDateScreen.cpp
Normal file
@@ -0,0 +1,250 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Max Regan
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#include "Application/Screens/SetDateScreen.h"
|
||||
#include "Application/SystemFonts.h"
|
||||
#include "Bsp/SystemTime.h"
|
||||
#include "Bsp/Drivers/RtcDriver.h"
|
||||
|
||||
using Common::ReturnCode;
|
||||
using Common::Time;
|
||||
using Common::Schedule::NextTime;
|
||||
|
||||
SetDateScreen::SetDateScreen(BSP::DisplayDriver &display,
|
||||
ScreenManager &manager)
|
||||
: m_display(display)
|
||||
, m_manager(manager)
|
||||
, m_state(SetState::HOURS)
|
||||
, m_is_acked(false)
|
||||
, m_time()
|
||||
, m_font(default_font)
|
||||
, m_row_spacing((m_display.get_height() - m_font.height * 2) / 3)
|
||||
, m_row_0_y(m_row_spacing)
|
||||
, m_row_1_y(m_row_0_y + m_font.height + m_row_spacing + m_font.height)
|
||||
{}
|
||||
|
||||
ReturnCode SetDateScreen::init()
|
||||
{
|
||||
return ReturnCode::OK;
|
||||
}
|
||||
|
||||
NextTime SetDateScreen::execute()
|
||||
{
|
||||
//TODO: Fix this so it doesn't constantly refresh
|
||||
refresh();
|
||||
|
||||
return NextTime::never();
|
||||
}
|
||||
|
||||
static char get_char_for_digit(uint8_t bcd_digit)
|
||||
{
|
||||
if (bcd_digit > 9) {
|
||||
return '0';
|
||||
}
|
||||
return bcd_digit + '0';
|
||||
}
|
||||
|
||||
void SetDateScreen::display_number(uint32_t *x, uint32_t y,
|
||||
uint32_t tens, uint32_t ones)
|
||||
{
|
||||
char time_str[3] = { 0 };
|
||||
time_str[0] = get_char_for_digit(tens);
|
||||
time_str[1] = get_char_for_digit(ones);
|
||||
time_str[2] = '\0';
|
||||
|
||||
|
||||
m_display.string_at(x, y, time_str, &m_font);
|
||||
}
|
||||
|
||||
const char *SetDateScreen::get_acknak_string()
|
||||
{
|
||||
if (!m_is_acked) {
|
||||
return "Cancel";
|
||||
} else {
|
||||
return "OK";
|
||||
}
|
||||
}
|
||||
|
||||
uint32_t SetDateScreen::get_acknak_string_len()
|
||||
{
|
||||
std::size_t len = strlen(get_acknak_string());
|
||||
return len * m_font.width - 1;
|
||||
}
|
||||
|
||||
uint32_t SetDateScreen::get_acknak_string_x_pos()
|
||||
{
|
||||
std::size_t len = strlen(get_acknak_string());
|
||||
return m_display.get_width() - len * m_font.width - 1;
|
||||
}
|
||||
|
||||
void SetDateScreen::render_time()
|
||||
{
|
||||
uint32_t x = 0;
|
||||
uint32_t y = m_row_spacing;
|
||||
|
||||
display_number(&x, y,
|
||||
m_time.get_hours_12_tens(), m_time.get_hours_12_ones());
|
||||
|
||||
m_display.string_at(&x, y, ":", &m_font);
|
||||
|
||||
display_number(&x, y,
|
||||
m_time.get_minutes_tens(), m_time.get_minutes_ones());
|
||||
|
||||
m_display.string_at(&x, y, ":", &m_font);
|
||||
|
||||
display_number(&x, y,
|
||||
m_time.get_seconds_tens(), m_time.get_seconds_ones());
|
||||
|
||||
y = m_row_1_y;
|
||||
x = 0;
|
||||
m_display.string_at(&x, y, m_time.get_is_pm() ? "PM" : "AM", &m_font);
|
||||
|
||||
x = get_acknak_string_x_pos();
|
||||
m_display.string_at(&x, y, get_acknak_string(), &m_font);
|
||||
|
||||
m_display.refresh();
|
||||
}
|
||||
|
||||
void SetDateScreen::draw_line(uint32_t x, uint32_t y, uint32_t width)
|
||||
{
|
||||
m_display.draw_hline(x, y, width);
|
||||
m_display.draw_hline(x, y + 1, width);
|
||||
}
|
||||
|
||||
void SetDateScreen::render_selection()
|
||||
{
|
||||
switch (m_state) {
|
||||
case SetState::HOURS:
|
||||
draw_line(0, m_row_0_y + m_font.height, m_font.width * 2);
|
||||
break;
|
||||
case SetState::MINUTES:
|
||||
draw_line(m_font.width * 3, m_row_0_y + m_font.height, m_font.width * 2);
|
||||
break;
|
||||
case SetState::SECONDS:
|
||||
draw_line(m_font.width * 6, m_row_0_y + m_font.height, m_font.width * 2);
|
||||
break;
|
||||
case SetState::AM_PM:
|
||||
draw_line(0, m_row_1_y + m_font.height, m_font.width * 2);
|
||||
break;
|
||||
case SetState::ACK_NACK:
|
||||
draw_line(get_acknak_string_x_pos(), m_row_1_y + m_font.height, get_acknak_string_len());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void SetDateScreen::refresh()
|
||||
{
|
||||
m_display.clear();
|
||||
|
||||
render_time();
|
||||
render_selection();
|
||||
|
||||
m_display.refresh();
|
||||
}
|
||||
|
||||
void SetDateScreen::enable()
|
||||
{
|
||||
BSP::RtcDriver::get_time(m_time);
|
||||
m_state = SetState::HOURS;
|
||||
m_is_acked = true;
|
||||
|
||||
refresh();
|
||||
}
|
||||
|
||||
void SetDateScreen::disable()
|
||||
{
|
||||
m_display.clear();
|
||||
}
|
||||
|
||||
void SetDateScreen::notify_up_button()
|
||||
{
|
||||
|
||||
switch (m_state) {
|
||||
case SetState::HOURS:
|
||||
m_time.increment_hours();
|
||||
break;
|
||||
case SetState::MINUTES:
|
||||
m_time.increment_minutes();
|
||||
break;
|
||||
case SetState::SECONDS:
|
||||
m_time.increment_seconds();
|
||||
break;
|
||||
case SetState::AM_PM:
|
||||
m_time.toggle_am_pm();
|
||||
break;
|
||||
case SetState::ACK_NACK:
|
||||
m_is_acked = !m_is_acked;
|
||||
break;
|
||||
}
|
||||
|
||||
refresh();
|
||||
}
|
||||
|
||||
void SetDateScreen::notify_middle_button()
|
||||
{
|
||||
switch (m_state) {
|
||||
case SetState::HOURS:
|
||||
m_state = SetState::MINUTES;
|
||||
break;
|
||||
case SetState::MINUTES:
|
||||
m_state = SetState::SECONDS;
|
||||
break;
|
||||
case SetState::SECONDS:
|
||||
m_state = SetState::AM_PM;
|
||||
break;
|
||||
case SetState::AM_PM:
|
||||
m_state = SetState::ACK_NACK;
|
||||
break;
|
||||
case SetState::ACK_NACK:
|
||||
if (m_is_acked) {
|
||||
BSP::RtcDriver::set_time(m_time);
|
||||
}
|
||||
m_manager.pop_screen();
|
||||
return;
|
||||
}
|
||||
|
||||
refresh();
|
||||
}
|
||||
|
||||
void SetDateScreen::notify_down_button()
|
||||
{
|
||||
switch(m_state) {
|
||||
case SetState::HOURS:
|
||||
m_time.decrement_hours();
|
||||
break;
|
||||
case SetState::MINUTES:
|
||||
m_time.decrement_minutes();
|
||||
break;
|
||||
case SetState::SECONDS:
|
||||
m_time.decrement_seconds();
|
||||
break;
|
||||
case SetState::AM_PM:
|
||||
m_time.toggle_am_pm();
|
||||
break;
|
||||
case SetState::ACK_NACK:
|
||||
m_is_acked = !m_is_acked;
|
||||
break;
|
||||
}
|
||||
|
||||
refresh();
|
||||
}
|
||||
78
firmware/Application/Screens/SetDateScreen.h
Normal file
78
firmware/Application/Screens/SetDateScreen.h
Normal file
@@ -0,0 +1,78 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Max Regan
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "Bsp/macros.h"
|
||||
|
||||
#include "Application/ScreenManager.h"
|
||||
#include "Bsp/Drivers/DisplayDriver.h"
|
||||
#include "Bsp/ReturnCode.h"
|
||||
#include "Bsp/Task.h"
|
||||
#include "Bsp/Time.h"
|
||||
#include "Bsp/font.h"
|
||||
|
||||
class SetDateScreen : public Screen {
|
||||
public:
|
||||
|
||||
SetDateScreen(BSP::DisplayDriver &display,
|
||||
ScreenManager &m_manager);
|
||||
|
||||
Common::ReturnCode init();
|
||||
Common::Schedule::NextTime execute() override;
|
||||
|
||||
void enable() override;
|
||||
void disable() override;
|
||||
void notify_up_button() override;
|
||||
void notify_middle_button() override;
|
||||
void notify_down_button() override;
|
||||
|
||||
private:
|
||||
|
||||
void refresh();
|
||||
void render_time();
|
||||
void render_selection();
|
||||
void display_number(uint32_t *x, uint32_t y, uint32_t tens, uint32_t ones);
|
||||
void draw_line(uint32_t x, uint32_t y, uint32_t width);
|
||||
uint32_t get_acknak_string_x_pos();
|
||||
uint32_t get_acknak_string_len();
|
||||
const char *get_acknak_string();
|
||||
|
||||
|
||||
enum class SetState {
|
||||
HOURS,
|
||||
MINUTES,
|
||||
SECONDS,
|
||||
AM_PM,
|
||||
ACK_NACK
|
||||
};
|
||||
|
||||
BSP::DisplayDriver &m_display;
|
||||
ScreenManager &m_manager;
|
||||
|
||||
SetState m_state;
|
||||
bool m_is_acked = false;
|
||||
Common::WallClockTime m_time;
|
||||
const struct font &m_font;
|
||||
const uint32_t m_row_spacing;
|
||||
const uint32_t m_row_0_y;
|
||||
const uint32_t m_row_1_y;
|
||||
};
|
||||
253
firmware/Application/Screens/SetTimeScreen.cpp
Normal file
253
firmware/Application/Screens/SetTimeScreen.cpp
Normal file
@@ -0,0 +1,253 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Max Regan
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#include "Application/Screens/SetTimeScreen.h"
|
||||
#include "Application/SystemFonts.h"
|
||||
#include "Bsp/SystemTime.h"
|
||||
#include "Bsp/Drivers/RtcDriver.h"
|
||||
|
||||
using Common::ReturnCode;
|
||||
using Common::Time;
|
||||
using Common::Schedule::NextTime;
|
||||
|
||||
SetTimeScreen::SetTimeScreen(BSP::DisplayDriver &display,
|
||||
ScreenManager &manager)
|
||||
: m_display(display)
|
||||
, m_manager(manager)
|
||||
, m_state(SetState::HOURS)
|
||||
, m_is_acked(false)
|
||||
, m_time()
|
||||
, m_font(default_font)
|
||||
, m_row_spacing((m_display.get_height() - m_font.height * 2) / 3)
|
||||
, m_row_0_y(m_row_spacing)
|
||||
, m_row_1_y(m_row_0_y + m_font.height + m_row_spacing + m_font.height)
|
||||
{}
|
||||
|
||||
ReturnCode SetTimeScreen::init()
|
||||
{
|
||||
return ReturnCode::OK;
|
||||
}
|
||||
|
||||
NextTime SetTimeScreen::execute()
|
||||
{
|
||||
//TODO: Fix this so it doesn't constantly refresh
|
||||
refresh();
|
||||
|
||||
return NextTime::never();
|
||||
}
|
||||
|
||||
static char get_char_for_digit(uint8_t bcd_digit)
|
||||
{
|
||||
if (bcd_digit > 9) {
|
||||
return '0';
|
||||
}
|
||||
return bcd_digit + '0';
|
||||
}
|
||||
|
||||
void SetTimeScreen::display_number(uint32_t *x, uint32_t y,
|
||||
uint32_t tens, uint32_t ones)
|
||||
{
|
||||
char time_str[3] = { 0 };
|
||||
time_str[0] = get_char_for_digit(tens);
|
||||
time_str[1] = get_char_for_digit(ones);
|
||||
time_str[2] = '\0';
|
||||
|
||||
|
||||
m_display.string_at(x, y, time_str, &m_font);
|
||||
}
|
||||
|
||||
const char *SetTimeScreen::get_acknak_string()
|
||||
{
|
||||
if (!m_is_acked) {
|
||||
return "Cancel";
|
||||
} else {
|
||||
return "OK";
|
||||
}
|
||||
}
|
||||
|
||||
uint32_t SetTimeScreen::get_acknak_string_len()
|
||||
{
|
||||
std::size_t len = strlen(get_acknak_string());
|
||||
return len * m_font.width - 1;
|
||||
}
|
||||
|
||||
uint32_t SetTimeScreen::get_acknak_string_x_pos()
|
||||
{
|
||||
std::size_t len = strlen(get_acknak_string());
|
||||
return m_display.get_width() - len * m_font.width - 1;
|
||||
}
|
||||
|
||||
void SetTimeScreen::render_time()
|
||||
{
|
||||
uint32_t width = m_display.get_width();
|
||||
uint32_t x = (width - m_font.width * 8) / 2;
|
||||
uint32_t y = m_row_spacing;
|
||||
|
||||
display_number(&x, y,
|
||||
m_time.get_hours_12_tens(), m_time.get_hours_12_ones());
|
||||
|
||||
m_display.string_at(&x, y, ":", &m_font);
|
||||
|
||||
display_number(&x, y,
|
||||
m_time.get_minutes_tens(), m_time.get_minutes_ones());
|
||||
|
||||
m_display.string_at(&x, y, ":", &m_font);
|
||||
|
||||
display_number(&x, y,
|
||||
m_time.get_seconds_tens(), m_time.get_seconds_ones());
|
||||
|
||||
y = m_row_1_y;
|
||||
x = 0;
|
||||
m_display.string_at(&x, y, m_time.get_is_pm() ? "PM" : "AM", &m_font);
|
||||
|
||||
x = get_acknak_string_x_pos();
|
||||
m_display.string_at(&x, y, get_acknak_string(), &m_font);
|
||||
|
||||
m_display.refresh();
|
||||
}
|
||||
|
||||
void SetTimeScreen::draw_line(uint32_t x, uint32_t y, uint32_t width)
|
||||
{
|
||||
m_display.draw_hline(x, y, width);
|
||||
m_display.draw_hline(x, y + 1, width);
|
||||
}
|
||||
|
||||
void SetTimeScreen::render_selection()
|
||||
{
|
||||
uint32_t time_offset = (m_display.get_width()- m_font.width * 8) / 2;
|
||||
|
||||
switch (m_state) {
|
||||
case SetState::HOURS:
|
||||
draw_line(time_offset, m_row_0_y + m_font.height, m_font.width * 2);
|
||||
break;
|
||||
case SetState::MINUTES:
|
||||
draw_line(time_offset + m_font.width * 3, m_row_0_y + m_font.height, m_font.width * 2);
|
||||
break;
|
||||
case SetState::SECONDS:
|
||||
draw_line(time_offset + m_font.width * 6, m_row_0_y + m_font.height, m_font.width * 2);
|
||||
break;
|
||||
case SetState::AM_PM:
|
||||
draw_line(0, m_row_1_y + m_font.height, m_font.width * 2);
|
||||
break;
|
||||
case SetState::ACK_NACK:
|
||||
draw_line(get_acknak_string_x_pos(), m_row_1_y + m_font.height, get_acknak_string_len());
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void SetTimeScreen::refresh()
|
||||
{
|
||||
m_display.clear();
|
||||
|
||||
render_time();
|
||||
render_selection();
|
||||
|
||||
m_display.refresh();
|
||||
}
|
||||
|
||||
void SetTimeScreen::enable()
|
||||
{
|
||||
BSP::RtcDriver::get_time(m_time);
|
||||
m_state = SetState::HOURS;
|
||||
m_is_acked = true;
|
||||
|
||||
refresh();
|
||||
}
|
||||
|
||||
void SetTimeScreen::disable()
|
||||
{
|
||||
m_display.clear();
|
||||
}
|
||||
|
||||
void SetTimeScreen::notify_up_button()
|
||||
{
|
||||
|
||||
switch (m_state) {
|
||||
case SetState::HOURS:
|
||||
m_time.increment_hours();
|
||||
break;
|
||||
case SetState::MINUTES:
|
||||
m_time.increment_minutes();
|
||||
break;
|
||||
case SetState::SECONDS:
|
||||
m_time.increment_seconds();
|
||||
break;
|
||||
case SetState::AM_PM:
|
||||
m_time.toggle_am_pm();
|
||||
break;
|
||||
case SetState::ACK_NACK:
|
||||
m_is_acked = !m_is_acked;
|
||||
break;
|
||||
}
|
||||
|
||||
refresh();
|
||||
}
|
||||
|
||||
void SetTimeScreen::notify_middle_button()
|
||||
{
|
||||
switch (m_state) {
|
||||
case SetState::HOURS:
|
||||
m_state = SetState::MINUTES;
|
||||
break;
|
||||
case SetState::MINUTES:
|
||||
m_state = SetState::SECONDS;
|
||||
break;
|
||||
case SetState::SECONDS:
|
||||
m_state = SetState::AM_PM;
|
||||
break;
|
||||
case SetState::AM_PM:
|
||||
m_state = SetState::ACK_NACK;
|
||||
break;
|
||||
case SetState::ACK_NACK:
|
||||
if (m_is_acked) {
|
||||
BSP::RtcDriver::set_time(m_time);
|
||||
}
|
||||
m_manager.pop_screen();
|
||||
return;
|
||||
}
|
||||
|
||||
refresh();
|
||||
}
|
||||
|
||||
void SetTimeScreen::notify_down_button()
|
||||
{
|
||||
switch(m_state) {
|
||||
case SetState::HOURS:
|
||||
m_time.decrement_hours();
|
||||
break;
|
||||
case SetState::MINUTES:
|
||||
m_time.decrement_minutes();
|
||||
break;
|
||||
case SetState::SECONDS:
|
||||
m_time.decrement_seconds();
|
||||
break;
|
||||
case SetState::AM_PM:
|
||||
m_time.toggle_am_pm();
|
||||
break;
|
||||
case SetState::ACK_NACK:
|
||||
m_is_acked = !m_is_acked;
|
||||
break;
|
||||
}
|
||||
|
||||
refresh();
|
||||
}
|
||||
78
firmware/Application/Screens/SetTimeScreen.h
Normal file
78
firmware/Application/Screens/SetTimeScreen.h
Normal file
@@ -0,0 +1,78 @@
|
||||
/*
|
||||
* Copyright (C) 2019 Max Regan
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "Bsp/macros.h"
|
||||
|
||||
#include "Application/ScreenManager.h"
|
||||
#include "Bsp/Drivers/DisplayDriver.h"
|
||||
#include "Bsp/ReturnCode.h"
|
||||
#include "Bsp/Task.h"
|
||||
#include "Bsp/Time.h"
|
||||
#include "Bsp/font.h"
|
||||
|
||||
class SetTimeScreen : public Screen {
|
||||
public:
|
||||
|
||||
SetTimeScreen(BSP::DisplayDriver &display,
|
||||
ScreenManager &m_manager);
|
||||
|
||||
Common::ReturnCode init();
|
||||
Common::Schedule::NextTime execute() override;
|
||||
|
||||
void enable() override;
|
||||
void disable() override;
|
||||
void notify_up_button() override;
|
||||
void notify_middle_button() override;
|
||||
void notify_down_button() override;
|
||||
|
||||
private:
|
||||
|
||||
void refresh();
|
||||
void render_time();
|
||||
void render_selection();
|
||||
void display_number(uint32_t *x, uint32_t y, uint32_t tens, uint32_t ones);
|
||||
void draw_line(uint32_t x, uint32_t y, uint32_t width);
|
||||
uint32_t get_acknak_string_x_pos();
|
||||
uint32_t get_acknak_string_len();
|
||||
const char *get_acknak_string();
|
||||
|
||||
|
||||
enum class SetState {
|
||||
HOURS,
|
||||
MINUTES,
|
||||
SECONDS,
|
||||
AM_PM,
|
||||
ACK_NACK
|
||||
};
|
||||
|
||||
BSP::DisplayDriver &m_display;
|
||||
ScreenManager &m_manager;
|
||||
|
||||
SetState m_state;
|
||||
bool m_is_acked = false;
|
||||
Common::WallClockTime m_time;
|
||||
const struct font &m_font;
|
||||
const uint32_t m_row_spacing;
|
||||
const uint32_t m_row_0_y;
|
||||
const uint32_t m_row_1_y;
|
||||
};
|
||||
Reference in New Issue
Block a user