MDC RX

.idea/workspace.xml

@@ -21,19 +21,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="cea36e80-e289-4d69-9030-7186d540ac0e" name="更改" comment="MDC RX">
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/app/main.c" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/mdc1200.c" beforeDir="false" afterPath="$PROJECT_DIR$/app/mdc1200.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/menu.c" beforeDir="false" afterPath="$PROJECT_DIR$/app/menu.c" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/mdc1200.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/mdc1200.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/frequencies.c" beforeDir="false" afterPath="$PROJECT_DIR$/frequencies.c" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/functions.c" beforeDir="false" afterPath="$PROJECT_DIR$/functions.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/main.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/misc.c" beforeDir="false" afterPath="$PROJECT_DIR$/misc.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/misc.h" beforeDir="false" afterPath="$PROJECT_DIR$/misc.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/payment/sponsors.md" beforeDir="false" afterPath="$PROJECT_DIR$/payment/sponsors.md" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/radio.c" beforeDir="false" afterPath="$PROJECT_DIR$/radio.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/settings.c" beforeDir="false" afterPath="$PROJECT_DIR$/settings.c" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/版本说明.txt" beforeDir="false" afterPath="$PROJECT_DIR$/版本说明.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ui/menu.c" beforeDir="false" afterPath="$PROJECT_DIR$/ui/menu.c" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/ui/menu.h" beforeDir="false" afterPath="$PROJECT_DIR$/ui/menu.h" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -140,7 +133,7 @@
       <workItem from="1701413653518" duration="3544000" />
       <workItem from="1701430185864" duration="10115000" />
       <workItem from="1701559895523" duration="22519000" />
-      <workItem from="1701678199532" duration="7567000" />
+      <workItem from="1701678199532" duration="8883000" />
     </task>
     <task id="LOCAL-00001" summary="bug fix">
       <created>1701136012311</created>
@@ -380,7 +373,14 @@
       <option name="project" value="LOCAL" />
       <updated>1701685151218</updated>
     </task>
-    <option name="localTasksCounter" value="35" />
+    <task id="LOCAL-00035" summary="MDC RX">
+      <created>1701686694191</created>
+      <option name="number" value="00035" />
+      <option name="presentableId" value="LOCAL-00035" />
+      <option name="project" value="LOCAL" />
+      <updated>1701686694191</updated>
+    </task>
+    <option name="localTasksCounter" value="36" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

app/mdc1200.c

@@ -559,3 +559,18 @@ void MDC1200_init(void)
 
     MDC1200_reset_rx();
 }
+uint16_t extractHex(const char *str) {
+    uint16_t result = 0;
+    while (*str) {
+        char c = *str++;
+        if (c >= '0' && c <= '9') {
+            result = (result << 4) | (c - '0');
+
+        } else if (c >= 'A' && c <= 'F') {
+            result = (result << 4) | (c - 'A' + 10);
+        } else {
+            break; // 遇到非十六进制字符，停止解析
+        }
+    }
+    return result;
+}

app/mdc1200.h

@@ -103,5 +103,6 @@ void           MDC1200_reset_rx(void);
 void           MDC1200_process_rx(const uint16_t interrupt_bits);
 void           MDC1200_init(void);
 extern uint16_t MDC_ID;
+uint16_t extractHex(const char *str);
 
 #endif

functions.c

@@ -13,7 +13,7 @@
  *     See the License for the specific language governing permissions and
  *     limitations under the License.
  */
-
+#include <stdint.h>
 #include <string.h>
 #include "app/mdc1200.h"
 #include "app/dtmf.h"
@@ -223,7 +223,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 
                         SYSTEM_DelayMs(30);
 
-                        BK4819_send_MDC1200(1, 0x80, MDC_ID, true);
+                        BK4819_send_MDC1200(1, 0x80, gEeprom.MDC1200_ID, true);
 
 #ifdef ENABLE_MDC1200_SIDE_BEEP
                             BK4819_start_tone(880, 10, true, true);

radio.c

@@ -14,7 +14,7 @@
  *     limitations under the License.
  */
 #include "driver/bk4819.h"
-
+#include <stdint.h>
 #include "app/mdc1200.h"
 #include <string.h>
 
@@ -1130,7 +1130,8 @@ void RADIO_SendEndOfTransmission(void)
         BK4819_PlayRoger();
     else
     if (gEeprom.ROGER == ROGER_MODE_MDC_END||gEeprom.ROGER==ROGER_MODE_MDC_BOTH) {
-        BK4819_send_MDC1200(MDC1200_OP_CODE_POST_ID, 0x00, MDC_ID, false);
+
+        BK4819_send_MDC1200(MDC1200_OP_CODE_POST_ID, 0x00, gEeprom.MDC1200_ID, false);
 
 #ifdef ENABLE_MDC1200_SIDE_BEEP
         BK4819_start_tone(880, 10, true, true);

版本说明.txt

@@ -1,9 +1,9 @@
 #0.10.4
+    在解锁全部频段下允许200M,350M,500M，删除对应菜单
     修复“按键音开机后失效“
-    修复开机显示问题
     修复“宽窄带开机后失效“
     频谱图增加AM-FIX
-    增加MDC1200信令
+    增加MDC1200信令(收/发、修改ID)
     开机固定显示信息
 #0.10.3
     修复“长按菜单切换调制模式（AM/FM/USB）再切回FM亚音消失问题”