matthias/wordclock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added clock wordmap and made wordmap a baseclass

Browse Source
This commit is contained in:
Matthias Mitscherlich
2023-02-07 13:38:23 +01:00
parent 2e8aa31cbf
commit 35c940ca5b
7 changed files with 206 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/main/main.cpp
+26 -26
View File
@@ -42,7 +42,7 @@
#include "inc/wifi.h"
#include "clock.h"
#include "wordmap.h"
#include "clockwordmap.h"
// --------------------------------------------------------------------------------------------------------------------
@@ -80,9 +80,9 @@ static rmt_encoder_handle_t led_encoder = NULL;
static LEDMatrix_Parameters_t ledmatrix_parameters =
{
LEDMATRIX_ORIENTATION_ROW_LEFT_RIGHT,
LEDMATRIX_ORIENTATION_COLUM_DOWN_UP,
LEDMATRIX_ORIENTATION_ROW,
LEDMATRIX_ORIENTATION_ROW_RIGHT_LEFT,
LEDMATRIX_ORIENTATION_COLUM_UP_DOWN,
LEDMATRIX_ORIENTATION_COLUM,
11,
10,
&led_chan,
@@ -92,7 +92,7 @@ static LEDMatrix_Parameters_t ledmatrix_parameters =
static LEDMatrix matrix(&ledmatrix_parameters);
static Wordmap map(&matrix);
static ClockWordmap clockWordmap(&matrix);
static gptimer_handle_t matrixRefreshTimer = NULL;
@@ -279,7 +279,7 @@ extern "C" void app_main(void)
std::list<string>::iterator it;
for(it = wordlist.begin(); it != wordlist.end(); it++)
{
map.setWord(Wordmap::Language_t::NL, *it, true);
clockWordmap.setWord(Wordmap::Language_t::NL, *it, true);
}
// Add a seconds indicator
@@ -341,36 +341,36 @@ static void colourMapTask(void* parameters)
static void countdown(int delay)
{
map.setWord(Wordmap::Language_t::NL, "ten", true);
clockWordmap.setWord(Wordmap::Language_t::NL, "ten", true);
vTaskDelay(delay);
map.setWord(Wordmap::Language_t::NL, "ten", false);
map.setWord(Wordmap::Language_t::NL, "nine", true);
clockWordmap.setWord(Wordmap::Language_t::NL, "ten", false);
clockWordmap.setWord(Wordmap::Language_t::NL, "nine", true);
vTaskDelay(delay);
map.setWord(Wordmap::Language_t::NL, "nine", false);
map.setWord(Wordmap::Language_t::NL, "eight", true);
clockWordmap.setWord(Wordmap::Language_t::NL, "nine", false);
clockWordmap.setWord(Wordmap::Language_t::NL, "eight", true);
vTaskDelay(delay);
map.setWord(Wordmap::Language_t::NL, "eight", false);
map.setWord(Wordmap::Language_t::NL, "seven", true);
clockWordmap.setWord(Wordmap::Language_t::NL, "eight", false);
clockWordmap.setWord(Wordmap::Language_t::NL, "seven", true);
vTaskDelay(delay);
map.setWord(Wordmap::Language_t::NL, "seven", false);
map.setWord(Wordmap::Language_t::NL, "six", true);
clockWordmap.setWord(Wordmap::Language_t::NL, "seven", false);
clockWordmap.setWord(Wordmap::Language_t::NL, "six", true);
vTaskDelay(delay);
map.setWord(Wordmap::Language_t::NL, "six", false);
map.setWord(Wordmap::Language_t::NL, "five", true);
clockWordmap.setWord(Wordmap::Language_t::NL, "six", false);
clockWordmap.setWord(Wordmap::Language_t::NL, "five", true);
vTaskDelay(delay);
map.setWord(Wordmap::Language_t::NL, "five", false);
map.setWord(Wordmap::Language_t::NL, "four", true);
clockWordmap.setWord(Wordmap::Language_t::NL, "five", false);
clockWordmap.setWord(Wordmap::Language_t::NL, "four", true);
vTaskDelay(delay);
map.setWord(Wordmap::Language_t::NL, "four", false);
map.setWord(Wordmap::Language_t::NL, "three", true);
clockWordmap.setWord(Wordmap::Language_t::NL, "four", false);
clockWordmap.setWord(Wordmap::Language_t::NL, "three", true);
vTaskDelay(delay);
map.setWord(Wordmap::Language_t::NL, "three", false);
map.setWord(Wordmap::Language_t::NL, "two", true);
clockWordmap.setWord(Wordmap::Language_t::NL, "three", false);
clockWordmap.setWord(Wordmap::Language_t::NL, "two", true);
vTaskDelay(delay);
map.setWord(Wordmap::Language_t::NL, "two", false);
map.setWord(Wordmap::Language_t::NL, "one", true);
clockWordmap.setWord(Wordmap::Language_t::NL, "two", false);
clockWordmap.setWord(Wordmap::Language_t::NL, "one", true);
vTaskDelay(delay);
map.setWord(Wordmap::Language_t::NL, "one", false);
clockWordmap.setWord(Wordmap::Language_t::NL, "one", false);
}
static bool IRAM_ATTR timerCallback(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_data)