aboutsummaryrefslogtreecommitdiff
path: root/fw/adc.h
diff options
context:
space:
mode:
authorjaseg <git@jaseg.net>2018-12-24 19:52:13 +0900
committerjaseg <git@jaseg.net>2018-12-24 19:55:28 +0900
commitc339384cbede3ddf3e88d27229baefd1d42daa86 (patch)
tree1ddb1f7da2afb3ddfca0463cb5fb716e8bdd9c5d /fw/adc.h
parentf5d7b0428db5257d62c080daa2757199c27ef784 (diff)
download8seg-c339384cbede3ddf3e88d27229baefd1d42daa86.tar.gz
8seg-c339384cbede3ddf3e88d27229baefd1d42daa86.tar.bz2
8seg-c339384cbede3ddf3e88d27229baefd1d42daa86.zip
Pimp ADC measurements with voltage means
Diffstat (limited to 'fw/adc.h')
-rw-r--r--fw/adc.h29
1 files changed, 25 insertions, 4 deletions
diff --git a/fw/adc.h b/fw/adc.h
index 9d89cb5..857c334 100644
--- a/fw/adc.h
+++ b/fw/adc.h
@@ -25,6 +25,9 @@ struct adc_measurements {
int16_t adc_temp_celsius_tenths;
int16_t adc_vmeas_a_mv;
int16_t adc_vmeas_b_mv;
+ int16_t adc_mean_a_mv;
+ int16_t adc_mean_b_mv;
+ int16_t adc_mean_diff_mv;
};
enum channel_mask {
@@ -42,14 +45,32 @@ enum sampling_mode {
SAMPLE_FAST = 0
};
+/* The weird order is to match the channels' order in the DMA buffer. Due to some configuration mistake I can't be
+bothered to fix the DMA controller outputs ADC measurements off-by-one into the output buffer. */
+enum adc_channels {
+ VREF_CH,
+ VMEAS_A,
+ VMEAS_B,
+ TEMP_CH,
+ NCH
+};
-extern volatile struct adc_measurements adc_data;
+struct adc_state {
+ enum adc_mode adc_mode;
+ int adc_oversampling;
+ int mean_aggregate_len;
+ int ovs_count; /* oversampling accumulator sample count */
+ uint32_t adc_aggregate[NCH]; /* oversampling accumulator */
+ uint32_t mean_aggregate_ctr;
+ uint32_t mean_aggregator[3];
+};
+
+extern volatile struct adc_state adc_state;
extern volatile uint16_t adc_buf[ADC_BUFSIZE];
-extern enum adc_mode adc_mode;
-extern int adc_oversampling;
+extern volatile struct adc_measurements adc_data;
void adc_init(void);
void adc_configure_scope_mode(uint8_t channel_mask, int sampling_interval_ns);
-void adc_configure_monitor_mode(int oversampling);
+void adc_configure_monitor_mode(int oversampling, int ivl_us, int mean_aggregate_len);
#endif/*__ADC_H__*/