dmx: work on enabling led fixtures

ossia · Feb 4, 2025 · 4fa597c · 4fa597c
1 parent d35bd75
commit 4fa597c
Show file tree

Hide file tree

Showing 10 changed files with 1,397 additions and 1,228 deletions.
diff --git a/3rdparty/libossia b/3rdparty/libossia
diff --git a/src/plugins/score-plugin-protocols/CMakeLists.txt b/src/plugins/score-plugin-protocols/CMakeLists.txt
@@ -207,13 +207,17 @@ set(ARTNET_HDRS
   "${CMAKE_CURRENT_SOURCE_DIR}/Protocols/Artnet/ArtnetProtocolFactory.hpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/Protocols/Artnet/ArtnetProtocolSettingsWidget.hpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/Protocols/Artnet/ArtnetSpecificSettings.hpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Protocols/Artnet/FixtureDialog.hpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Protocols/Artnet/LEDDialog.hpp"
 )
 
 set(ARTNET_SRCS
   "${CMAKE_CURRENT_SOURCE_DIR}/Protocols/Artnet/ArtnetDevice.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/Protocols/Artnet/ArtnetProtocolFactory.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/Protocols/Artnet/ArtnetProtocolSettingsWidget.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/Protocols/Artnet/ArtnetSpecificSettingsSerialization.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Protocols/Artnet/FixtureDialog.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/Protocols/Artnet/LEDDialog.cpp"
 )
 
 set(SIMPLEIO_HDRS

diff --git a/src/plugins/score-plugin-protocols/Protocols/Artnet/ArtnetDevice.cpp b/src/plugins/score-plugin-protocols/Protocols/Artnet/ArtnetDevice.cpp
@@ -199,7 +199,12 @@ bool ArtnetDevice::reconnect()
     conf.autocreate = ossia::net::dmx_config::no_auto;
     if(set.fixtures.empty())
     {
-      if(set.transport == ArtnetSpecificSettings::ArtNet)
+      if(set.transport == ArtnetSpecificSettings::ArtNet_MultiUniverse
+         || set.transport == ArtnetSpecificSettings::E131_MultiUniverse)
+      {
+        conf.autocreate = ossia::net::dmx_config::just_universes;
+      }
+      else if(set.transport == ArtnetSpecificSettings::ArtNet)
       {
         conf.autocreate = ossia::net::dmx_config::channel_index;
       }
@@ -220,7 +225,8 @@ bool ArtnetDevice::reconnect()
     switch(set.transport)
     {
       case ArtnetSpecificSettings::ArtNet:
-      case ArtnetSpecificSettings::ArtNetV2: {
+      case ArtnetSpecificSettings::ArtNetV2:
+      case ArtnetSpecificSettings::ArtNet_MultiUniverse: {
         auto host = set.host.toStdString();
         if(host.empty())
           host = "0.0.0.0";
@@ -233,7 +239,8 @@ bool ArtnetDevice::reconnect()
               = std::make_unique<ossia::net::artnet_input_protocol>(m_ctx, conf, host);
         break;
       }
-      case ArtnetSpecificSettings::E131: {
+      case ArtnetSpecificSettings::E131:
+      case ArtnetSpecificSettings::E131_MultiUniverse: {
         auto host = set.host.toStdString();
         if(host.empty())
           host = "0.0.0.0";
@@ -260,7 +267,8 @@ bool ArtnetDevice::reconnect()
         break;
       }
       case ArtnetSpecificSettings::DMXUSBPRO:
-      case ArtnetSpecificSettings::DMXUSBPRO_Mk2: {
+      case ArtnetSpecificSettings::DMXUSBPRO_Mk2:
+      case ArtnetSpecificSettings::OpenDMX_USB: {
         ossia::net::serial_configuration sock_conf;
 
         for(auto& p : QSerialPortInfo::availablePorts())
@@ -274,11 +282,31 @@ bool ArtnetDevice::reconnect()
         if(sock_conf.port.empty())
           sock_conf.port = set.host.toStdString();
 
-        sock_conf.baud_rate = 115200;
-        sock_conf.stop_bits = ossia::net::serial_configuration::two;
+        int version = -1;
+        switch(set.transport)
+        {
+          case ArtnetSpecificSettings::DMXUSBPRO:
+            version = 1;
+            sock_conf.baud_rate = 115200;
+            sock_conf.stop_bits = ossia::net::serial_configuration::two;
+            break;
+
+          case ArtnetSpecificSettings::DMXUSBPRO_Mk2:
+            version = 2;
+            sock_conf.baud_rate = 115200;
+            sock_conf.stop_bits = ossia::net::serial_configuration::two;
+            break;
+
+          case ArtnetSpecificSettings::OpenDMX_USB:
+            version = 3;
+            sock_conf.baud_rate = 250000;
+            sock_conf.stop_bits = ossia::net::serial_configuration::two;
+            break;
+
+          default:
+            break;
+        }
 
-        const int version
-            = set.transport == ArtnetSpecificSettings::DMXUSBPRO_Mk2 ? 2 : 1;
         artnet_proto = std::make_unique<ossia::net::dmxusbpro_protocol>(
             m_ctx, conf, sock_conf, version);
         break;
@@ -292,9 +320,11 @@ bool ArtnetDevice::reconnect()
       auto dev = std::make_unique<ossia::net::generic_device>(
           std::move(artnet_proto), settings().name.toStdString());
 
+      if(!set.fixtures.empty())
+        SCORE_ASSERT(proto.buffer().size() == 1);
       for(auto& fixt : set.fixtures)
       {
-        addArtnetFixture(*dev, proto.buffer(), fixt);
+        addArtnetFixture(*dev, proto.buffer()[0], fixt);
       }
 
       if(set.mode == ArtnetSpecificSettings::Sink)
+1 −1		3rdparty/libremidi
+1 −1		3rdparty/rnd
+384 −1,033		src/ossia-max/extras/OSSIA overview.maxpat
+59 −114		src/ossia-max/help/distant_client.maxpat
+9 −36		src/ossia-max/help/distant_device.maxpat
+22 −43		src/ossia-max/help/ossia.assert.maxhelp
+85 −113		src/ossia-max/help/ossia.attribute.maxhelp
+138 −343		src/ossia-max/help/ossia.client.maxhelp
+114 −317		src/ossia-max/help/ossia.device.maxhelp
+228 −563		src/ossia-max/help/ossia.explorer.maxhelp
+221 −738		src/ossia-max/help/ossia.fuzzysearch.maxhelp
+18 −40		src/ossia-max/help/ossia.logger.maxhelp
+84 −155		src/ossia-max/help/ossia.maxhelp
+181 −507		src/ossia-max/help/ossia.model.maxhelp
+455 −459		src/ossia-max/help/ossia.parameter.maxhelp
+466 −559		src/ossia-max/help/ossia.remote.maxhelp
+55 −131		src/ossia-max/help/ossia.remote_array.maxhelp
+224 −226		src/ossia-max/help/ossia.router.maxhelp
+15 −40		src/ossia-max/help/ossia.search.maxhelp
+3 −0		src/ossia/dataflow/port.hpp
+70 −0		src/ossia/dataflow/texture_port.hpp
+8 −4		src/ossia/protocols/artnet/artnet_protocol.cpp
+8 −3		src/ossia/protocols/artnet/dmx_buffer.hpp
+0 −2		src/ossia/protocols/artnet/dmx_parameter.hpp
+31 −12		src/ossia/protocols/artnet/dmx_protocol_base.cpp
+2 −2		src/ossia/protocols/artnet/dmx_protocol_base.hpp
+6 −4		src/ossia/protocols/artnet/dmxusbpro_protocol.cpp
+22 −19		src/ossia/protocols/artnet/e131_protocol.cpp