From 8c2e0c47bf9501366808f2482411858c6fcfdb23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Fri, 9 Jul 2021 18:02:58 +0200 Subject: [PATCH] fixed mistakes in STW81200 registers/spi control --- .../SynthEvalBoard/SynthEvalBoard.ioc | 4 +++- .../Device/RegisterAccess/stw81200.cpp | 24 +++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/Software/HelperTools/SynthEvalBoard/SynthEvalBoard.ioc b/Software/HelperTools/SynthEvalBoard/SynthEvalBoard.ioc index 279482f..b4ee683 100644 --- a/Software/HelperTools/SynthEvalBoard/SynthEvalBoard.ioc +++ b/Software/HelperTools/SynthEvalBoard/SynthEvalBoard.ioc @@ -262,10 +262,12 @@ SH.S_TIM2_CH3.ConfNb=1 SH.S_TIM2_CH4.0=TIM2_CH4,PWM Generation4 CH4 SH.S_TIM2_CH4.ConfNb=1 SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_64 +SPI1.CLKPhase=SPI_PHASE_1EDGE +SPI1.CLKPolarity=SPI_POLARITY_LOW SPI1.CalculateBaudRate=1.25 MBits/s SPI1.DataSize=SPI_DATASIZE_8BIT SPI1.Direction=SPI_DIRECTION_2LINES -SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,BaudRatePrescaler,DataSize +SPI1.IPParameters=VirtualType,Mode,Direction,CalculateBaudRate,BaudRatePrescaler,DataSize,CLKPolarity,CLKPhase SPI1.Mode=SPI_MODE_MASTER SPI1.VirtualType=VM_MASTER SPI2.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_64 diff --git a/Software/PC_Application/Device/RegisterAccess/stw81200.cpp b/Software/PC_Application/Device/RegisterAccess/stw81200.cpp index 7994e8b..c852f2e 100644 --- a/Software/PC_Application/Device/RegisterAccess/stw81200.cpp +++ b/Software/PC_Application/Device/RegisterAccess/stw81200.cpp @@ -7,17 +7,17 @@ STW81200::STW81200() currentInput = nullptr; addRegister(new Register("ST0", 0, 26)); - addRegister(new Register("ST0", 1, 26)); - addRegister(new Register("ST2", 2, 26)); - addRegister(new Register("ST3", 3, 26)); - addRegister(new Register("ST4", 4, 26)); - addRegister(new Register("ST5", 5, 26)); - addRegister(new Register("ST6", 6, 26)); - addRegister(new Register("ST7", 7, 26)); - addRegister(new Register("ST8", 8, 26)); - addRegister(new Register("ST9", 9, 26)); - addRegister(new Register("ST10", 10, 26)); - addRegister(new Register("ST11", 11, 26)); + addRegister(new Register("ST0", 1, 27)); + addRegister(new Register("ST2", 2, 27)); + addRegister(new Register("ST3", 3, 27)); + addRegister(new Register("ST4", 4, 27)); + addRegister(new Register("ST5", 5, 27)); + addRegister(new Register("ST6", 6, 27)); + addRegister(new Register("ST7", 7, 27)); + addRegister(new Register("ST8", 8, 27)); + addRegister(new Register("ST9", 9, 27)); + addRegister(new Register("ST10", 10, 27)); + addRegister(new Register("ST11", 11, 27)); ui = new Ui::STW81200Widget; ui->setupUi(widget); @@ -44,7 +44,7 @@ STW81200::STW81200() regs[3]->assignUI(ui->DNSPLIT_EN, 17); regs[3]->assignUI(ui->PFD_DEL_MODE, 15, 2); regs[3]->assignUI(ui->REF_PATH_SEL, 13, 2); - regs[3]->assignUI(ui->R, 0, 12); + regs[3]->assignUI(ui->R, 0, 13); regs[4]->assignUI(ui->RF_OUT_PWR, 23, 3); regs[4]->assignUI(ui->VCO_2V5_MODE, 22);