From a20e39c057514934b337595a2f71140ffc376180 Mon Sep 17 00:00:00 2001
From: wu58430 <wu58430@126.com>
Date: Wed, 7 Feb 2024 22:48:46 +0800
Subject: [PATCH] 122

---
 .idea/workspace.xml | 15 ++++++---------
 Makefile            |  2 +-
 app/spectrum.c      | 25 ++++++++++---------------
 app/spectrum.h      |  1 -
 bsp/dp32g030/rtc.h  |  2 +-
 driver/rtc.c        | 10 ++++++----
 6 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b5966ed8..e5740394 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,15 +21,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="cea36e80-e289-4d69-9030-7186d540ac0e" name="更改" comment="时间校准">
-      <change beforePath="$PROJECT_DIR$/.idea/.name" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/uv-k5-firmware-chinese.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/Makefile" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/spectrum.c" beforeDir="false" afterPath="$PROJECT_DIR$/app/spectrum.c" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/spectrum.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/spectrum.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bsp/dp32g030/rtc.h" beforeDir="false" afterPath="$PROJECT_DIR$/bsp/dp32g030/rtc.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/driver/rtc.c" beforeDir="false" afterPath="$PROJECT_DIR$/driver/rtc.c" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -108,7 +105,7 @@
       <recent name="C:\Users\RUPC\Desktop\UV-K6\uv-k5-firmware-chinese\app" />
     </key>
   </component>
-  <component name="RunManager" selected="Makefile 目标.build">
+  <component name="RunManager" selected="Shell Script.win docker">
     <configuration name="uv_k5_firmware_custom_0_17" type="CLionNativeAppRunConfigurationType" nameIsGenerated="true" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="uv_k5_firmware_custom_0_17" TARGET_NAME="uv_k5_firmware_custom_0_17" CONFIG_NAME="Debug" version="1" RUN_TARGET_PROJECT_NAME="uv_k5_firmware_custom_0_17" RUN_TARGET_NAME="uv_k5_firmware_custom_0_17">
       <method v="2">
         <option name="CLION.COMPOUND.BUILD" enabled="true" />
diff --git a/Makefile b/Makefile
index 2bd2ea5e..2d44fc28 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ ENABLE_MDC1200                ?= 1
 ENABLE_MDC1200_SHOW_OP_ARG    = 0
 ENABLE_MDC1200_SIDE_BEEP      = 0
 ENABLE_MDC1200_CONTACT        = 1
-ENABLE_MDC1200_EDIT			  = 0
+ENABLE_MDC1200_EDIT			  = 1
 ENABLE_UART_RW_BK_REGS 		  ?= 0
 ENABLE_AUDIO_BAR_DEFAULT      ?= 0
 ENABLE_EEPROM_TYPE        	   = 0
diff --git a/app/spectrum.c b/app/spectrum.c
index 83402219..4c3c688f 100644
--- a/app/spectrum.c
+++ b/app/spectrum.c
@@ -425,11 +425,11 @@ static void DeInitSpectrum() {
     isInitialized = false;
 }
 
-uint8_t GetBWRegValueForScan() {
+static uint8_t GetBWRegValueForScan() {
     return scanStepBWRegValues[settings.scanStepIndex];
 }
 
-uint16_t GetRssi() {
+static uint16_t GetRssi() {
     // SYSTICK_DelayUs(800);
     // testing autodelay based on Glitch value
     while ((BK4819_ReadRegister(0x63) & 0b11111111) >= 255) {
@@ -791,7 +791,7 @@ static bool IsBlacklisted(uint16_t idx)
 
 // Draw things
 // applied x2 to prevent initial rounding
-uint8_t Rssi2PX(uint16_t rssi, uint8_t pxMin, uint8_t pxMax) {
+static uint8_t Rssi2PX(uint16_t rssi, uint8_t pxMin, uint8_t pxMax) {
     const int DB_MIN = settings.dbMin << 1;
     const int DB_MAX = settings.dbMax << 1;
     const int DB_RANGE = DB_MAX - DB_MIN;
@@ -843,7 +843,7 @@ static void DrawPower() {
     }
 }
 
-void DrawStatus( ) {
+static void DrawStatus( ) {
 
 #ifdef SPECTRUM_EXTRA_VALUES
     sprintf(String, "%d/%d P:%d T:%d", settings.dbMin, settings.dbMax,
@@ -1081,15 +1081,11 @@ static void OnKeyDownFreqInput(uint8_t key) {
     if(DOPPLER_MODE)
    {
 
-//        100000
-        //123012
-         RTC_TR = ((tempFreq/1000000) << 20) //h十位
-             | ((tempFreq/100000%10) << 16)//h个位
-             | ((tempFreq/10000%10) << 12)//min十位
-             | ((tempFreq/1000%10)  << 8)//min个位
-             | ((tempFreq/100%10)  << 4)//sec十位
-             | ((tempFreq/10%10)   << 0);//sec个位
-              RTC_CFG |= (1 << 2);//打开设置时间功能
+
+time[3]=tempFreq/100000;
+time[4]=(tempFreq/1000)%100;
+time[5]=(tempFreq/10)%100;
+                RTC_Set();
              SetState(previousState);
 
         break;
@@ -1415,7 +1411,7 @@ bool HandleUserInput() {
             ToggleTX(false);
         }
 #endif
-        return true;
+//        return true;
     }
 
     if (kbd.current != KEY_INVALID && kbd.current == kbd.prev) {
@@ -1585,7 +1581,6 @@ static void Tick() {
     }
 }
 
-bool INT_FLAG = 0;
 
 void APP_RunSpectrum() {
 
diff --git a/app/spectrum.h b/app/spectrum.h
index 4d19e4a9..01be5ac3 100644
--- a/app/spectrum.h
+++ b/app/spectrum.h
@@ -152,7 +152,6 @@ typedef struct PeakInfo {
 } PeakInfo;
 
 void APP_RunSpectrum(void);
-void DrawStatus() ;
 #ifdef ENABLE_DOPPLER
 extern bool DOPPLER_MODE;
 void RTCHandler();
diff --git a/bsp/dp32g030/rtc.h b/bsp/dp32g030/rtc.h
index 75896797..9975d54d 100644
--- a/bsp/dp32g030/rtc.h
+++ b/bsp/dp32g030/rtc.h
@@ -36,7 +36,7 @@
 #define TEMP2 (*(volatile uint32_t *)(0x40000800u+0x24u))
 
 void RTC_INIT(void);
-void RTC_Set( uint8_t time[6]);
+void RTC_Set( );
 void RTC_Get();
 
 extern uint8_t time[6];
diff --git a/driver/rtc.c b/driver/rtc.c
index ee0a1ed9..791a20ac 100644
--- a/driver/rtc.c
+++ b/driver/rtc.c
@@ -17,7 +17,7 @@ void RTC_INIT() {
 
     EEPROM_ReadBuffer(0X2BC0,time,6);
 
-    RTC_Set(time);
+    RTC_Set();
 
     NVIC_SetPriority(Interrupt2_IRQn, 0);
 
@@ -26,8 +26,8 @@ void RTC_INIT() {
         RTC_IF |= (1 << 0);//清除中断标志位
         RTC_IE |= (1 << 0);//使能秒中断
 
-    RTC_CFG |= (1 << 2)//打开设置时间功能
-               | (1 << 0);//RTC使能
+    RTC_CFG |= //(1 << 2)|//打开设置时间功能
+                (1 << 0);//RTC使能
 
     NVIC_EnableIRQ(Interrupt2_IRQn);
 
@@ -35,7 +35,7 @@ void RTC_INIT() {
 
 }
 
-void RTC_Set(uint8_t time[6]) {
+void RTC_Set() {
 
 
 
@@ -52,6 +52,8 @@ void RTC_Set(uint8_t time[6]) {
              | (time[4] % 10 << 8)//min个位
              | (time[5] / 10 << 4)//sec十位
              | (time[5] % 10 << 0);//sec个位
+    RTC_CFG |= (1 << 2);//打开设置时间功能
+
 }
 
 void RTC_Get() {