|
|
@@ -669,15 +669,27 @@ char * makeJson()
|
|
|
#if LAMP_EN == 0
|
|
|
LOG_I("Current is:%d",atoi(device_status.power));
|
|
|
if(atoi(device_status.power)>10) //过滤电流检测芯片损坏导致电流直为0 的异常
|
|
|
- device_status.lamp_status = 1;
|
|
|
+ {
|
|
|
+ device_status.lamp_status = 1;
|
|
|
+ }
|
|
|
#endif
|
|
|
+ if(device_status.version_type==11||device_status.version_type==12)
|
|
|
+ {
|
|
|
+ device_status.lamp_status = 0;
|
|
|
+ }
|
|
|
}
|
|
|
else {
|
|
|
device_status.lamp_status = 0;
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
if(atoi(device_status.power)>5000)
|
|
|
+ {
|
|
|
rt_sprintf(device_status.power,"0.01");
|
|
|
-
|
|
|
+ }
|
|
|
makejson_sta = 1;
|
|
|
time_t stamp=time(RT_NULL);
|
|
|
static struct tm tm;
|