STS bug 修改。。

truing_control/STS/HARDWARE/R_Led/R_Led.c

@@ -92,13 +92,19 @@ void show_wanning_led(void)
 				if(data->m_data.input_wanning.waning[0] != 0)
 				{
 					value |= POWER_R1_Y;
-					value |= POWER_R2_G;
+					//value |= POWER_R2_G;
+				}else
+				{
+					value |= POWER_R1_G;
 				}
 				if(data->m_data.input_wanning.waning[1] != 0)
 				{
 					value |= POWER_R2_Y;
-					value |= POWER_R1_G;
-				}				
+					//value |= POWER_R1_G;
+				}else
+				{
+					value |= POWER_R2_G;
+				}
 			}
 
 		}else
@@ -106,6 +112,15 @@ void show_wanning_led(void)
 			if(data->m_data.input_status.input_status[0] == 0)
 			{
 				value |=POWER_R1_R;
+				if(data->m_data.input_status.input_status[1] == 1)
+				{
+					if(data->m_data.input_wanning.waning[1] != 0)
+					{
+						value |= POWER_R2_Y;
+					}else
+						value |=POWER_R2_G;
+				
+				}
 				if(data->m_data.input_wanning.waning[0] != 0)
 				{
 					value |= POWER_R1_Y;
@@ -114,6 +129,14 @@ void show_wanning_led(void)
 			if(data->m_data.input_status.input_status[1] == 0)
 			{
 				value |=POWER_R2_R;
+				if(data->m_data.input_status.input_status[0] == 1)
+				{
+					if(data->m_data.input_wanning.waning[0] != 0)
+					{
+						value |= POWER_R1_Y;
+					}else
+						value |=POWER_R1_G;
+				}
 				if(data->m_data.input_wanning.waning[1] != 0)
 				{
 					value |= POWER_R2_Y;

truing_control/STS/HARDWARE/Temprature/Temprature.c

@@ -28,7 +28,7 @@ static float get_temp(void);
 
 #define R_HOT(ad) ((V_HOT(ad)*10000.0) / ((VREF/10.0)-(2.0*V_HOT(ad))))
 
-#define T_TEMP(res) ((662.666 - (45.389 * log(res)) + (0.069 * log(res)*log(res)*log(res))) - 273.15)
+#define T_TEMP(res) ((662.7481 - (45.40407 * log(res)) + (0.06895 * log(res)*log(res)*log(res))) - 273.15)
 
 //static uint32_t gather_count = 0;
 
@@ -55,7 +55,6 @@ static float get_temp(void)
 		if(((uint32_t)res)>=598 && ((uint32_t)res) <= 197000)
 		{
 					data->m_data.temprature_flag  = TEMP_ONLINE;
-					temprature -= 5;
 					data->m_data.temprature = temprature * 100;
 		}else
 		{

truing_control/STS/PRJ/test.py

@@ -1,41 +1,41 @@
 import numpy as np
 from scipy.optimize import curve_fit
-# NXFT15XH103
+# NXFT18XH103F05RL
 data = np.array([
-[-40,197338],
-[-35,149395],
-[-30,114345],
-[-25,88381],
-[-20,68915],
-[-15,54166],
-[-10,42889],
-[-5,34196],
-[0,27445],
-[5,22165],
-[10,18010],
-[15,14720],
-[20,12099],
+[-40,195652],
+[-35,148171],
+[-30,113347],
+[-25,87559],
+[-20,68237],
+[-15,53650],
+[-10,42506],
+[-5,33892],
+[0,27219],
+[5,22021],
+[10,17926],
+[15,14674],
+[20,12081],
 [25,10000],
-[30,8309],
-[35,6939],
-[40,5824],
-[45,4911],
-[50,4160],
-[55,3539],
-[60,3024],
-[65,2593],
-[70,2233],
-[75,1929],
-[80,1673],
-[85,1455],
-[90,1270],
-[95,1112],
-[100,976],
-[105,860],
-[110,759],
-[115,673],
-[120,598],
-[125,532],
+[30,8315],
+[35,6948],
+[40,5834],
+[45,4917],
+[50,4161],
+[55,3535],
+[60,3014],
+[65,2586],
+[70,2228],
+[75,1925],
+[80,1669],
+[85,1452],
+[90,1268],
+[95,1110],
+[100,974],
+[105,858],
+[110,758],
+[115,672],
+[120,596],
+[125,531],
 ])
 
 T_K = data[:, 0] + 273.15