Browse Source

编译优化

yf_zjb 5 năm trước cách đây
mục cha
commit
a961687de0

+ 6 - 0
Application_CBD/applications/control.c

@@ -233,6 +233,12 @@ uint8_t ctr_clear(uint16_t status_clear)
     rt_pin_mode(CLEAR_L, PIN_MODE_OUTPUT);
     rt_pin_mode(CLEAR_R_LIMIT,PIN_MODE_INPUT);
     rt_pin_mode(CLEAR_L_LIMIT,PIN_MODE_INPUT);
+    /*************************************************************/
+    rt_pin_mode(POWER_CLEAR, PIN_MODE_OUTPUT);
+    rt_pin_write(POWER_CLEAR,ON);
+    rt_thread_delay(1000*100);
+    rt_pin_write(POWER_CLEAR,OFF);
+    /************************************************************/
     //停止
     rt_pin_write(CLEAR_R,OFF);
     rt_pin_write(CLEAR_L,OFF);

+ 5 - 4
Application_CBD/applications/control.h

@@ -14,10 +14,10 @@
 
 #include <rtdevice.h>
 
-#define VERSION_HK "1.17.41(HK)"         //版本
-#define VERSION_ZP "1.17.1(ZP)"         //版本
+#define VERSION_HK "1.18.41(HK)"         //版本
+#define VERSION_ZP "1.18.1(ZP)"         //版本
 
-#define CompileTime "20210602"
+#define CompileTime "20210605"
 
 
 /*******************************测试任务****************************************/
@@ -137,7 +137,8 @@ typedef struct{
 //清扫限位
 #define CLEAR_R_LIMIT GET_PIN(C,13)
 #define CLEAR_L_LIMIT GET_PIN(B,9)
-
+//清扫模块
+#define POWER_CLEAR GET_PIN(B,10)
 /***************************高空测报灯*************************/
 
 //上仓门电机限位

+ 1 - 0
Application_CBD/applications/main.c

@@ -39,6 +39,7 @@ static void idle_hook(void);
 /********************************************************************/
 int main(void)
 {
+
     /* 初始化设备 */
     rt_device_init(wdg_dev);
     led_add_device(LED0_PIN);

+ 7 - 0
Application_CBD/readme.md

@@ -153,3 +153,10 @@ RAM:            19072 B               18.62 KB
 #define CompileTime "20210602"
 ## 更新说明
 - 1.0转盘增加延时消抖
+#define VERSION_HK "1.18.41(HK)"         //版本
+#define VERSION_ZP "1.18.1(ZP)"         //版本
+#define CompileTime "20210605"
+## 更新说明
+- 1.开启编译优化
+
+

BIN
Application_GK_CBD/.settings/.rtmenus


+ 25 - 5
Application_GK_CBD/applications/control.c

@@ -707,8 +707,15 @@ void WorkCheck(void)
                 //如果当前时间大于开始时间且小于结束时间,且没有开始工作
                 if((difftime(mktime(&nowtime), mktime(&starttime)) >=0) && (difftime(mktime(&nowtime),mktime(&endtime))<0))
                 {
-                    rt_kprintf("当前时间大于开始时间,小于结束时间,工作中!!!\n");
-                    device_status.work_status = 1;
+                    if(device_status.sun_status==0)
+                    {
+                        rt_kprintf("当前时间大于开始时间,小于结束时间,工作中!!!\n");
+                        device_status.work_status = 1;
+                    }
+                    else {
+                        device_status.work_status = 0;
+                        rt_kprintf("当前时间大于开始时间,小于结束时间,光控中!!!\n");
+                    }
                 }
                 //如果当前时间小于开始时间
                 else if(difftime(mktime(&nowtime),mktime(&starttime))<0)
@@ -751,8 +758,15 @@ void WorkCheck(void)
                     endtime.tm_hour = device_status.stopBar-8;  //这里需减8用于时区转换
                     endtime.tm_min = 0;
                     endtime.tm_sec = 0;
-                    device_status.work_status = 1;
-                    rt_kprintf("当前前时间大于开始时间,且没有开始工作\n");
+                    if(device_status.sun_status==0)
+                    {
+                        device_status.work_status = 1;
+                        rt_kprintf("当前前时间大于开始时间,且没有开始工作\n");
+                    }
+                    else {
+                        device_status.work_status = 0;
+                        rt_kprintf("当前前时间大于开始时间,且没有开始工作,光控!!!\n");
+                    }
                 }
                 //当前时间小于开始时间
                 else if ((difftime(mktime(&nowtime), mktime(&starttime)) < 0))
@@ -766,7 +780,13 @@ void WorkCheck(void)
                     if(difftime(mktime(&nowtime),mktime(&endtime)) < 0)
                     {
                         rt_kprintf("当前时间大于开始时间,且没有开始工作,当前时间小于结束时间的情况:计算工作时间:从当前时间工作第二天的结束时间\n");
-                        device_status.work_status = 1;
+                        if(device_status.sun_status==0)
+                        {
+                            device_status.work_status = 1;
+                        }
+                        else {
+                            device_status.work_status = 0;
+                        }
                     }
                     else
                     {

+ 2 - 1
Application_GK_CBD/applications/control.h

@@ -15,8 +15,9 @@
 #include <rtdevice.h>
 #define VERSION_HK "1.14.41(HK)"         //版本
 #define VERSION_ZP "1.14.1(ZP)"         //版本
+#define VERSION "1.0.3(GK)"
 
-#define CompileTime "20210525"
+#define CompileTime "20210604"
 
 /*******************************测试任务****************************************/
 /*********************************************************************/

+ 11 - 4
Application_GK_CBD/applications/hmi.c

@@ -580,10 +580,10 @@ static void HMI_Decode(char *cmd,uint8_t cmd_len)
 static void Ctr_Mortor_entry(void* parameter)
 {
    rt_uint32_t limit_current = 2000;     //推杆电机限制电流1A
-   static rt_uint16_t num_up_open = 1000;    //20s
-   static rt_uint16_t num_up_close = 1000;   //
-   static rt_uint16_t num_down_open = 1000;  //
-   static rt_uint16_t num_down_close = 1000;  //
+   static rt_uint16_t num_up_open = 800;    //20s
+   static rt_uint16_t num_up_close = 800;   //
+   static rt_uint16_t num_down_open = 800;  //
+   static rt_uint16_t num_down_close = 800;  //
    static rt_uint16_t photo_led_sec = 300;  //45S
    //上限位
    rt_pin_mode(CTR_UPO_LIMIT,PIN_MODE_INPUT);
@@ -1085,6 +1085,13 @@ void app_partion_backup(void)
                             }
             }
 }
+void get_uid(rt_uint32_t* UID)
+{
+    UID[0] = (rt_uint32_t)(READ_REG(*((rt_uint32_t*)UID_BASE)));
+    UID[1] = (rt_uint32_t)(READ_REG(*((rt_uint32_t*)(UID_BASE + 4U))));
+    UID[2] = (rt_uint32_t)(READ_REG(*((rt_uint32_t*)(UID_BASE + 8U))));
+    rt_kprintf("Read stm32f103 uid:%s",UID);
+}
 void Debug_log_ON(void)
 {
     rt_console_set_device("uart4");

+ 0 - 58
Application_GK_CBD/packages/cJSON-latest/cJSON_util.c

@@ -1,58 +0,0 @@
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <rtthread.h>
-
-#include "cJSON.h"
-#include "cJSON_util.h"
-
-void cJSON_free(void *ptr)
-{
-    rt_free(ptr);
-}
-
-const char * cJSON_item_get_string(cJSON *object, const char *item_name)
-{
-    cJSON *item;
-
-    item = cJSON_GetObjectItem(object, item_name);
-
-    if(!item)
-        return 0;
-
-    if( (item->type != cJSON_String) && (item->type != cJSON_Array) )
-        return 0;
-
-    if(item->type == cJSON_Array)
-        return item->child->valuestring; // TODO
-
-    return item->valuestring;
-}
-
-int cJSON_item_get_number(cJSON *object, const char *item_name, int * result)
-{
-    cJSON *item;
-
-    item = cJSON_GetObjectItem(object, item_name);
-
-    if(!item)
-        return -1;
-
-    if(item->type != cJSON_Number)
-        return -1;
-
-    if(result)
-        *result = item->valueint;
-
-    return 0;
-}
-
-void cJSON_AddInteger2StringToObject(cJSON *object, const char *name, int i)
-{
-    char str_buf[10+2];
-
-    sprintf(str_buf, "%d", i);
-    cJSON_AddStringToObject(object, name, str_buf);
-}

+ 0 - 25
Application_GK_CBD/packages/cJSON-latest/cJSON_util.h

@@ -1,25 +0,0 @@
-#ifndef __CJSON_UTIL_INCLUDE__
-#define __CJSON_UTIL_INCLUDE__
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-#include "cJSON.h"
-
-extern void cJSON_free(void *ptr);
-
-extern const char * cJSON_item_get_string(cJSON *object,const char *string);
-extern int cJSON_item_get_number(cJSON *object, const char *item_name, int * result);
-extern void cJSON_AddInteger2StringToObject(cJSON *object, const char *name, int i);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __CJSON_UTIL_INCLUDE__ */

+ 1 - 1
CBD_FOTA_BootLoader/makefile.targets

@@ -4,4 +4,4 @@ clean2:
 	-@echo ' '
 
 
-*.elf: $(wildcard E:/WorkSpace/IOT_CBD_BZY_CTRL/CBD_FOTA_BootLoader/linkscripts/STM32F103RE/link.lds)
+*.elf: $(wildcard D:/RT-ThreadStudio/workspace/IOT_CBD_BZY_CTRL/CBD_FOTA_BootLoader/linkscripts/STM32F103RE/link.lds)