1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-26 12:04:13 -04:00

Fix missing YAML-to-SWG mappings for MeshCore plugins

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
+5
View File
@@ -4855,6 +4855,11 @@ bool WebAPIRequestMapper::getChannelActions(
channelActions->setIeee802154ModActions(new SWGSDRangel::SWGIEEE_802_15_4_ModActions());
channelActions->getIeee802154ModActions()->fromJsonObject(actionsJsonObject);
}
else if (channelActionsKey == "MeshcoreModActions")
{
channelActions->setMeshcoreModActions(new SWGSDRangel::SWGMeshcoreModActions());
channelActions->getMeshcoreModActions()->fromJsonObject(actionsJsonObject);
}
else if (channelActionsKey == "RadioAstronomyActions")
{
channelActions->setRadioAstronomyActions(new SWGSDRangel::SWGRadioAstronomyActions());