Merge pull request #100 from CodethinkLabs/benbrewer/dac-offset-zero

tlsa · web-flow · commit 03423216dc34 · 2020-11-12T16:58:46.000Z
Make 2048 the zero value for DAC/OPAMP offset
diff --git a/firmware/src/acq/opamp.h b/firmware/src/acq/opamp.h
@@ -22,6 +22,9 @@
 #include "common/error.h"
 
 
+#define OPAMP_OFFSET_ZERO 2048
+
+
 typedef struct bl_acq_opamp_s bl_acq_opamp_t;
 
 #if (BL_REVISION == 1)
diff --git a/firmware/src/acq/source.c b/firmware/src/acq/source.c
@@ -205,7 +205,7 @@ enum bl_error bl_acq_source_configure(enum bl_acq_source source)
 	bl_acq_source_config_t *config = &src->config;
 
 	bool opamp_needed = (config->opamp_gain > 1) ||
-			(config->opamp_offset != 0);
+			(config->opamp_offset != OPAMP_OFFSET_ZERO);
 	if (opamp_needed && (src->opamp == NULL)) {
 		return BL_ERROR_HARDWARE_CONFLICT;
 	}

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ enum bl_error bl_acq_source_configure(enum bl_acq_source source)`
`205`	`205`	`bl_acq_source_config_t *config = &src->config;`
`206`	`206`
`207`	`207`	`bool opamp_needed = (config->opamp_gain > 1) \|\|`
`208`		`- (config->opamp_offset != 0);`
	`208`	`+ (config->opamp_offset != OPAMP_OFFSET_ZERO);`
`209`	`209`	`if (opamp_needed && (src->opamp == NULL)) {`
`210`	`210`	`return BL_ERROR_HARDWARE_CONFLICT;`
`211`	`211`	`}`