Merge branch 'master' of https://git.vbchaos.nl/private/wordclock

code/main/main.cpp

@@ -169,7 +169,7 @@ extern "C" void app_main(void)
    memset(&tx_chan_config, 0, sizeof(tx_chan_config));
 
    tx_chan_config.clk_src = RMT_CLK_SRC_DEFAULT; // select source clock
-   tx_chan_config.gpio_num = RMT_LED_STRIP_GPIO_NUM;
+   tx_chan_config.gpio_num = (gpio_num_t)RMT_LED_STRIP_GPIO_NUM;
    tx_chan_config.mem_block_symbols = 64; // increase the block size can make the LED less flickering
    tx_chan_config.resolution_hz = RMT_LED_STRIP_RESOLUTION_HZ;
    tx_chan_config.trans_queue_depth = 4;

code/main/src/wordmap.cpp

@@ -20,6 +20,8 @@
 #include "wordmap.h"
 
 #include "logger.h"
+
+#include <algorithm>
 // --------------------------------------------------------------------------------------------------------------------
 // Constant and macro definitions
 // --------------------------------------------------------------------------------------------------------------------