|
@@ -761,7 +761,7 @@ char * makeJson()
|
|
|
{
|
|
{
|
|
|
rt_sprintf(device_status.driver,"%s-%s",VERSION_ZP,device_status.driver_4g);
|
|
rt_sprintf(device_status.driver,"%s-%s",VERSION_ZP,device_status.driver_4g);
|
|
|
}
|
|
}
|
|
|
- else if (device_status.version_type==4) {
|
|
|
|
|
|
|
+ else if (device_status.version_type==4|| device_status.version_type==42 ||device_status.version_type==43) {
|
|
|
rt_sprintf(device_status.driver,"%s-%s",VERSION_HK_2000W,device_status.driver_4g);
|
|
rt_sprintf(device_status.driver,"%s-%s",VERSION_HK_2000W,device_status.driver_4g);
|
|
|
}
|
|
}
|
|
|
else if (device_status.version_type==41) {
|
|
else if (device_status.version_type==41) {
|
|
@@ -781,9 +781,7 @@ char * makeJson()
|
|
|
else if (device_status.version_type==7) {
|
|
else if (device_status.version_type==7) {
|
|
|
rt_sprintf(device_status.driver,"%s-%s",VERSION_BZY,device_status.driver_4g);
|
|
rt_sprintf(device_status.driver,"%s-%s",VERSION_BZY,device_status.driver_4g);
|
|
|
}
|
|
}
|
|
|
- else if (device_status.version_type==42) {
|
|
|
|
|
- rt_sprintf(device_status.driver,"%s-%s",VERSION_HK_2000W,device_status.driver_4g);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
if(device_status.sensor_485_sta!=0)
|
|
if(device_status.sensor_485_sta!=0)
|
|
|
{
|
|
{
|
|
|
if(strstr(device_status.driver,"485")==RT_NULL)
|
|
if(strstr(device_status.driver,"485")==RT_NULL)
|