Merge pull request #226 from ligenxxxx/L2_calib_calib

fix race3 rf calib
hd-zero · Nov 15, 2024 · a1b261a · a1b261a
2 parents 9b62b3d + 79fb24a
commit a1b261a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 2 deletions.
diff --git a/src/camera.c b/src/camera.c
@@ -232,6 +232,7 @@ void camera_mode_detect(uint8_t init) {
 
         if (cycles == 0) {
             Set_720P60(0);
+            WriteReg(0, 0x50, 0x01);
             video_format = VDO_FMT_720P60;
             I2C_Write16(ADDR_TC3587, 0x0058, 0x00e0);
             camera_type = CAMERA_TYPE_RESERVED;

diff --git a/src/common.h b/src/common.h
@@ -77,8 +77,8 @@
 // #define EXTEND_BUF1
 
 // mode
-// #define _RF_CALIB
-// #define REV_UART
+#define _RF_CALIB
+#define REV_UART
 // #define VIDEO_PAT
 // #define FIX_EEP
 // #define RESET_CONFIG

diff --git a/src/hardware.c b/src/hardware.c
@@ -518,6 +518,12 @@ void Init_HW() {
     GetVtxParameter();
     Get_EEP_LifeTime();
     camera_init();
+#ifdef _RF_CALIB
+    RF_POWER = 0; // max power
+    RF_FREQ = 0;  // ch1
+    Init_6300RF(RF_FREQ, RF_POWER);
+    DM6300_AUXADC_Calib();
+#endif
 //--------- dm6300 --------------------
 // move to RF_Delay_Init()
 #endif

diff --git a/src/mcu.c b/src/mcu.c
@@ -190,7 +190,9 @@ void main(void) {
             uart_baudrate_detect();
             runcam_shutter_fix(seconds);
         }
+#ifndef _RF_CALIB
         RF_Delay_Init();
+#endif
 
 #ifdef USE_USB_DET
         usb_det_task();

diff --git a/src/tramp_protocol.c b/src/tramp_protocol.c
@@ -247,6 +247,7 @@ void tramp_receive(void) {
 }
 
 void tramp_init(void) {
+#ifndef _RF_CALIB
     uint16_t time_ms = 3000;
     RF_POWER = POWER_MAX + 2;
     while (time_ms--) {
@@ -255,5 +256,6 @@ void tramp_init(void) {
     }
     if (!tramp_lock)
         RF_POWER = I2C_Read8(ADDR_EEPROM, EEP_ADDR_RF_POWER);
+#endif
 }
 #endif