Make use of C++ array wrapper

This commit is contained in:
BlackMark 2022-05-27 20:40:32 +02:00
parent 9487454a9d
commit 3a9ce6b37d
4 changed files with 9 additions and 6 deletions

@ -1 +1 @@
Subproject commit 6cc9c4e70c19fd7fd40a3f588384d77c7cf60e38 Subproject commit 438765511c8965357b20c3f46e092da5fd00aba1

View File

@ -257,6 +257,9 @@
<Compile Include="uart\uart.hpp"> <Compile Include="uart\uart.hpp">
<SubType>compile</SubType> <SubType>compile</SubType>
</Compile> </Compile>
<Compile Include="util\array.hpp">
<SubType>compile</SubType>
</Compile>
<Compile Include="util\func.hpp"> <Compile Include="util\func.hpp">
<SubType>compile</SubType> <SubType>compile</SubType>
</Compile> </Compile>

View File

@ -1,18 +1,18 @@
#include "clock.hpp" #include "clock.hpp"
#include "eink/eink.hpp"
#include "flash/flash.hpp" #include "flash/flash.hpp"
#include "io/io.hpp" #include "io/io.hpp"
#include "spi/spi.hpp" #include "spi/spi.hpp"
#include "uart/uart.hpp" #include "uart/uart.hpp"
#include "util/array.hpp"
#include "eink/eink.hpp"
using uart_t = uart::Uart0<>; using uart_t = uart::Uart0<>;
REGISTER_UART0_INT_VECTORS(uart_t); REGISTER_UART0_INT_VECTORS(uart_t);
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
const uint8_t IMAGE[] PROGMEM = { constexpr auto IMAGE [[gnu::progmem]] = util::to_array<uint8_t>({
0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x85, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x85, 0x79, 0x79, 0x79, 0x79, 0x79,
0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79,
0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x85, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x85, 0x79, 0x79, 0x79,
@ -435,7 +435,7 @@ const uint8_t IMAGE[] PROGMEM = {
0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79,
0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79, 0x79,
0x79, 0x79,
}; });
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////

@ -1 +1 @@
Subproject commit 632ed6cf41c45786c738732d6e10d3d2bf988690 Subproject commit 5282fdde4636016314befe7110a7d4573c597c7c