diff --git a/doc/manual/codeplug/smsextension.xml b/doc/manual/codeplug/smsextension.xml
index fde74982..a93f954d 100644
--- a/doc/manual/codeplug/smsextension.xml
+++ b/doc/manual/codeplug/smsextension.xml
@@ -6,10 +6,91 @@
xmlns:xi="http://www.w3.org/2001/XInclude">
-
+ SMS Extension
+ This extension allows for configuring the SMS (text message) feature of all DMR radios. For now,
+ it is implemented as an extension, but might be changed into a common core setting in the future.
+
+ This extension only has two elements: the SMS format and a list of predefined text messages. The
+ latter is important for devices that do not have a keypad and thus do not allow for entering any
+ messages. E.g., the Radioddity GD-73.
+
+
+
+ As this extension configures a common feature, the extension is always present.
+
+
+
+ Example of a single SMS pre-defined text or template.
+
+
+
+
+ Common SMS settings
+
+
+
+ format
+
+
+ Specifies the SMS format to be used. This must be one of Motorola,
+ Hytera or DMR. If an incompatible format is chosen, you cannot
+ receive or send text messages.
+
+
+
+
+
+
+
+ Message templates
+
+
+ The templates key defines a list of SMS templates to be programmed onto the radio.
+ Each template is a config object with a name and ID. The latter can be used to reference the
+ template somewhere else in the codeplug.
+
+
+
+ Each template has the following properties:
+
+
+
+
+ id
+
+
+ Specifies the unique ID of the message. This can be used to reference the message.
+
+
+
+
+ name
+
+
+ Specifies the display name of the message. Please note, that not all radios store
+ descriptive names alongside with the preset messages.
+
+
+
+
+ message
+
+
+ The actual preset message. The length might differ but is usually limited to 144 chars.
+
+
+
+
+
\ No newline at end of file
diff --git a/lib/gd73_codeplug.cc b/lib/gd73_codeplug.cc
index 0b8d7714..ccc8523f 100644
--- a/lib/gd73_codeplug.cc
+++ b/lib/gd73_codeplug.cc
@@ -751,6 +751,8 @@ GD73Codeplug::DMRSettingsElement::encode(Context &ctx, const ErrorStack &err) {
/* ********************************************************************************************* *
+<<<<<<< HEAD
+=======
* Implementation of GD73Codeplug::EncryptionKeyElement
* ********************************************************************************************* */
GD73Codeplug::EncryptionKeyElement::EncryptionKeyElement(uint8_t *ptr, size_t size)
@@ -876,7 +878,7 @@ GD73Codeplug::MessageElement::MessageElement(uint8_t *ptr, size_t size)
GD73Codeplug::MessageElement::MessageElement(uint8_t *ptr)
: Element(ptr, GD73Codeplug::MessageElement::size())
{
- // passs...
+ // pass...
}
QString
@@ -954,7 +956,6 @@ GD73Codeplug::MessageBankElement::decode(SMSExtension *ext, const ErrorStack &er
sms->setName(QString("Message %1").arg(i+1));
ext->smsTemplates()->add(sms);
}
-
return true;
}
diff --git a/lib/smsextension.hh b/lib/smsextension.hh
index 2fd13179..2b127ece 100644
--- a/lib/smsextension.hh
+++ b/lib/smsextension.hh
@@ -58,7 +58,7 @@ class SMSExtension : public ConfigExtension
/** The format for the SMS. */
Q_PROPERTY(Format format READ format WRITE setFormat)
/** All predefined SMS messages. */
- Q_PROPERTY(SMSTemplates *smsTemplates READ smsTemplates)
+ Q_PROPERTY(SMSTemplates *templates READ smsTemplates)
public:
/** Possible SMS formats, DMR is usually a good idea. */
diff --git a/lib/tyt_codeplug.hh b/lib/tyt_codeplug.hh
index 6c9b5367..c9bde8e2 100644
--- a/lib/tyt_codeplug.hh
+++ b/lib/tyt_codeplug.hh
@@ -1189,6 +1189,7 @@ public:
};
};
+
protected:
/** Empty constructor. */
explicit TyTCodeplug(QObject *parent = nullptr);