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

fix and modify the subscriber for every universe

Browse Source
This commit is contained in:
Hideaki Tai 2020-09-30 16:26:12 +09:00
parent 7ef60c2e6f
commit 5cefd9b788
4 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Artnet.h
View File

@ -134,6 +134,7 @@ namespace arx
static constexpr uint8_t NUM_PIXELS_PER_UNIV { 170 };
using CallbackAllType = std::function<void(uint32_t universe, uint8_t* data, uint16_t size)>;
using CallbackType = std::function<void(uint8_t* data, uint16_t size)>;
struct Map { uint32_t universe; CallbackType func; };
@ -263,6 +264,7 @@ namespace arx
IPAddress remote_ip;
uint16_t remote_port;
CallbackMap callbacks;
CallbackAllType callback_all {nullptr};
S* stream;
public:
@ -285,10 +287,9 @@ namespace arx
memcpy(packet.data(), d, size);
remote_ip = stream->S::remoteIP();
remote_port = (uint16_t)stream->S::remotePort();
if (callback_all) callback_all(universe15bit(), data(), size);
for (auto& c : callbacks)
{
if (universe15bit() == c.universe) c.func(data(), size);
}
return true;
}
}
@ -361,9 +362,9 @@ namespace arx
{
callbacks.push_back(Map{universe, func});
}
inline void subscribe(const CallbackType& func)
inline void subscribe(const CallbackAllType& func)
{
subscribe(0, func);
callback_all = func;
}
inline void subscribe(const uint8_t net, const uint8_t subnet, const uint8_t universe, const CallbackType& func)
{
@ -385,7 +386,7 @@ namespace arx
}
inline void unsubscribe()
{
unsubscribe(0);
callback_all = nullptr;
}
inline void unsubscribe(const uint8_t net, const uint8_t subnet, const uint8_t universe)
{

6
README.md
View File

@ -100,6 +100,12 @@ void setup()
{
// do something with data coming to universe
});
// if Artnet packet comes, this function is called to every universe
artnet.subscribe([&](uint32_t univ, uint8_t* data, uint16_t size)
{
// do something with data coming to all universe
});
}
void loop()

8
examples/Ethernet/send_receive/send_receive.ino
View File

@ -33,6 +33,14 @@ void setup()
Serial.println();
});
// if Artnet packet comes, this function is called to every universe
artnet.subscribe([&](uint32_t univ, uint8_t* data, uint16_t size)
{
Serial.print("ArtNet data has come to universe: ");
Serial.println(univ);
});
Serial.println("start");
}

7
examples/WiFi/send_receive/send_receive.ino
View File

@ -38,6 +38,13 @@ void setup()
}
Serial.println();
});
// if Artnet packet comes, this function is called to every universe
artnet.subscribe([&](uint32_t univ, uint8_t* data, uint16_t size)
{
Serial.print("ArtNet data has come to universe: ");
Serial.println(univ);
});
}
void loop()