From d4cd5cd689122db394122c5439999534152e53b2 Mon Sep 17 00:00:00 2001 From: Florian Agbuya Date: Mon, 15 Apr 2024 15:28:20 +0800 Subject: [PATCH] fix adc and dac initialization --- fast-servo/pyfastservo/adc.py | 8 +++++--- fast-servo/pyfastservo/dac.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fast-servo/pyfastservo/adc.py b/fast-servo/pyfastservo/adc.py index a3fd106..19072d9 100644 --- a/fast-servo/pyfastservo/adc.py +++ b/fast-servo/pyfastservo/adc.py @@ -19,6 +19,7 @@ import mmap import os +import time import spidev from common import ( @@ -54,13 +55,14 @@ def main_adc_config(test_pattern): spi.open(MAIN_ADC_BUS, MAIN_ADC_DEVICE) spi.max_speed_hz = 50000 spi.mode = 0b00 # CPOL = 0 CPHA = 0 - spi.cshigh = True + spi.cshigh = False # spi.read0 = False spi_buffer = [0x00, 0x80] # reset rx_buffer = [0x00, 0x00] spi.xfer2(spi_buffer) + time.sleep(0.1) # REGISTER A1 spi_buffer = [0x01, 0x20] # set to Two's complement Data Format @@ -121,7 +123,7 @@ def main_adc_test_mode(enable): spi.open(MAIN_ADC_BUS, MAIN_ADC_DEVICE) spi.max_speed_hz = 50000 spi.mode = 0b00 # CPOL = 0 CPHA = 0 - spi.cshigh = True + spi.cshigh = False # spi.read0 = True reg_contents = ( @@ -292,7 +294,7 @@ def adc_aux_read(port, type, pin): spi.open(1, 3) # AUX ADC 1? spi.max_speed_hz = 5000 spi.mode = 0b00 - spi.cshigh = True + spi.cshigh = False read_buffer = spi.xfer2(write_buffer) mu_voltage = read_buffer[0] << 8 | read_buffer[1] >> 2 diff --git a/fast-servo/pyfastservo/dac.py b/fast-servo/pyfastservo/dac.py index 33bf477..19456ca 100644 --- a/fast-servo/pyfastservo/dac.py +++ b/fast-servo/pyfastservo/dac.py @@ -45,7 +45,7 @@ def main_dac_init(): spi.open(MAIN_DAC_BUS, MAIN_DAC_DEVICE) spi.max_speed_hz = 5000 spi.mode = 0b00 # CPOL = 0 CPHA = 0 - spi.cshigh = True + spi.cshigh = False spi_buffer = [0x00, 0x10] # software reset spi.xfer2(spi_buffer)