Skip to content

Commit

Permalink
Merged devel branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
hmatuschek committed Oct 9, 2023
1 parent bf9a2bd commit 394aa1e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
6 changes: 5 additions & 1 deletion lib/gd73_codeplug.cc
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ GD73Codeplug::SettingsElement::updateConfig(Context &ctx, const ErrorStack &err)
// Create radio ID
DMRRadioID *radioID = new DMRRadioID(name(), dmrID());
ctx.config()->radioIDs()->add(radioID);
ctx.config()->radioIDs()->setDefaultId(0);
ctx.config()->settings()->setDefaultId(radioID);
ctx.add(radioID, 0);

// Apply settings
Expand Down Expand Up @@ -994,6 +994,8 @@ GD73Codeplug::ChannelElement::clearEncryptionKeyIndex() {

Channel *
GD73Codeplug::ChannelElement::toChannel(Context &ctx, const ErrorStack &err) {
Q_UNUSED(ctx); Q_UNUSED(err)

Channel *ch = nullptr;

if (Type::FM == type()) {
Expand Down Expand Up @@ -1368,8 +1370,10 @@ GD73Codeplug::ScanListElement::setTXHoldTime(const Interval &interval) {

ScanList *
GD73Codeplug::ScanListElement::toScanList(Context &ctx, const ErrorStack &err) {
Q_UNUSED(ctx); Q_UNUSED(err);
return new ScanList(name());
}

bool
GD73Codeplug::ScanListElement::linkScanList(ScanList *lst, Context &ctx, const ErrorStack &err) {
if ((ChannelMode::Fixed == primaryChannelMode()) && hasPrimaryChannelIndex()) {
Expand Down
2 changes: 2 additions & 0 deletions lib/gd73_interface.hh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

class GD73Interface: public C7000Device, public RadioInterface
{
Q_OBJECT

public:
/** Constructs a new interface to GD73A/E radios. If a matching device was found, @c isOpen
* returns @c true. */
Expand Down

0 comments on commit 394aa1e

Please sign in to comment.