|
@@ -1573,30 +1573,27 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
struct timeval tv;
|
|
struct timeval tv;
|
|
|
gettimeofday(&tv, NULL);
|
|
gettimeofday(&tv, NULL);
|
|
|
device_status.photo_stamp = tv.tv_sec-8*3600;
|
|
device_status.photo_stamp = tv.tv_sec-8*3600;
|
|
|
- ctr_led(ON);
|
|
|
|
|
|
|
+ if(photo_led_sec==900)
|
|
|
|
|
+ ctr_led(ON);
|
|
|
//打开补光灯
|
|
//打开补光灯
|
|
|
- if(photo_led_sec==300&&device_status.version_type==48)
|
|
|
|
|
|
|
+ if(photo_led_sec==800)
|
|
|
{
|
|
{
|
|
|
- DTU_Write("takephoto.mp3");
|
|
|
|
|
- //延时
|
|
|
|
|
- rt_thread_delay(1000);
|
|
|
|
|
LOG_I("测试拍照!");
|
|
LOG_I("测试拍照!");
|
|
|
- Hk_Take_io();
|
|
|
|
|
|
|
+ #if 1
|
|
|
char *takephotojson = makeJson_takephoto();
|
|
char *takephotojson = makeJson_takephoto();
|
|
|
DTU_Write("%s",takephotojson);
|
|
DTU_Write("%s",takephotojson);
|
|
|
rt_free(takephotojson);
|
|
rt_free(takephotojson);
|
|
|
|
|
+ #endif
|
|
|
|
|
+ rt_thread_delay(5000); //延时
|
|
|
}
|
|
}
|
|
|
//15S后执行拍照
|
|
//15S后执行拍照
|
|
|
- else if (photo_led_sec==750&&device_status.version_type!=48)
|
|
|
|
|
|
|
+ else if (photo_led_sec==750)
|
|
|
{
|
|
{
|
|
|
DTU_Write("takephoto.mp3");
|
|
DTU_Write("takephoto.mp3");
|
|
|
//延时
|
|
//延时
|
|
|
rt_thread_delay(1000);
|
|
rt_thread_delay(1000);
|
|
|
LOG_I("测试拍照!");
|
|
LOG_I("测试拍照!");
|
|
|
Hk_Take_io();
|
|
Hk_Take_io();
|
|
|
- char *takephotojson = makeJson_takephoto();
|
|
|
|
|
- DTU_Write("%s",takephotojson);
|
|
|
|
|
- rt_free(takephotojson);
|
|
|
|
|
}
|
|
}
|
|
|
photo_led_sec--;
|
|
photo_led_sec--;
|
|
|
if(photo_led_sec==300) //
|
|
if(photo_led_sec==300) //
|
|
@@ -1607,13 +1604,8 @@ static void Ctr_Mortor_entry(void* parameter)
|
|
|
HMI_WRITE("sysTest.switchPhoto.val=0");
|
|
HMI_WRITE("sysTest.switchPhoto.val=0");
|
|
|
HMI_WRITE("sysTest.switchFill.val=0");
|
|
HMI_WRITE("sysTest.switchFill.val=0");
|
|
|
}
|
|
}
|
|
|
-// else if (photo_led_sec==0&&device_status.version_type!=48) {
|
|
|
|
|
-// ctr_led(OFF);
|
|
|
|
|
-// photo_led_sec = 900;
|
|
|
|
|
-// device_status.photo_ws = 0;
|
|
|
|
|
-// HMI_WRITE("sysTest.switchPhoto.val=0");
|
|
|
|
|
-// HMI_WRITE("sysTest.switchFill.val=0");
|
|
|
|
|
-// }
|
|
|
|
|
|
|
+ }else{
|
|
|
|
|
+ photo_led_sec = 900;
|
|
|
}
|
|
}
|
|
|
/*对焦拍照*/
|
|
/*对焦拍照*/
|
|
|
if(device_status.autotakepic==1)
|
|
if(device_status.autotakepic==1)
|