Merge remote-tracking branch 'origin/master'

This commit is contained in:
sun
2019-07-23 16:03:16 +08:00
20 changed files with 26924 additions and 26919 deletions

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