VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-26 20:14:19 -04:00
Code Issues Projects Releases Wiki Activity

Fix missing YAML-to-SWG mappings for MeshCore plugins

Browse Source 
The MeshCore mod plugin references SWGMeshcoreModActions in
meshcoremod.cpp, but MeshcoreMod.yaml had no MeshcoreModActions
section. When swagger files are regenerated, the auto-generated
SWGChannelActions.h/cpp lose the meshcore_mod_actions member and
accessors, which would break compilation of meshcoremod.cpp.

Changes across five files:

- MeshcoreMod.yaml: add MeshcoreModActions definition (sendNow
  field, matching existing hand-authored SWGMeshcoreModActions)
- ChannelActions.yaml: add MeshcoreModActions  pointing to
  the new section
- SWGModelFactory.h: add #include and create() registration
  block for SWGMeshcoreModActions (was missing despite
  SWGMeshcoreModSettings/MeshcoreDemod* being registered)
- webapirequestmapper.cpp: add channelActionsKey routing branch
  for MeshcoreModActions (was completely absent)
- webapiutils.cpp: add m_channelURIToSettingsKey and
  m_channelTypeToSettingsKey entries for both MeshcoreDemod and
  MeshcoreMod (were missing, unlike ChirpChat and Meshtastic
  which have entries for their channel types)
This commit is contained in:
Tom Hensel
2026-07-21 12:25:51 +02:00
parent 41d5d57ad1
commit 583ba39829
5 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrbase/webapi/webapiutils.cpp
+4
View File
@@ -39,6 +39,8 @@ const QMap<QString, QString> WebAPIUtils::m_channelURIToSettingsKey = {
{"sdrangel.channel.chirpchatdemod", "ChirpChatDemodSettings"},
{"sdrangel.channel.meshtasticdemod", "ChirpChatDemodSettings"}, // alias: Meshtastic uses ChirpChatDemodSettings schema
{"sdrangel.channel.modchirpchat", "ChirpChatModSettings"},
{"sdrangel.channel.meshcoredemod", "MeshcoreDemodSettings"},
{"sdrangel.channeltx.modmeshcore", "MeshcoreModSettings"},
{"sdrangel.channel.demodatv", "ATVDemodSettings"},
{"sdrangel.channel.demoddatv", "DATVDemodSettings"},
{"sdrangel.channel.dabdemod", "DABDemodSettings"},
@@ -165,6 +167,8 @@ const QMap<QString, QString> WebAPIUtils::m_channelTypeToSettingsKey = {
{"ChirpChatDemod", "ChirpChatDemodSettings"},
{"MeshtasticDemod", "ChirpChatDemodSettings"}, // alias: Meshtastic uses ChirpChatDemodSettings schema
{"ChirpChatMod", "ChirpChatModSettings"},
{"MeshcoreDemod", "MeshcoreDemodSettings"},
{"MeshcoreMod", "MeshcoreModSettings"},
{"ChannelPower", "ChannelPowerSettings"},
{"DATVDemod", "DATVDemodSettings"},
{"DATVMod", "DATVModSettings"},