精简代码，加入手电筒

Sharkbia · Jan 21, 2024 · e712ad4 · e712ad4
1 parent 2a25c9c
commit e712ad4
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 68 deletions.
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ ENABLE_ALARM                  ?= 0
 ENABLE_TX1750                 ?= 0
 ENABLE_PWRON_PASSWORD         ?= 0
 ENABLE_DTMF_CALLING           ?= 1
-ENABLE_FLASHLIGHT             ?= 0
+ENABLE_FLASHLIGHT             ?= 1
 
 # ---- CUSTOM MODS ----
 ENABLE_BIG_FREQ               ?= 1

diff --git a/app/app.c b/app/app.c
@@ -1192,7 +1192,7 @@ void APP_TimeSlice10ms(void)
 			return;
 #endif
 #ifdef ENABLE_FLASHLIGHT
-    FlashlightTimeSlice();
+//    FlashlightTimeSlice();
 #endif
 #ifdef ENABLE_VOX
     if (gVoxResumeCountdown > 0)

diff --git a/app/flashlight.c b/app/flashlight.c
@@ -47,20 +47,30 @@ void FlashlightTimeSlice()
 
 void ACTION_FlashLight(void)
 {
-	switch (gFlashLightState) {
-		case FLASHLIGHT_OFF:
-			gFlashLightState++;
-			GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
-			break;
-		case FLASHLIGHT_ON:
-		case FLASHLIGHT_BLINK:
-			gFlashLightState++;
-			break;
-		case FLASHLIGHT_SOS:
-		default:
-			gFlashLightState = 0;
-			GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
-	}
+    if(gFlashLightState)
+        {
+        GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
+gFlashLightState=0;
+
+        }else
+            {
+        GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
+        gFlashLightState=1;
+            }
+//	switch (gFlashLightState) {
+//		case FLASHLIGHT_OFF:
+//			gFlashLightState++;
+//			GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
+//			break;
+//		case FLASHLIGHT_ON:
+////		case FLASHLIGHT_BLINK:
+//			gFlashLightState++;
+//			break;
+////		case FLASHLIGHT_SOS:
+//		default:
+//			gFlashLightState = 0;
+//			GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
+//	}
 }
 
 #endif
diff --git a/app/mdc1200.c b/app/mdc1200.c
@@ -440,7 +440,7 @@ uint8_t mdc1200_rx_ready_tick_500ms;
 
 
 void MDC1200_init(void) {
-    memcpy(mdc1200_sync_suc_xor, mdc1200_sync, sizeof(mdc1200_sync));
+//    memcpy(mdc1200_sync_suc_xor, mdc1200_sync, sizeof(mdc1200_sync));
 //    xor_modulation(mdc1200_sync_suc_xor, sizeof(mdc1200_sync_suc_xor));
 
     MDC1200_reset_rx();
@@ -471,11 +471,13 @@ void mdc1200_update_contact_num()
 }
 bool mdc1200_contact_find(uint16_t mdc_id, char *contact) {
     mdc1200_update_contact_num();
-    uint8_t add = 0;
+    uint16_t add = 0x1D00;
     for (uint8_t i = 0; i < contact_num; i++) {
         uint8_t read_once[16]={0};
-        if ((i & 3) == 0 && i) add++;
-        EEPROM_ReadBuffer(MDC_ADD[add] +((i&3) <<4), read_once, 16);
+//        if ((i & 3) == 0 && i) add++;
+        add+=16;
+        if(i==16)add=0X1F90;
+        EEPROM_ReadBuffer(add +((i&3) <<4), read_once, 16);
         if (mdc_id == (uint16_t) (read_once[1] | (read_once[0] << 8))) {
             for (int j = 0; j < 14; ++j) {
                 if(read_once[2+j]<' '||read_once[2+j]>'~')
@@ -489,27 +491,5 @@ bool mdc1200_contact_find(uint16_t mdc_id, char *contact) {
     }
     return false;
 }
-//uint8_t A[64];
-//    memset(A,'A',6*16);
-//    for (int i = MDC_ADD1; i < MDC_ADD1+64; ++i) {
-//        EEPROM_WriteBuffer(i,&A[i-MDC_ADD1]);
-//    }
-//
-//    for (int i = MDC_ADD2+72; i <MDC_ADD2+64; ++i) {
-//        EEPROM_WriteBuffer(i,&A[i-MDC_ADD2]);
-//    }
-//    for (int i =MDC_ADD3; i < MDC_ADD3+64; ++i) {
-//        EEPROM_WriteBuffer(i,&A[i-MDC_ADD3]);
-//    }
-//    for (int i =MDC_ADD4; i < MDC_ADD4+64; ++i) {
-//        EEPROM_WriteBuffer(i,&A[i-MDC_ADD4]);
-//    }
-//    EEPROM_ReadBuffer(MDC_ADD1, A, sizeof(A));
-//    UART_Send(A,64);
-//    EEPROM_ReadBuffer(MDC_ADD2, A, sizeof(A));
-//    UART_Send(A,64);
-//    EEPROM_ReadBuffer(MDC_ADD3, A, sizeof(A));
-//    UART_Send(A,64);
-//    EEPROM_ReadBuffer(MDC_ADD4, A, sizeof(A));
-//    UART_Send(A,64);
+
 #endif
diff --git a/compile-with-docker.bat b/compile-with-docker.bat
@@ -1,5 +1,5 @@
 @echo on
 make clean
 docker build -t uvk5 .
-docker run --rm -v %CD%\compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app &&rm -rf compiled&& make clean && make && cp firmware* compiled-firmware/"
+docker run --rm -v %CD%\compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app &&rm -rf compiled&& make clean && make && cp *.bin compiled-firmware/"
 pause
diff --git a/compile-with-docker.sh b/compile-with-docker.sh
@@ -2,4 +2,4 @@
 rm -rf compiled
 make clean
 docker build -t uvk5 .
-docker run --rm -v %CD%\compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app &&rm -rf compiled&& make clean && make && cp firmware* compiled-firmware/"
+docker run --rm -v %CD%\compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app &&rm -rf compiled&& make clean && make && cp *.bin compiled-firmware/"
diff --git a/ui/menu.c b/ui/menu.c
@@ -457,7 +457,9 @@ const char gSubMenu_SCRAMBLER[][7] =
 const t_sidefunction SIDEFUNCTIONS[] =
         {
                {关闭, ACTION_OPT_NONE},
+#ifdef ENABLE_FLASHLIGHT
                {手电, ACTION_OPT_FLASHLIGHT},
+#endif
                {切换发射功率, ACTION_OPT_POWER},
                {监听, ACTION_OPT_MONITOR},
                {扫描, ACTION_OPT_SCAN},

diff --git a/version.c b/version.c
@@ -1,25 +1,3 @@
 #include "font.h"
-#define ONE_OF_ELEVEN_VER
-
-#ifdef GIT_HASH
-	#define VER     GIT_HASH
-#else
-	#define VER     "11"
-
-
-#endif
-
-#ifndef ONE_OF_ELEVEN_VER
-	const char Version[]      = "OEFW-"VER;
-	const char UART_Version[] = "UV-K5 Firmware, Open Edition, OEFW-"VER"\r\n";
-#else
-//#if ENABLE_CHINESE_FULL !=4
-//const char Version[]      = "LOSEHU"VER;
-//#else
-//const char Version[]      = "LOSEHU"VER"K";
-//#endif
-
 const char Version[]      = PACKED_FILE_SUFFIX;
 
-
-#endif
diff --git a/win_make.bat b/win_make.bat
@@ -29,7 +29,7 @@
 :: Do the compile
 ::
 make clean
-make build
+make full
 
 :: pyinstaller --onefile ./MDC_WRITE/main.py
 :: If you have python installed, you can create a 'packed' .bin from the compiled firmware.bin file.