adb/UIPArtnet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use ArxContainer and ArxTypeTraits

Browse Source
This commit is contained in:
Hideaki Tai 2020-09-30 16:08:21 +09:00
parent 532bcf9fbb
commit 1da9205aa8
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Artnet.h
View File

@ -134,26 +134,16 @@ namespace arduino
static constexpr uint8_t NUM_PIXELS_PER_UNIV { 170 }; static constexpr uint8_t NUM_PIXELS_PER_UNIV { 170 };
using CallbackType = std::function<void(uint8_t* data, uint16_t size)>;
struct Map { uint32_t universe; CallbackType func; };
#if ARX_HAVE_LIBSTDCPLUSPLUS >= 201103L // Have libstdc++11 #if ARX_HAVE_LIBSTDCPLUSPLUS >= 201103L // Have libstdc++11
template <uint16_t SIZE> template <uint16_t SIZE>
using Array = std::array<uint8_t, SIZE>; using Array = std::array<uint8_t, SIZE>;
using CallbackType = std::function<void(uint8_t* data, uint16_t size)>;
struct Map { uint32_t universe; CallbackType func; };
using CallbackMap = std::vector<Map>; using CallbackMap = std::vector<Map>;
#else #else
template <uint16_t SIZE> template <uint16_t SIZE>
class Array using Array = arx::vector<uint8_t, SIZE>;
{
uint8_t buffer[SIZE];
public:
const uint8_t* data() const { return buffer; }
uint8_t* data() { return buffer; }
uint16_t size() const { return SIZE; }
uint8_t operator[] (const size_t i) const { return buffer[i]; }
uint8_t& operator[] (const size_t i) { return buffer[i]; }
};
typedef void (*CallbackType)(uint8_t* data, uint16_t size);
struct Map { uint32_t universe; CallbackType func; };
using CallbackMap = arx::vector<Map, 8>; using CallbackMap = arx::vector<Map, 8>;
#endif #endif