KB8PMY
/
tinySA
mirror of https://github.com/erikkaashoek/tinySA.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ADF and dot grid

Browse Source
pull/65/head
erikkaashoek 3 years ago
parent 0bf6bb9460
commit 0311f5a09a
5 changed files with 36 additions and 23 deletions
Show Stats Download Patch File Download Diff File

4
nanovna.h
Unescape View File

@ -18,7 +18,7 @@
*/
#include "ch.h"
//#ifdef TINYSA_F303
#ifdef TINYSA_F303
#ifdef TINYSA_F072
#error "Remove comment for #ifdef TINYSA_F303"
#endif
@ -26,7 +26,7 @@
#define TINYSA4
#endif
#define TINYSA4_PROTO
//#endif
#endif
#ifdef TINYSA_F072
#ifdef TINYSA_F303

2
plot.c
Unescape View File

@ -24,7 +24,7 @@
#include "nanovna.h"
#pragma GCC push_options
#pragma GCC optimize ("Og") // Makes the code just a bit faster, disable during debugging.
#pragma GCC optimize ("Os") // Makes the code just a bit faster, disable during debugging.
#ifdef __SCROLL__
uint16_t _grid_y = (CHART_BOTTOM / NGRIDY);

8
sa_core.c
Unescape View File

@ -22,7 +22,7 @@
#pragma GCC push_options
#ifdef TINYSA4
#pragma GCC optimize ("O0")
#pragma GCC optimize ("Os")
#else
#pragma GCC optimize ("Os")
#endif
@ -4286,7 +4286,7 @@ again: // Spur redu
setting.increased_R = false;
if (setting.mode == M_GENLOW) {
if (max2871) {
if (local_modulo == 0) ADF4351_modulo(100);
if (local_modulo == 0) ADF4351_modulo(1000);
ADF4351_R_counter(-1);
} else {
if (local_modulo == 0) ADF4351_modulo(1000);
@ -4296,7 +4296,7 @@ again: // Spur redu
if (max2871)
if (local_modulo == 0) {
if (max2871)
ADF4351_modulo(100);
ADF4351_modulo(4000);
else
ADF4351_modulo(4000);
}
@ -4337,7 +4337,7 @@ again: // Spur redu
if (local_modulo == 0) {
// if (actual_rbw_x10 >= 3000)
if (max2871)
ADF4351_modulo(100);
ADF4351_modulo(4000);
else
ADF4351_modulo(4000);
// else

44
si4468.c
Unescape View File

@ -24,7 +24,7 @@
#include "spi.h"
#pragma GCC push_options
#pragma GCC optimize ("O0")
#pragma GCC optimize ("O2")
//#define __USE_FRR_FOR_RSSI__
@ -345,6 +345,7 @@ static const enum {
#define CS_ADF0_HIGH {palSetLine(LINE_LO_SEL);ADF_CS_DELAY;}
#define CS_ADF0_LOW {palClearLine(LINE_LO_SEL);ADF_CS_DELAY;}
bool ADF4351_dirty = false;
void ADF4351_WriteRegister32(int channel, const uint32_t value)
{
@ -357,7 +358,8 @@ void ADF4351_WriteRegister32(int channel, const uint32_t value)
SPI_WRITE_8BIT(SI4432_SPI, (value >> 16));
SPI_WRITE_8BIT(SI4432_SPI, (value >> 8));
SPI_WRITE_8BIT(SI4432_SPI, (value >> 0));
while (SPI_IS_BUSY(SI4432_SPI)); // drop rx and wait tx
ADF4351_dirty = true;
// while (SPI_IS_BUSY(SI4432_SPI)); // drop rx and wait tx
#else
shiftOut((value >> 24) & 0xFF);
shiftOut((value >> 16) & 0xFF);
@ -365,7 +367,15 @@ void ADF4351_WriteRegister32(int channel, const uint32_t value)
shiftOut((value >> 0) & 0xFF);
#endif
// unselect
CS_ADF0_HIGH;
// CS_ADF0_HIGH;
}
void ADF4351_Latch(void)
{
if (ADF4351_dirty == false)
return;
while (SPI_IS_BUSY(SI4432_SPI)); // drop rx and wait tx
CS_ADF0_HIGH;
}
void sendConfig(void) {
@ -384,28 +394,29 @@ void sendConfig(void) {
if (reg!=reg_5) {ADF4351_WriteRegister32(id, reg); reg_5 = reg;}
// reg 4
// fb rf divider bs divider VCO down mtld aux sel aux en aux pwr rf en rf pwr register 4
// fb rf divider bs divider VCO down mtld aux sel aux en aux pwr rf en rf pwr register 4
reg = (feedbackFromDivided<<23) | (out_div<<20) | (bsDivider<<12) | (powerDown<<11) | (0<<10) | (0<<9) | (auxEnable<<8) | (auxPower<<6) | (rfEnable<<5) | (rfPower<<3) | 0b100;
if (reg!=reg_4) {ADF4351_WriteRegister32(id, reg); reg_4 = reg;}
if (reg!=reg_4) {ADF4351_Latch(); ADF4351_WriteRegister32(id, reg); reg_4 = reg;}
// reg 3
// bscm | csr mutedel clkdiv mode clkdiv register 3
reg = (bscm<<23) | (csr<<18) | (0<<17) | (clkDivMode<<15) | (clkDivDivider<<3) | 0b011;
if (reg!=reg_3) {ADF4351_WriteRegister32(id, reg); reg_3 = reg;}
if (reg!=reg_3) {ADF4351_Latch(); ADF4351_WriteRegister32(id, reg); reg_3 = reg;}
// reg 2 cp three reset
// LD speed noise mode muxout ref dbr ref div2 R DB CP current LDF LDP PD pol powerdown state counter register 2
reg = (LDS<<31) | (noiseMode<<29) | (mux<<26) | (refDouble<<25) | (refDiv2 << 24) | (R<<14) | (0<<13) | (cpCurrent<<9) | (LDF<<8) | (LDP<<7) | (1<<6) | (pdwn<<5) | (0<<4) | (0<<3) | 0b010;
if (reg!=reg_2) {ADF4351_WriteRegister32(id, reg); reg_2 = reg;}
if (reg!=reg_2) {ADF4351_Latch(); ADF4351_WriteRegister32(id, reg); reg_2 = reg;}
// reg 1
// CP mode CP test phase frac modulus
reg = (CP_Mode<<29) | (CP_Test<<27) | (phase<<15) | (modulus<<3) | 0b001;
if (reg!=reg_1) {ADF4351_WriteRegister32(id, reg); reg_1 = reg;}
if (reg!=reg_1) {ADF4351_Latch(); ADF4351_WriteRegister32(id, reg); reg_1 = reg;}
// reg 0 (need always send for apply some reg 1 - 5 settings
reg = (fractional<<31) | (N<<15) | (frac<<3) | 0b000;
/*if (reg!=reg_0)*/ {ADF4351_WriteRegister32(id, reg);/* reg_0 = reg;*/}
/*if (reg!=reg_0)*/ {ADF4351_Latch(); ADF4351_WriteRegister32(id, reg);/* reg_0 = reg;*/}
ADF4351_Latch();
} else {
pdwn = false; //Power down is no longer active.
uint32_t reg;
@ -420,28 +431,29 @@ void sendConfig(void) {
if (reg!=reg_5) {ADF4351_WriteRegister32(id, reg); reg_5 = reg;}
// reg 4
// fb rf divider bs divider VCO down mtld aux sel aux en aux pwr rf en rf pwr register 4
// fb rf divider bs divider VCO down mtld aux sel aux en aux pwr rf en rf pwr register 4
reg = (feedbackFromDivided<<23) | (out_div<<20) | (bsDivider<<12) | (0<<11) | (0<<10) | (0<<9) | (auxEnable<<8) | (auxPower<<6) | (rfEnable<<5) | (rfPower<<3) | 0b100;
if (reg!=reg_4) {ADF4351_WriteRegister32(id, reg); reg_4 = reg;}
if (reg!=reg_4) { ADF4351_Latch(); ADF4351_WriteRegister32(id, reg); reg_4 = reg;}
// reg 3
// csr clkdiv mode clkdiv register 3
reg = (csr<<18) | (clkDivMode<<15) | (clkDivDivider<<3) | 0b011;
if (reg!=reg_3) {ADF4351_WriteRegister32(id, reg); reg_3 = reg;}
if (reg!=reg_3) {ADF4351_Latch(); ADF4351_WriteRegister32(id, reg); reg_3 = reg;}
// reg 2 cp three reset
// noise mode muxout ref dbr ref div2 R DB CP current LDF LDP PD pol powerdown state counter register 2
reg = (noiseMode<<29) | (mux<<26) | (refDouble<<25) | (refDiv2 << 24) | (R<<14) | (0<<13) | (cpCurrent<<9) | (LDF<<8) | (LDP<<7) | (1<<6) | (pdwn<<5) | (0<<4) | (0<<3) | 0b010;
if (reg!=reg_2) {ADF4351_WriteRegister32(id, reg); reg_2 = reg;}
if (reg!=reg_2) {ADF4351_Latch(); ADF4351_WriteRegister32(id, reg); reg_2 = reg;}
// reg 1
// prescaler phase frac modulus
reg = (prescaler<<27) | (phase<<15) | (modulus<<3) | 0b001;
if (reg!=reg_1) {ADF4351_WriteRegister32(id, reg); reg_1 = reg;}
if (reg!=reg_1) {ADF4351_Latch(); ADF4351_WriteRegister32(id, reg); reg_1 = reg;}
// reg 0 (need always send for apply some reg 1 - 5 settings
reg = (N<<15) | (frac<<3) | 0b000;
/*if (reg!=reg_0)*/ {ADF4351_WriteRegister32(id, reg);/* reg_0 = reg;*/}
/*if (reg!=reg_0)*/ {ADF4351_Latch(); ADF4351_WriteRegister32(id, reg);/* reg_0 = reg;*/}
ADF4351_Latch();
}
if (SI4432_SPI_SPEED != ADF_SPI_SPEED)
SPI_BR_SET(SI4432_SPI, SI4432_SPI_SPEED);
@ -453,7 +465,7 @@ void sendPowerdown(bool p) {
return;
pdwn = p;
uint32_t reg = (noiseMode<<29) | (0b001<<26) | (refDouble<<25) | (refDiv2 << 24) | (R<<14) | (cpCurrent<<9) | (0<<8) | (0<<7) | (1<<6) | (pdwn<<5) | 0b010;
if (reg!=reg_2) {ADF4351_WriteRegister32(id, reg); reg_2 = reg;}
if (reg!=reg_2) {ADF4351_WriteRegister32(id, reg); reg_2 = reg;ADF4351_Latch(); }
}

1
ui.c
Unescape View File

@ -4988,6 +4988,7 @@ const menuitem_t menu_mode[] = {
#endif
static const menuitem_t menu_top[] = {
{ MT_ADV_CALLBACK,0, "PAUSE", menu_pause_acb},
{ MT_SUBMENU, 0, "PRESET", menu_load_preset},
{ MT_SUBMENU, 0, "FREQUENCY", menu_stimulus},
{ MT_SUBMENU, 0, "LEVEL", menu_level},

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.