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

MAX2871

Browse Source
pull/71/head
erikkaashoek 3 years ago
parent 178aaa4c86
commit dd97453ceb
4 changed files with 62 additions and 45 deletions
Show Stats Download Patch File Download Diff File

7
nanovna.h
Unescape View File

@ -18,7 +18,7 @@
*/ */
#include "ch.h" #include "ch.h"
#ifdef TINYSA_F303 //#ifdef TINYSA_F303
#ifdef TINYSA_F072 #ifdef TINYSA_F072
#error "Remove comment for #ifdef TINYSA_F303" #error "Remove comment for #ifdef TINYSA_F303"
#endif #endif
@ -26,7 +26,7 @@
#define TINYSA4 #define TINYSA4
#endif #endif
#define TINYSA4_PROTO #define TINYSA4_PROTO
#endif //#endif
#ifdef TINYSA_F072 #ifdef TINYSA_F072
#ifdef TINYSA_F303 #ifdef TINYSA_F303
@ -53,7 +53,7 @@
#define __ADF4351__ #define __ADF4351__
#define __NEW_SWITCHES__ #define __NEW_SWITCHES__
#define __ULTRA_OUT__ // Use ADF output over LOW out #define __ULTRA_OUT__ // Use ADF output over LOW out
//#define __SI5351__ #define __SI5351__
#endif #endif
#define __PE4302__ #define __PE4302__
//#define __SIMULATION__ //#define __SIMULATION__
@ -1547,6 +1547,7 @@ void save_to_sd(int mask);
void drawMessageBox(const char *header, char *text, uint32_t delay); void drawMessageBox(const char *header, char *text, uint32_t delay);
bool isFullScreenMode(void); bool isFullScreenMode(void);
int btn_side(void); int btn_side(void);
extern int si5351_available;
// Irq operation process set // Irq operation process set
#define OP_NONE 0x00 #define OP_NONE 0x00

2
si4432.h
Unescape View File

@ -179,7 +179,7 @@ void ADF4350_shift_ref(int f);
//void ADF4351_enable(int s); //void ADF4351_enable(int s);
//void ADF4351_enable_aux_out(int s); //void ADF4351_enable_aux_out(int s);
extern int si5351_available;
#endif #endif
#ifdef __SI4463__ #ifdef __SI4463__

96
si4468.c
Unescape View File

@ -251,6 +251,40 @@ bool PE4302_Write_Byte(unsigned char DATA )
//------------------------------- ADF4351 ------------------------------------- //------------------------------- ADF4351 -------------------------------------
//#define SI5351_INITIAL_FREQ 3206896551
//#define SI5351_INITIAL_FREQ 15000000000ULL
#define SI5351_INITIAL_FREQ 3000000000ULL
freq_t local_setting_frequency_30mhz_x100 = SI5351_INITIAL_FREQ;
#ifdef __SI5351__
#include "si5351.h"
static int shifted = -2;
#define SHIFT_MUL 31
#define SHIFT_DIV 29
#define SHIFT_FACTOR 100000
void ADF4350_shift_ref(int f) {
if (f == shifted)
return;
shifted = true;
if (shifted) {
local_setting_frequency_30mhz_x100 = (local_setting_frequency_30mhz_x100 * SHIFT_MUL) / SHIFT_DIV;
} else
local_setting_frequency_30mhz_x100 = SI5351_INITIAL_FREQ; //config.setting_frequency_30mhz;
if (si5351_available && shifted)
si5351_set_int_mul_div(0, SHIFT_MUL, SHIFT_DIV, 0);
else
si5351_set_int_mul_div(0, 30, 30, 0);
ADF4351_recalculate_PFDRFout();
}
#else
int si5351_available = false;
#endif
#define __NEW_ADF4351__ #define __NEW_ADF4351__
#ifdef __NEW_ADF4351__ #ifdef __NEW_ADF4351__
@ -263,7 +297,7 @@ uint16_t frac = 0;
uint16_t modulus = 32; uint16_t modulus = 32;
uint16_t out_div = 0; uint16_t out_div = 0;
uint16_t mux = 0; uint16_t mux = 0;
uint16_t csr = 1; // cycle slip reduction uint16_t csr = 1; // cycle slip reduction, if enabled cp must be lowest value
uint16_t bscm = 1; // Band select clock mode uint16_t bscm = 1; // Band select clock mode
// uint32_t reg_0 = 0; // uint32_t reg_0 = 0;
@ -311,8 +345,9 @@ static const bool rfEnable = true;
static const bool auxEnable = false; static const bool auxEnable = false;
static const bool feedbackFromDivided = true; static const bool feedbackFromDivided = true;
static const bool LDF = false; static const bool LDF = false; // for fractional mode
static const bool LDP = true; static const bool LDP = true; // 6 ns
static const bool LDS = true;
static enum { static enum {
LD_LOW_NOISE = 0b00, LD_LOW_NOISE = 0b00,
@ -340,8 +375,6 @@ static const enum {
CPm_30pct = 0b11, // ! Show best linearity result CPm_30pct = 0b11, // ! Show best linearity result
} CP_Mode = CPm_30pct; } CP_Mode = CPm_30pct;
//static const bool LDS = false;
#define CS_ADF0_HIGH {palSetLine(LINE_LO_SEL);ADF_CS_DELAY;} #define CS_ADF0_HIGH {palSetLine(LINE_LO_SEL);ADF_CS_DELAY;}
#define CS_ADF0_LOW {palClearLine(LINE_LO_SEL);ADF_CS_DELAY;} #define CS_ADF0_LOW {palClearLine(LINE_LO_SEL);ADF_CS_DELAY;}
@ -385,9 +418,10 @@ void sendConfig(void) {
// pdwn = false; //Power down is no longer active. // pdwn = false; //Power down is no longer active.
uint32_t reg; uint32_t reg;
const bool fractional = false; const bool fractional = false;
const bool LDS = true;
const uint32_t phase = 1; // Recommended const uint32_t phase = 1; // Recommended
// const bool LDS = (SI5351_INITIAL_FREQ > 3200000000ULL ? true: false);
// reg 5 // reg 5
// LD pin register 5 // LD pin register 5
reg = (ld_pin<<22) | 0b101; reg = (ld_pin<<22) | 0b101;
@ -500,7 +534,7 @@ uint64_t ADF4351_set_frequency(int channel, uint64_t freqHz) {
#if 1 #if 1
out_div = adf4350_get_O(freqHz); out_div = adf4350_get_O(freqHz);
uint64_t xtal = (uint32_t)(config.setting_frequency_30mhz); uint64_t xtal = local_setting_frequency_30mhz_x100;
if (refDouble) { if (refDouble) {
xtal<<=1; xtal<<=1;
} }
@ -672,17 +706,31 @@ void ADF4351_enable_out(int s)
} }
void ADF4351_recalculate_PFDRFout(void) { void ADF4351_recalculate_PFDRFout(void) {
int local_r = old_R;
old_R = -1;
local_setting_frequency_30mhz_x100 = SI5351_INITIAL_FREQ; //config.setting_frequency_30mhz;
ADF4351_R_counter(local_r);
sendConfig(); sendConfig();
} }
void ADF4351_Setup(void) void ADF4351_Setup(void)
{ {
CS_ADF0_HIGH; CS_ADF0_HIGH;
local_setting_frequency_30mhz_x100 = SI5351_INITIAL_FREQ; // config.setting_frequency_30mhz;
#ifdef __SI5351__
si5351_available = si5351_init();
if (si5351_available)
si5351_set_frequency(0, local_setting_frequency_30mhz_x100/100, 0);
// si5351_available = false; // Don't use shifting
#endif
cpCurrent = 0;
if (max2871) { if (max2871) {
// refDouble = true; // refDouble = true;
} else { } else {
ADF4351_fastlock(1); // Fastlock enabled
ADF4351_csr(1); //Cycle slip enabled ADF4351_csr(1); //Cycle slip enabled
ADF4351_fastlock(1); // Fastlock enabled
cpCurrent = 0; cpCurrent = 0;
} }
// R = 1; // R = 1;
@ -699,8 +747,6 @@ void ADF4351_Setup(void)
#define maskedWrite(reg, bit, mask, value) (reg) &= ~(((uint32_t)mask) << (bit)); (reg) |= ((((uint32_t) (value)) & ((uint32_t)mask)) << (bit)); #define maskedWrite(reg, bit, mask, value) (reg) &= ~(((uint32_t)mask) << (bit)); (reg) |= ((((uint32_t) (value)) & ((uint32_t)mask)) << (bit));
freq_t local_setting_frequency_30mhz_x100 = 3000000000;
#define CS_ADF0_HIGH {palSetLine(LINE_LO_SEL);ADF_CS_DELAY;} #define CS_ADF0_HIGH {palSetLine(LINE_LO_SEL);ADF_CS_DELAY;}
#define CS_ADF1_HIGH {ADF_CS_DELAY;palSetLine(LINE_LO_SEL);} #define CS_ADF1_HIGH {ADF_CS_DELAY;palSetLine(LINE_LO_SEL);}
@ -735,12 +781,6 @@ int64_t
int old_R = 0; int old_R = 0;
#ifdef __SI5351__
#include "si5351.h"
#else
int si5351_available = false;
#endif
void ADF4351_Setup(void) void ADF4351_Setup(void)
{ {
@ -888,30 +928,6 @@ void ADF4351_recalculate_PFDRFout(void){
ADF4351_R_counter(local_r); ADF4351_R_counter(local_r);
} }
#ifdef __SI5351__
static int shifted = -2;
#define SHIFT_MUL 31
#define SHIFT_DIV 29
#define SHIFT_FACTOR 100000
void ADF4350_shift_ref(int f) {
if (f == shifted)
return;
shifted = false;
local_setting_frequency_30mhz_x100 = config.setting_frequency_30mhz;
if (shifted) {
local_setting_frequency_30mhz_x100 = (local_setting_frequency_30mhz_x100 * SHIFT_MUL) / SHIFT_DIV;
}
if (si5351_available && shifted)
si5351_set_int_mul_div(0, SHIFT_MUL, SHIFT_DIV, 0);
else
si5351_set_int_mul_div(0, 30, 30, 0);
ADF4351_recalculate_PFDRFout();
shifted = f;
}
#endif
void ADF4351_mux(int R) void ADF4351_mux(int R)
{ {
maskedWrite(registers[2],26, 0x7, R); maskedWrite(registers[2],26, 0x7, R);

2
ui.c
Unescape View File

@ -617,7 +617,7 @@ show_version(void)
ili9341_drawstring_7x13(info_about[i++], x, y+=bFONT_STR_HEIGHT+2-5); ili9341_drawstring_7x13(info_about[i++], x, y+=bFONT_STR_HEIGHT+2-5);
} }
lcd_set_font(FONT_NORMAL); lcd_set_font(FONT_NORMAL);
lcd_printf(x, y+=bFONT_STR_HEIGHT, "HW Version:%s (%d)", get_hw_version_text(), adc1_single_read(0)); lcd_printf(x, y+=bFONT_STR_HEIGHT, "HW Version:%s (%d) %s", get_hw_version_text(), adc1_single_read(0), (si5351_available?"SI5351":""));
extern const char *states[]; extern const char *states[];
#define ENABLE_THREADS_COMMAND #define ENABLE_THREADS_COMMAND

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.