diff --git a/driver/bk4819.c b/driver/bk4819.c
index 9cdc5a4..6616c43 100644
--- a/driver/bk4819.c
+++ b/driver/bk4819.c
@@ -1034,10 +1034,6 @@ void BK4819_StartTone1(const uint16_t frequency, const unsigned int level, const
 
 	BK4819_EnterTxMute();
 
-//	SYSTEM_DelayMs(2);
-	GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);	// enable speaker
-	SYSTEM_DelayMs(2);
-
 	BK4819_WriteRegister(BK4819_REG_70, BK4819_REG_70_ENABLE_TONE1 | ((level & 0x7f) << BK4819_REG_70_SHIFT_TONE1_TUNING_GAIN));
 
 	if (set_dac)
@@ -1049,17 +1045,21 @@ void BK4819_StartTone1(const uint16_t frequency, const unsigned int level, const
 
 	BK4819_WriteRegister(BK4819_REG_71, scale_freq(frequency));
 	BK4819_ExitTxMute();
+	
+//	SYSTEM_DelayMs(2);
+	GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);	// enable speaker
+	SYSTEM_DelayMs(2);
 }
 
 void BK4819_StopTones(void)
 {
+//	if (!g_enable_speaker)
+		GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
+
 	BK4819_EnterTxMute();
 	BK4819_WriteRegister(BK4819_REG_70, 0);
 	BK4819_WriteRegister(BK4819_REG_30, 0xC1FE);  // 1100 0001 1111 1110
 	BK4819_ExitTxMute();
-
-//	if (!g_enable_speaker)
-//		GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_SPEAKER);
 }
 
 void BK4819_PlayTone(const unsigned int tone_Hz, const unsigned int delay, const unsigned int level)
diff --git a/firmware.bin b/firmware.bin
index 7dd0471..e6d8160 100644
Binary files a/firmware.bin and b/firmware.bin differ
diff --git a/firmware.packed.bin b/firmware.packed.bin
index 6f50b8d..1477185 100644
Binary files a/firmware.packed.bin and b/firmware.packed.bin differ