diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 262a9fe..71a2cdf 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,19 +21,12 @@
-
-
-
-
-
-
-
-
+
+
+
-
-
-
+
@@ -140,7 +133,7 @@
-
+
1701136012311
@@ -380,7 +373,14 @@
1701685151218
-
+
+ 1701686694191
+
+
+
+ 1701686694191
+
+
diff --git a/app/mdc1200.c b/app/mdc1200.c
index a1f972d..1274976 100644
--- a/app/mdc1200.c
+++ b/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;
+}
\ No newline at end of file
diff --git a/app/mdc1200.h b/app/mdc1200.h
index b19bf05..aed886b 100644
--- a/app/mdc1200.h
+++ b/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
diff --git a/functions.c b/functions.c
index 0d0ace5..a5da4d3 100644
--- a/functions.c
+++ b/functions.c
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+#include
#include
#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);
diff --git a/radio.c b/radio.c
index 9d28af9..a43d7ed 100644
--- a/radio.c
+++ b/radio.c
@@ -14,7 +14,7 @@
* limitations under the License.
*/
#include "driver/bk4819.h"
-
+#include
#include "app/mdc1200.h"
#include
@@ -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);
diff --git a/版本说明.txt b/版本说明.txt
index 67016ab..c39670c 100644
--- a/版本说明.txt
+++ b/版本说明.txt
@@ -1,9 +1,9 @@
#0.10.4
+ 在解锁全部频段下允许200M,350M,500M,删除对应菜单
修复“按键音开机后失效“
- 修复开机显示问题
修复“宽窄带开机后失效“
频谱图增加AM-FIX
- 增加MDC1200信令
+ 增加MDC1200信令(收/发、修改ID)
开机固定显示信息
#0.10.3
修复“长按菜单切换调制模式(AM/FM/USB)再切回FM亚音消失问题”