From 91a88f978e06e75f974459b4ef4958b3343b2bf9 Mon Sep 17 00:00:00 2001 From: Aleksa <abjelogr@uwaterloo.ca> Date: Sun, 6 Feb 2022 14:15:34 -0500 Subject: [PATCH] Some register fixes, still stalls on read with ThunderScope board though --- Software/libthunderscopehw/library/thunderscopehw_adc.c | 2 +- Software/libthunderscopehw/library/thunderscopehw_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Software/libthunderscopehw/library/thunderscopehw_adc.c b/Software/libthunderscopehw/library/thunderscopehw_adc.c index 89ea7803..03709be8 100644 --- a/Software/libthunderscopehw/library/thunderscopehw_adc.c +++ b/Software/libthunderscopehw/library/thunderscopehw_adc.c @@ -25,7 +25,7 @@ enum ThunderScopeHWStatus thunderscopehw_configure_adc(struct ThunderScopeHW* ts THUNDERSCOPEHW_RUN(adc_power(ts, false)); // invert channels - THUNDERSCOPEHW_RUN(adc_set_reg(ts, THUNDERSCOPEHW_ADC_REG_INVERT, 0x0074)); + THUNDERSCOPEHW_RUN(adc_set_reg(ts, THUNDERSCOPEHW_ADC_REG_INVERT, 0x007F)); // Adjust full scale value THUNDERSCOPEHW_RUN(adc_set_reg(ts, THUNDERSCOPEHW_ADC_REG_FS_CNTRL, 0x0010)); diff --git a/Software/libthunderscopehw/library/thunderscopehw_private.h b/Software/libthunderscopehw/library/thunderscopehw_private.h index 4820a0df..4de3a98a 100644 --- a/Software/libthunderscopehw/library/thunderscopehw_private.h +++ b/Software/libthunderscopehw/library/thunderscopehw_private.h @@ -102,7 +102,7 @@ enum ThunderScopeHWAdcRegister { THUNDERSCOPEHW_ADC_REG_CHNUM_CLKDIV = 0x31, THUNDERSCOPEHW_ADC_REG_GAIN_CFG = 0x33, THUNDERSCOPEHW_ADC_REG_INSEL12 = 0x3A, - THUNDERSCOPEHW_ADC_REG_INSEL34 = 0x3A, + THUNDERSCOPEHW_ADC_REG_INSEL34 = 0x3B, THUNDERSCOPEHW_ADC_REG_FS_CNTRL = 0x55, }; enum ThunderScopeHWStatus thunderscopehw_adc_set_reg(struct ThunderScopeHW* ts, enum ThunderScopeHWAdcRegister reg, uint16_t value);