开机启动脚本现在会尝试从github上更新当前分支的最新代码并编译运行。

This commit is contained in:
xinyang
2019-07-02 20:55:20 +08:00
parent 17fe564f98
commit cb6cf4b2fc
6 changed files with 102 additions and 55 deletions

View File

@@ -139,7 +139,7 @@
GetLocalTime(&te); \
LOGM(tag": %dms", (te.wSecond-ts.wSecond)*1000+(te.wMilliseconds-ts.wMilliseconds)); \
}while (0)
#else
#elif defined(Linux)
#include <sys/time.h>
#define CNT_TIME(tag, codes, ...) do{ \
static timeval ts, te; \
@@ -148,7 +148,10 @@
gettimeofday(&te, NULL); \
LOGM(tag": %.1lfms", (te.tv_sec-ts.tv_sec)*1000.0+(te.tv_usec-ts.tv_usec)/1000.0); \
}while (0)
#endif
#else
#warning "Unsupport plantform for CNT_TIME"
#define CNT_TIME(tag, codes, ...) codes
#endif
#else
#define CNT_TIME(tag, codes, ...) codes
#endif

View File

@@ -75,10 +75,10 @@ bool CameraWrapper::init() {
LOGM("successfully loaded %s!", filepath);
#elif defined(Linux)
CameraSetAeState(h_camera, false);
CameraSetExposureTime(h_camera, 8*1000);
CameraSetAnalogGain(h_camera, 16);
CameraSetExposureTime(h_camera, 10*1000);
CameraSetAnalogGain(h_camera, 20);
if(mode == 0){
CameraSetGain(h_camera, 100, 131, 113);
CameraSetGain(h_camera, 100, 130, 112);
CameraSetLutMode(h_camera, LUTMODE_PRESET);
}
#endif