diff --git a/cmd/camera.c b/cmd/camera.c index b8b2a09..051fdf5 100644 --- a/cmd/camera.c +++ b/cmd/camera.c @@ -109,11 +109,11 @@ int camera_set_params(camera_t *camera) { device_set_fps(camera->camera, camera->options.fps); - DEVICE_SET_OPTION(camera->camera, EXPOSURE, 2684); - DEVICE_SET_OPTION(camera->camera, ANALOGUE_GAIN, 938); - DEVICE_SET_OPTION(camera->camera, DIGITAL_GAIN, 512); - DEVICE_SET_OPTION(camera->camera, VBLANK, 1636); - DEVICE_SET_OPTION(camera->camera, HBLANK, 6906); + // DEVICE_SET_OPTION(camera->camera, EXPOSURE, 2684); + // DEVICE_SET_OPTION(camera->camera, ANALOGUE_GAIN, 938); + // DEVICE_SET_OPTION(camera->camera, DIGITAL_GAIN, 512); + // DEVICE_SET_OPTION(camera->camera, VBLANK, 1636); + // DEVICE_SET_OPTION(camera->camera, HBLANK, 6906); DEVICE_SET_OPTION2(camera->codec_jpeg, JPEG, COMPRESSION_QUALITY, 80); diff --git a/cmd/camera_isp.c b/cmd/camera_isp.c index bfd741a..1f93086 100644 --- a/cmd/camera_isp.c +++ b/cmd/camera_isp.c @@ -48,9 +48,9 @@ int camera_configure_isp(camera_t *camera, float high_div, float low_div) return -1; } - DEVICE_SET_OPTION(camera->isp_srgb, RED_BALANCE, 2120); - DEVICE_SET_OPTION(camera->isp_srgb, BLUE_BALANCE, 1472); - DEVICE_SET_OPTION(camera->isp_srgb, DIGITAL_GAIN, 1007); + // DEVICE_SET_OPTION(camera->isp_srgb, RED_BALANCE, 2120); + // DEVICE_SET_OPTION(camera->isp_srgb, BLUE_BALANCE, 1472); + // DEVICE_SET_OPTION(camera->isp_srgb, DIGITAL_GAIN, 1007); link_t *links = camera->links; diff --git a/opts/log.c b/opts/log.c index 122962d..3a4f2dd 100644 --- a/opts/log.c +++ b/opts/log.c @@ -24,7 +24,7 @@ strstrn(const char *s, const char *find, size_t len) bool filter_log(const char *filename) { if (!log_options.filter[0]) - return true; + return false; const char *ptr = log_options.filter; do { diff --git a/opts/log.h b/opts/log.h index 909c6f3..3c8d375 100644 --- a/opts/log.h +++ b/opts/log.h @@ -23,5 +23,5 @@ bool filter_log(const char *filename); #define E_LOG_ERROR(dev, _msg, ...) do { fprintf(stderr, "%s: %s: " _msg "\n", __FILENAME__, dev_name(dev), ##__VA_ARGS__); goto error; } while(0) #define E_LOG_PERROR(dev, _msg, ...) do { fprintf(stderr, "%s: %s: " _msg "\n", __FILENAME__, dev_name(dev), ##__VA_ARGS__); exit(-1); } while(0) #define E_LOG_INFO(dev, _msg, ...) do { fprintf(stderr, "%s: %s: " _msg "\n", __FILENAME__, dev_name(dev), ##__VA_ARGS__); } while(0) -#define E_LOG_VERBOSE(dev, _msg, ...) do { if ((log_options.debug || log_options.verbose) && filter_log(__FILENAME__)) { fprintf(stderr, "%s: %s: " _msg "\n", __FILENAME__, dev_name(dev), ##__VA_ARGS__); } } while(0) -#define E_LOG_DEBUG(dev, _msg, ...) do { if (log_options.debug && filter_log(__FILENAME__)) { fprintf(stderr, "%s: %s: " _msg "\n", __FILENAME__, dev_name(dev), ##__VA_ARGS__); } } while(0) +#define E_LOG_VERBOSE(dev, _msg, ...) do { if (log_options.debug || log_options.verbose || filter_log(__FILENAME__)) { fprintf(stderr, "%s: %s: " _msg "\n", __FILENAME__, dev_name(dev), ##__VA_ARGS__); } } while(0) +#define E_LOG_DEBUG(dev, _msg, ...) do { if (log_options.debug || filter_log(__FILENAME__)) { fprintf(stderr, "%s: %s: " _msg "\n", __FILENAME__, dev_name(dev), ##__VA_ARGS__); } } while(0)