max/timely-reference
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Happy times: things work on real hardware!

Browse Source
This commit is contained in:
Max Regan
2019-06-02 21:34:18 -07:00
parent a7f1ffc1b5
commit 1cc2f7adf4
27 changed files with 9353 additions and 9057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
DisplayTimeTask.cpp
View File

@@ -22,15 +22,15 @@
#include "DisplayTimeTask.h"
#include "SystemTime.h"
#include "font-notomono-24.h"
#include "font-notomono-64.h"
#include "font-notomono-29.h"
#include "font-notomono-68.h"
using Common::ReturnCode;
using Common::Time;
using Common::Schedule::NextTime;
static const font &font_large = font_notomono_64;
static const font &font_default = font_notomono_24;
static const font &font_large = font_notomono_68;
static const font &font_default = font_notomono_29;
DisplayTimeTask::DisplayTimeTask(BSP::DisplayDriver &driver)
: m_driver(driver)
@@ -50,6 +50,13 @@ static char get_char_for_digit(uint8_t bcd_digit)
ReturnCode DisplayTimeTask::init()
{
SET_TO(GPIOA->MODER, GPIO_MODER_MODE0, 1u << GPIO_MODER_MODE1_Pos);
GPIOA->OTYPER &= ~GPIO_OTYPER_OT_1;
GPIOA->PUPDR &= ~GPIO_PUPDR_PUPD1;
GPIOA->PUPDR |= 2u << GPIO_PUPDR_PUPD1_Pos;
return ReturnCode::OK;
}
@@ -66,9 +73,6 @@ void DisplayTimeTask::display_number(uint32_t x, uint32_t y, uint32_t tens, uint
void DisplayTimeTask::display_time()
{
uint32_t width = m_driver.get_width();
uint32_t height = m_driver.get_height();
BSP::time_bcd time;
BSP::RtcDriver::get_time(time);
@@ -78,40 +82,57 @@ void DisplayTimeTask::display_time()
int i = 0;
SET(GPIOA->ODR, GPIO_ODR_OD1);
CLR(GPIOA->ODR, GPIO_ODR_OD1);
if (m_last_time.hour_tens != time.hour_tens ||
m_last_time.hour_ones != time.hour_ones ||
!m_has_cleared) {
display_number(0, (i * font_large.size) + (i + 1) * 4, time.hour_tens, time.hour_ones, font_large);
display_number(8, (i * font_default.size) + (i + 1) * 4, time.hour_tens, time.hour_ones, font_default);
}
SET(GPIOA->ODR, GPIO_ODR_OD1);
CLR(GPIOA->ODR, GPIO_ODR_OD1);
i++;
if (m_last_time.minute_tens != time.minute_tens ||
m_last_time.minute_ones != time.minute_ones ||
!m_has_cleared) {
display_number(0, (i * font_large.size) + (i + 1) * 4, time.minute_tens, time.minute_ones, font_large);
display_number(8, (i * font_default.size) + (i + 1) * 4, time.minute_tens, time.minute_ones, font_default);
}
SET(GPIOA->ODR, GPIO_ODR_OD1);
CLR(GPIOA->ODR, GPIO_ODR_OD1);
i++;
if (m_display_seconds) {
if (m_last_time.second_tens != time.second_tens ||
m_last_time.second_ones != time.second_ones ||
!m_has_cleared) {
display_number(0, (i * font_large.size) + (i + 1) * 4, time.second_tens, time.second_ones, font_default);
display_number(8, (i * font_default.size) + (i + 1) * 4, time.second_tens, time.second_ones, font_default);
}
}
m_has_cleared = true;
// m_has_cleared = true;
m_last_time = time;
SET(GPIOA->ODR, GPIO_ODR_OD1);
CLR(GPIOA->ODR, GPIO_ODR_OD1);
m_driver.refresh();
SET(GPIOA->ODR, GPIO_ODR_OD1);
CLR(GPIOA->ODR, GPIO_ODR_OD1);
}
NextTime DisplayTimeTask::execute()
{
display_time();
Common::time_t now;
BSP::SystemTimer::get_time(now);
uint32_t next_secs = Time::to_seconds(now) + 1;
display_time();
return NextTime::at(Time::seconds(next_secs));
}