VSAG/amadeus_26_fb
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
sun
2019-07-23 16:03:16 +08:00
parent e62c53d343 ece612c968
commit 0b7f6e6fd9
20 changed files with 26924 additions and 26919 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
others/include/config/setconfig.h
View File

@@ -12,18 +12,19 @@
#define CAMERA_EXPOSURE (10)
#endif
#ifndef CAMERA_BLUE_GAIN
#define CAMERA_BLUE_GAIN (100)
#ifndef CAMERA_RED_GAIN
#define CAMERA_RED_GAIN (100)
#endif
#ifndef CAMERA_GREEN_GAIN
#define CAMERA_GREEN_GAIN (100)
#define CAMERA_GREEN_GAIN (100)
#endif
#ifndef CAMERA_RED_GAIN
#define CAMERA_RED_GAIN (100)
#ifndef CAMERA_BLUE_GAIN
#define CAMERA_BLUE_GAIN (100)
#endif
#ifndef ARMOR_CAMERA_GAIN
#define ARMOR_CAMERA_GAIN (30)
#endif

7
others/src/camera/camera_wrapper.cpp
View File

@@ -90,19 +90,24 @@ bool CameraWrapper::init() {
float hour = (tv.tv_sec % (3600 * 24)) / 3600.0;
if (6 <= hour && hour < 10) {
gain = 20;
LOGM("Set gain to morning 20");
} else if (10 <= hour && hour < 16) {
gain = 10;
LOGM("Set gain to day 10");
} else if (16 <= hour && hour < 17) {
gain = 20;
LOGM("Set gain to early evening 20");
} else if (17 <= hour && hour < 18) {
gain = 40;
LOGM("Set gain to evening 40");
} else {
gain = 50;
LOGM("Set gain to early night 50");
}
CameraSetAnalogGain(h_camera, gain);
#endif
if (mode == 0) {
CameraSetGain(h_camera, CAMERA_BLUE_GAIN, CAMERA_GREEN_GAIN, CAMERA_RED_GAIN);
CameraSetGain(h_camera, CAMERA_RED_GAIN, CAMERA_GREEN_GAIN, CAMERA_BLUE_GAIN);
CameraSetLutMode(h_camera, LUTMODE_PRESET);
}
#endif