修复温控关灯自动开灯问题，音量调整为112.6

@@ -36,7 +36,7 @@ static void* TempControl_Task(void *arg)
         // printf("触发调控，输入温度%d,输入亮度%d,设置亮度%d,调控时间%d\n",tempData->InputTemp,tempData->InputLumen,InitialLumen,OutTime);
         // printf("触发调控，输入温度%d,输入亮度%d,设置亮度%d,调控时间%d\n",tempData->InputTemp,tempData->InputLumen,InitialLumen,OutTime);
         if(OutTime > 0)
         if(OutTime > 0)
         {  
         {  
-        tempControlFlag = TEMP_TRIGGER;
+        //tempControlFlag = TEMP_TRIGGER;
         printf("触发调控，输入温度%d,输入亮度%d,设置亮度%d,调控时间%d\n",tempData->InputTemp,tempData->InputLumen,InitialLumen,OutTime);
         printf("触发调控，输入温度%d,输入亮度%d,设置亮度%d,调控时间%d\n",tempData->InputTemp,tempData->InputLumen,InitialLumen,OutTime);
         usleep(OutTime*1000);     
         usleep(OutTime*1000);     
         }
         }
@@ -280,13 +280,11 @@ void JZ_TempStructInit(void)
 *返回值：
 *返回值：
 *函数作者：wzy
 *函数作者：wzy
 *************************************/
 *************************************/
-
 static void *TempControl_TempChangeTask(void *arg)
 static void *TempControl_TempChangeTask(void *arg)
 {
 {
     int Lumen = 0; //亮度
     int Lumen = 0; //亮度
     int lastLumen;//上一次亮度 
     int lastLumen;//上一次亮度 
    
    
-
     while (1)
     while (1)
     {   
     {   
       if(tempData->OutLumen < 0)
       if(tempData->OutLumen < 0)
@@ -310,18 +308,19 @@ static void *TempControl_TempChangeTask(void *arg)
          {
          {
             lastLumen = Lumen;   
             lastLumen = Lumen;   
        
        
-         if(tempControlFlag == TEMP_TRIGGER)//触发了温控  
+         if(tempControlFlag == TEMP_NOTTRIGGER)//触发了温控  
          {
          {
-            tempControlFlag = TEMP_NOTTRIGGER;      
+            tempControlFlag = TEMP_TRIGGER;
+            continue; 
+         }
             if(Lumen != 0) 
             if(Lumen != 0) 
            {                                         
            {                                         
-            //重设亮度
-           
+            //重设亮度           
             Jz_LampLumenControl(Lumen,Lumen);
             Jz_LampLumenControl(Lumen,Lumen);
             tempData->InputLumen = Lumen;
             tempData->InputLumen = Lumen;
             Jz_set_widget_value(4,Lumen);                                   
             Jz_set_widget_value(4,Lumen);                                   
            }  
            }  
-         } 
+          
        }       
        }       
         usleep(200*1000);
         usleep(200*1000);
     }
     }

@@ -15,8 +15,7 @@ int gimbalLinkageState = GIMBALLINKAGE_OFF;//云台联动初始状态为开启
 pthread_mutex_t gimbalMutex; //无人机云台角度互斥锁
 pthread_mutex_t gimbalMutex; //无人机云台角度互斥锁
 Lamp_Temp *lampTemp; //左右灯温度
 Lamp_Temp *lampTemp; //左右灯温度
 int gimbalFineTuneAngle = 0; //云台微调角度
 int gimbalFineTuneAngle = 0; //云台微调角度
-extern int tempControlFlag;
-extern TempControlData *tempData;
+
 /* Private functions declaration ---------------------------------------------*/
 /* Private functions declaration ---------------------------------------------*/
 
 
 /* Exported functions definition ---------------------------------------------*/
 /* Exported functions definition ---------------------------------------------*/
@@ -195,7 +194,7 @@ static void *GimbalLinkage_Task(void *arg)
       {
       {
       lastX = 200;
       lastX = 200;
       }
       }
-      usleep(10);
+      usleep(1);
   }
   }
 
 
 }
 }
@@ -378,38 +377,3 @@ void JZ_LampModeGet(void)//操作失败
 
 
  }
  }
 
 
-/************************************
-*亮度控制功能
-*函数名:Jz_LampLumenControlFeature
-*函数参数:
-          @value1: 左灯亮度(十进制) 0~100
-          @value2: 右灯亮度(十进制) 0~100
-*返回值：
-*函数作者：wzy
-*************************************/
-void JZ_LampLumenControlFeature(uint8_t value1,uint8_t value2)
-{  
-   int value = 0;
-   Jz_LampLumenControl(value1,value2);
-   value = value1 > value2 ? value1 : value2;           
-   tempData->InputLumen = value;//改变温控输入亮度
-   JZ_LightSetInitialLumen(value);//改变设置的亮度初值
-   tempControlFlag = TEMP_NOTTRIGGER;//防止温度跳回去
-}
-
-/************************************
-*云台控制功能
-*函数名:Jz_LampGimbalControlFeature
-*函数参数:
-          @value: 从飞机得到的云台角度
-*返回值：
-*函数作者：wzy
-*************************************/
-void Jz_LampGimbalControlFeature(int value)
-{
-   if(value <= 0)
-   {
-   int angle = -value;
-   Jz_Lamp_Gimbal_Control(angle);
-   }
-}

@@ -47,8 +47,7 @@ void JZ_LampGimbalAngleGet(void);//获取云台角度
 void JZ_SelectPoliceLampColor(uint8_t color1,uint8_t color2);//选择警灯颜色
 void JZ_SelectPoliceLampColor(uint8_t color1,uint8_t color2);//选择警灯颜色
 void JZ_SelectPoliceLampMode(uint8_t value,uint8_t mode);//警灯模式选择
 void JZ_SelectPoliceLampMode(uint8_t value,uint8_t mode);//警灯模式选择
 void JZ_LampModeGet(void);
 void JZ_LampModeGet(void);
-void JZ_LampLumenControlFeature(uint8_t value1,uint8_t value2);
-void Jz_LampGimbalControlFeature(int value);
+
 #ifdef __cplusplus
 #ifdef __cplusplus
 }
 }
 #endif
 #endif

 /* Includes ------------------------------------------------------------------*/
 /* Includes ------------------------------------------------------------------*/
 #include "JZ_speaker.h"
 #include "JZ_speaker.h"
+#include "JZ_lamp.h"
 #include "music.h"
 #include "music.h"
 #include "JZ_TempControl.h"
 #include "JZ_TempControl.h"
 #include <unistd.h>
 #include <unistd.h>
@@ -12,6 +13,8 @@ extern int tts_add;
 extern int tts_tone;
 extern int tts_tone;
 extern int tts_speed;
 extern int tts_speed;
 extern int readyflag;//喊话器准备就绪标志
 extern int readyflag;//喊话器准备就绪标志
+extern int tempControlFlag;
+extern TempControlData *tempData;//温度控制数据
 /* Private functions declaration ---------------------------------------------*/
 /* Private functions declaration ---------------------------------------------*/
 
 
 /* Exported functions definition ---------------------------------------------*/
 /* Exported functions definition ---------------------------------------------*/
@@ -126,4 +129,49 @@ int JZ_TtsPlayFeature(int len,char* data)
         TTS(tts_tone,100,tts_speed,len,data);
         TTS(tts_tone,100,tts_speed,len,data);
     }       
     }       
    	
    	
+}
+
+/************************************
+*亮度控制功能
+*函数名:Jz_LampLumenControlFeature
+*函数参数:
+          @value1: 左灯亮度(十进制) 0~100
+          @value2: 右灯亮度(十进制) 0~100
+*返回值：
+*函数作者：wzy
+*************************************/
+void JZ_LampLumenControlFeature(uint8_t value1,uint8_t value2)
+{  
+   int value = 0;
+   
+   if(value1 > value2)
+   {
+      value = value1;
+   }
+   else
+   {
+      value = value2;
+   }
+  // value = value1 > value2 ? value1 : value2;           
+   tempData->InputLumen = value;//改变温控输入亮度
+   JZ_LightSetInitialLumen(value);//改变设置的亮度初值
+   tempControlFlag = TEMP_NOTTRIGGER;//防止温度跳回去
+   Jz_LampLumenControl(value1,value2);//控制探照灯亮度
+}
+
+/************************************
+*云台控制功能
+*函数名:Jz_LampGimbalControlFeature
+*函数参数:
+          @value: 从飞机得到的云台角度
+*返回值：
+*函数作者：wzy
+*************************************/
+void Jz_LampGimbalControlFeature(int value)
+{
+   if(value <= 0)
+   {
+   int angle = -value;
+   Jz_Lamp_Gimbal_Control(angle);
+   }
 }
 }

@@ -12,10 +12,11 @@ extern "C" {
 /* Exported types ------------------------------------------------------------*/
 /* Exported types ------------------------------------------------------------*/
 
 
 /* Exported functions --------------------------------------------------------*/
 /* Exported functions --------------------------------------------------------*/
-void JZ_SpeechSpeedControlFeature(uint8_t speed);
-int JZ_TtsPlayFeature(int len,char* data);
-void JZ_TtsToneColorFeature(uint8_t tone);
-
+void JZ_SpeechSpeedControlFeature(uint8_t speed);//文本喊话语速控制功能
+int JZ_TtsPlayFeature(int len,char* data);//文本播放功能
+void JZ_TtsToneColorFeature(uint8_t tone);//文本喊话音色控制功能
+void JZ_LampLumenControlFeature(uint8_t value1,uint8_t value2);//亮度控制功能
+void Jz_LampGimbalControlFeature(int value);
 #ifdef __cplusplus
 #ifdef __cplusplus
 }
 }
 #endif
 #endif

@@ -281,11 +281,14 @@ static T_UAVReturnCode StopPlay(void)
 }
 }
 
 
 static T_UAVReturnCode SetVolume(uint8_t volume)
 static T_UAVReturnCode SetVolume(uint8_t volume)
-{
-  s_speakerState.volume = volume;
+{ 
+  LOG_INFO("Set 文本 volume: {}", volume*81/100*255/100);
+
   
   
+  s_speakerState.volume = volume;
   set_volume(volume);
   set_volume(volume);
-  LOG_INFO("Set widget speaker volume: {}", volume);  
+  LOG_INFO("Set widget speaker volume: {}", volume);
+  
   return UAV_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
   return UAV_ERROR_SYSTEM_MODULE_CODE_SUCCESS;
 }
 }
 
 

@@ -339,11 +339,11 @@ void set_volume(int value)//设置音é‡ï¼ŒéŸ³é‡0-100，默认音é‡value==10ã€
 	}
 	}
 	else if(value>=100)
 	else if(value>=100)
 	{
 	{
-		value = 83*255/100;
+		value = 80*255/100;
 	}
 	}
 	else
 	else
 	{   
 	{   
-		value = value*83/100*255/100;
+		value = value*80/100*255/100;
 	}
 	}
 
 
 	set_volume_value = value;
 	set_volume_value = value;
@@ -369,10 +369,10 @@ void set_ture_volume(int value)//设置文本喊è¯éŸ³é‡
 		value=0;
 		value=0;
 	}
 	}
 	else if(value>=100){
 	else if(value>=100){
-		value=84*255/100;
+		value=81*255/100;
 	}
 	}
 	else if(value>0&&value<100){
 	else if(value>0&&value<100){
-		value=value*84/100*255/100;
+		value=value*81/100*255/100;
 	}
 	}
 	set_volume_value = value;
 	set_volume_value = value;
 	if(set_volume_flag==0){
 	if(set_volume_flag==0){