zhunk 1 년 전
부모
커밋
934e411ff5
2개의 변경된 파일과 2개의 추가작업 그리고 23개의 파일을 삭제
  1. 2 9
      Application_cbd_apm32f1/applications/control.h
  2. 0 14
      Application_cbd_apm32f1/applications/dtu_uart2.c

+ 2 - 9
Application_cbd_apm32f1/applications/control.h

@@ -32,16 +32,9 @@
 #define LAMP_CURRENT    400
 #define LAMP_CURRENT    400
 #endif
 #endif
 ////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////
-#if LAMP_EN == 1
-    #define VERSION_HK          "1.(3ledV9).41(HK)"      //4.0海康-三色光源
-    #define VERSION_HK_2000W    "1.3led.40(2000W)"       //水稻
-#else
-    #define VERSION_HK          "2.5.41(HK)"            //4.0海康-1200W
-    #define VERSION_HK_2000W    "2.29.4(2000W)"         //4.0水稻
-#endif
 
 
-#define VERSION_ZP          "2.29.1(ZP)"            //1.0转盘
-#define VERSION_GK          "2.29.1(GK)"            //1.0高空
+#define VERSION_HK          "1.0.0"
+
 
 
 extern rt_event_t event_485_play;
 extern rt_event_t event_485_play;
 
 

+ 0 - 14
Application_cbd_apm32f1/applications/dtu_uart2.c

@@ -738,20 +738,6 @@ char * makeJson()
         return NULL;
         return NULL;
     }
     }
     memset(device_status.driver,0,sizeof(device_status.driver));
     memset(device_status.driver,0,sizeof(device_status.driver));
-    if(device_status.version_type==1)
-    {
-        rt_sprintf(device_status.driver,"%s-%s",VERSION_ZP,device_status.driver_4g);
-    }
-    else if (device_status.version_type==4) {
-        rt_sprintf(device_status.driver,"%s-%s",VERSION_HK_2000W,device_status.driver_4g);
-    }
-    else if (device_status.version_type==41) {
-        rt_sprintf(device_status.driver,"%s-%s",VERSION_HK,device_status.driver_4g);
-    }
-    else if (device_status.version_type==11) {
-        rt_sprintf(device_status.driver,"%s-%s",VERSION_GK,device_status.driver_4g);
-    }
-
 
 
     cJSON * pSubJson = NULL;
     cJSON * pSubJson = NULL;
     pSubJson = cJSON_CreateObject();
     pSubJson = cJSON_CreateObject();