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

Merge branch 'master' into tinySA-V4-SI4463

Browse Source
Removed_REF_marker
erikkaashoek 5 years ago
parent e2d5f52dc0 0aec13e49e
commit 385259b0ad
6 changed files with 163 additions and 80 deletions
Show Stats Download Patch File Download Diff File

3
main.c
Unescape View File

@ -2625,6 +2625,7 @@ int main(void)
usbStart(serusbcfg.usbp, &usbcfg);
usbConnectBus(serusbcfg.usbp);
#ifdef __SI4432__
/*
* Powercycle the RF part to reset SI4432
*/
@ -2635,7 +2636,7 @@ int main(void)
#endif
palSetPad(GPIOB, GPIOA_RF_PWR);
chThdSleepMilliseconds(500);
#endif
#if 0
palSetPadMode(GPIOA, 9, PAL_MODE_INPUT_ANALOG);

1
nanovna.h
Unescape View File

@ -25,6 +25,7 @@
#define __USE_DISPLAY_DMA__
#define __SA__
#define __SI4432__
//#define __SIMULATION__
//#define __PIPELINE__
#define __SCROLL__

6
sa_cmd.c
Unescape View File

@ -275,7 +275,7 @@ usage:
VNA_SHELL_FUNCTION(cmd_v)
{
if (argc != 1) {
shell_printf("%d\r\n", SI4432_Sel);
shell_printf("%d\r\n", VFO);
return;
}
VFO = my_atoi(argv[0]) > 0 ? 1 : 0;
@ -291,6 +291,7 @@ VNA_SHELL_FUNCTION(cmd_y)
return;
}
rvalue = my_atoui(argv[0]);
#ifdef __SI4432__
SI4432_Sel = VFO;
if (argc == 2){
lvalue = my_atoui(argv[1]);
@ -299,6 +300,7 @@ VNA_SHELL_FUNCTION(cmd_y)
lvalue = SI4432_Read_Byte(rvalue);
shell_printf("%x\r\n", lvalue);
}
#endif
}
VNA_SHELL_FUNCTION(cmd_z)
@ -371,6 +373,7 @@ VNA_SHELL_FUNCTION(cmd_i)
{
int rvalue;
return; // Don't use!!!!
#ifdef __SI4432__
SI4432_Init();
shell_printf("SI4432 init done\r\n");
if (argc == 1) {
@ -379,6 +382,7 @@ return; // Don't use!!!!
set_mode(rvalue);
shell_printf("SI4432 mode %d set\r\n", rvalue);
}
#endif
}
VNA_SHELL_FUNCTION(cmd_o)

150
sa_core.c
Unescape View File

@ -16,8 +16,9 @@
* Boston, MA 02110-1301, USA.
*/
#ifdef __SI4432__
#include "SI4432.h" // comment out for simulation
#endif
#include "stdlib.h"
#pragma GCC push_options
@ -33,8 +34,6 @@
int dirty = true;
int scandirty = true;
extern int SI4432_step_delay;
setting_t setting;
uint32_t frequencies[POINTS_COUNT];
@ -185,7 +184,10 @@ uint32_t calc_min_sweep_time_us(void) // Estimate minimum sweep time in
if (MODE_OUTPUT(setting.mode))
t = 200*sweep_points; // 200 microseconds is the delay set in perform when sweeping in output mode
else {
uint32_t bare_sweep_time = (SI4432_step_delay + MEASURE_TIME) * (sweep_points); // Single RSSI delay and measurement time in uS while scanning
uint32_t bare_sweep_time;
#ifdef __SI4432__
bare_sweep_time = (SI4432_step_delay + MEASURE_TIME) * (sweep_points); // Single RSSI delay and measurement time in uS while scanning
#endif
if (FREQ_IS_CW()) {
bare_sweep_time = MINIMUM_SWEEP_TIME; // minimum sweep time in fast CW mode
if (setting.repeat != 1 || setting.sweep_time_us >= 100*ONE_MS_TIME || setting.spur != 0) // if no fast CW sweep possible
@ -621,6 +623,7 @@ void toggle_AGC(void)
void auto_set_AGC_LNA(int auto_set) // Adapt the AGC setting if needed
{
#ifdef __SI4432__
static unsigned char old_v;
unsigned char v;
if (auto_set)
@ -632,6 +635,7 @@ void auto_set_AGC_LNA(int auto_set)
SI4432_Write_Byte(SI4432_AGC_OVERRIDE, v);
old_v = v;
}
#endif
}
void set_unit(int u)
@ -814,8 +818,6 @@ void set_mode(int m)
// dirty = true;
}
extern int SI4432_offset_delay;
void set_fast_speedup(int s)
{
setting.fast_speedup = s;
@ -824,6 +826,7 @@ void set_fast_speedup(int s)
void calculate_step_delay(void)
{
#ifdef __SI4432__
if (setting.step_delay_mode == SD_MANUAL || setting.step_delay != 0) { // The latter part required for selftest 3
SI4432_step_delay = setting.step_delay;
if (setting.offset_delay != 0) // Override if set
@ -862,6 +865,7 @@ void calculate_step_delay(void)
if (setting.offset_delay != 0) // Override if set
SI4432_offset_delay = setting.offset_delay;
}
#endif
}
void apply_settings(void) // Ensure all settings in the setting structure are translated to the right HW setup
@ -874,7 +878,9 @@ void apply_settings(void) // Ensure all settings in the setting structure
if (setting.mode == M_LOW) {
}
#ifdef __SI4432__
SI4432_SetReference(setting.refer);
#endif
update_rbw();
calculate_step_delay();
}
@ -954,19 +960,22 @@ static unsigned long real_old_freq[4] = { 0, 0, 0, 0};
void setupSA(void)
{
#ifdef __SI4432__
SI4432_Init();
#endif
old_freq[0] = 0;
old_freq[1] = 0;
real_old_freq[0] = 0;
real_old_freq[1] = 0;
#ifdef __SI4432__
SI4432_Sel = SI4432_RX ;
SI4432_Receive();
SI4432_Sel = SI4432_LO ;
SI4432_Transmit(0);
#endif
PE4302_init();
PE4302_Write_Byte(0);
#if 0 // Measure fast scan time
setting.sweep_time_us = 0;
setting.additional_step_delay_us = 0;
@ -979,8 +988,6 @@ void setupSA(void)
int t = (t2 - t1) * 100 * (sweep_points) / 200; // And calculate real time excluding overhead for all points
#endif
}
extern int SI4432_frequency_changed;
extern int SI4432_offset_changed;
#define __WIDE_OFFSET__
#ifdef __WIDE_OFFSET__
@ -994,6 +1001,7 @@ void set_freq(int V, unsigned long freq) // translate the requested frequency
if (old_freq[V] == freq) // Do not change HW if not needed
return;
if (V <= 1) {
#ifdef __SI4432__
SI4432_Sel = V;
if (freq < 240000000 || freq > 960000000) { // Impossible frequency, simply ignore, should never happen.
real_old_freq[V] = freq + 1; // No idea why this is done........
@ -1053,14 +1061,17 @@ void set_freq(int V, unsigned long freq) // translate the requested frequency
SI4432_Set_Frequency(freq); // Not in fast mode
real_old_freq[V] = freq;
}
#endif
}
#ifdef __ULTRA_SA__
} else {
else {
ADF4351_set_frequency(V-2,freq,3);
#endif
}
#endif
old_freq[V] = freq;
}
#ifdef __SI4432__
void set_switch_transmit(void) {
SI4432_Write_Byte(SI4432_GPIO0_CONF, 0x1f);// Set switch to transmit
SI4432_Write_Byte(SI4432_GPIO1_CONF, 0x1d);
@ -1082,9 +1093,11 @@ void set_AGC_LNA(void) {
if (S_STATE(setting.lna)) v |= 0x10;
SI4432_Write_Byte(SI4432_AGC_OVERRIDE, v);
}
#endif
void set_switches(int m)
{
#ifdef __SI4432__
SI4432_Init();
old_freq[0] = 0;
old_freq[1] = 0;
@ -1093,12 +1106,13 @@ void set_switches(int m)
SI4432_Sel = SI4432_LO ;
SI4432_Write_Byte(SI4432_FREQ_OFFSET1, 0); // Back to nominal offset
SI4432_Write_Byte(SI4432_FREQ_OFFSET2, 0);
#endif
switch(m) {
case M_LOW: // Mixed into 0
#ifdef __ULTRA__
case M_ULTRA:
#endif
#ifdef __SI4432__
SI4432_Sel = SI4432_RX ;
SI4432_Receive();
if (setting.atten_step) { // use switch as attenuator
@ -1116,9 +1130,11 @@ case M_ULTRA:
// SI4432_Receive(); For noise testing only
SI4432_Transmit(setting.drive);
// SI4432_SetReference(setting.refer);
#endif
break;
case M_HIGH: // Direct into 1
mute:
#ifdef __SI4432__
// SI4432_SetReference(-1); // Stop reference output
SI4432_Sel = SI4432_RX ; // both as receiver to avoid spurs
set_switch_receive();
@ -1132,11 +1148,13 @@ mute:
set_switch_receive();
}
set_AGC_LNA();
#endif
break;
case M_GENLOW: // Mixed output from 0
if (setting.mute)
goto mute;
#ifdef __SI4432__
SI4432_Sel = SI4432_RX ;
if (setting.atten_step) { // use switch as attenuator
set_switch_off();
@ -1153,10 +1171,12 @@ case M_GENLOW: // Mixed output from 0
set_switch_off();
SI4432_Transmit(12); // Fix LO drive a 10dBm
}
#endif
break;
case M_GENHIGH: // Direct output from 1
if (setting.mute)
goto mute;
#ifdef __SI4432__
SI4432_Sel = SI4432_RX ;
SI4432_Receive();
set_switch_receive();
@ -1168,7 +1188,7 @@ case M_GENHIGH: // Direct output from 1
set_switch_transmit();
}
SI4432_Transmit(setting.drive);
#endif
break;
}
@ -1199,9 +1219,10 @@ void update_rbw(void) // calculate the actual_rbw and the vbwSteps (#
if (setting.spur && actual_rbw_x10 > 3000)
actual_rbw_x10 = 2500; // if spur suppression reduce max rbw to fit within BPF
#ifdef __SI4432__
SI4432_Sel = MODE_SELECT(setting.mode);
actual_rbw_x10 = SI4432_SET_RBW(actual_rbw_x10); // see what rbw the SI4432 can realize
#endif
if (setting.frequency_step > 0 && MODE_INPUT(setting.mode)) { // When doing frequency scanning in input mode
vbwSteps = ((int)(2 * (setting.vbw_x10 + (actual_rbw_x10/2)) / actual_rbw_x10)); // calculate # steps in between each frequency step due to rbw being less than frequency step
if (setting.step_delay_mode==SD_PRECISE) // if in Precise scanning
@ -1427,15 +1448,18 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
}
else{ // not add additional correction, apply recommend time
setting.additional_step_delay_us = 0;
// setting.sweep_time_us = setting.actual_sweep_time_us;
// setting.sweep_time_us = setting.actual_sweep_time_us;
}
if (MODE_INPUT(setting.mode)) {
correct_RSSI = getSI4432_RSSI_correction()
- get_signal_path_loss()
+ float_TO_PURE_RSSI(
+ get_level_offset()
+ get_attenuation()
- setting.offset);
correct_RSSI =
#ifdef __SI4432__
getSI4432_RSSI_correction()
#endif
- get_signal_path_loss()
+ float_TO_PURE_RSSI(
+ get_level_offset()
+ get_attenuation()
- setting.offset);
}
// if (MODE_OUTPUT(setting.mode) && setting.additional_step_delay_us < 500) // Minimum wait time to prevent LO from lockup during output frequency sweep
@ -1459,6 +1483,7 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
a += PURE_TO_float(get_frequency_correction(f));
if (a != old_a) {
old_a = a;
#ifdef __SI4432__
int d = 0; // Start at lowest drive level;
a = a + POWER_OFFSET;
if (a > 0) {
@ -1484,13 +1509,13 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
a = a + SWITCH_ATTENUATION;
set_switch_receive();
}
#endif
if (a < -31)
a = -31;
a = -a;
PE4302_Write_Byte((int)(a * 2) );
}
}
if (setting.mode == M_LOW && S_IS_AUTO(setting.agc) && UNIT_IS_LOG(setting.unit)) { // If in low input mode with auto AGC and log unit
if (f < 500000)
auto_set_AGC_LNA(false);
@ -1510,15 +1535,17 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
my_microsecond_delay(setting.modulation == MO_AM_10Hz ? 20000 : 180);
}
else if (setting.modulation == MO_NFM || setting.modulation == MO_WFM ) { //FM modulation
#ifdef __SI4432__
SI4432_Sel = SI4432_LO ;
int offset = setting.modulation == MO_NFM ? nfm_modulation[modulation_counter] : wfm_modulation[modulation_counter] ;
SI4432_Write_Byte(SI4432_FREQ_OFFSET1, (offset & 0xff )); // Use frequency hopping channel for FM modulation
SI4432_Write_Byte(SI4432_FREQ_OFFSET2, ((offset >> 8) & 0x03 )); // Use frequency hopping channel for FM modulation
#endif
modulation_counter++;
if (modulation_counter == 5) // 3dB modulation depth
modulation_counter = 0;
my_microsecond_delay(200);
// chThdSleepMicroseconds(200);
// chThdSleepMicroseconds(200);
}
}
@ -1528,7 +1555,7 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
correct_RSSI_freq = get_frequency_correction(f);
}
// -------------------------------- Acquisition loop for one requested frequency covering spur avoidance and vbwsteps ------------------------
// -------------------------------- Acquisition loop for one requested frequency covering spur avoidance and vbwsteps ------------------------
pureRSSI_t RSSI = float_TO_PURE_RSSI(-150);
int t = 0;
do {
@ -1549,7 +1576,7 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
long local_IF;
again: // Spur reduction jumps to here for second measurement
again: // Spur reduction jumps to here for second measurement
if (MODE_HIGH(setting.mode))
local_IF = 0;
@ -1560,7 +1587,9 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
local_IF = setting.frequency_IF;
}
if (setting.mode == M_LOW && tracking) { // VERY SPECIAL CASE!!!!! Measure BPF
#ifdef __SI4432__
set_freq (SI4432_RX , local_IF + lf - reffer_freq[setting.refer]); // Offset so fundamental of reffer is visible
#endif
} else if (MODE_LOW(setting.mode)) {
if (setting.mode == M_LOW && !in_selftest && avoid_spur(f)) { // check is alternate IF is needed to avoid spur.
local_IF = spur_alternate_IF;
@ -1586,21 +1615,24 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
// --------------------- IF know, set the RX SI4432 frequency ------------------------
#ifdef __SI4432__
set_freq (SI4432_RX , local_IF);
#endif
#ifdef __ULTRA__
} else if (setting.mode == M_ULTRA) { // No above/below IF mode in Ultra
local_IF = setting.frequency_IF + (int)(actual_rbw < 350.0 ? setting.spur*300000 : 0 );
#ifdef __SI4432__
set_freq (SI4432_RX , local_IF);
// local_IF = setting.frequency_IF + (int)(actual_rbw < 300.0?setting.spur * 1000 * actual_rbw:0);
#endif
// local_IF = setting.frequency_IF + (int)(actual_rbw < 300.0?setting.spur * 1000 * actual_rbw:0);
#endif
} else // This must be high mode
local_IF= 0;
#ifdef __ULTRA__
if (setting.mode == M_ULTRA) { // Set LO to correct harmonic in Ultra mode
// if (lf > 3406000000 )
// setFreq (1, local_IF/5 + lf/5);
// else
// if (lf > 3406000000 )
// setFreq (1, local_IF/5 + lf/5);
// else
if (setting.spur != 1) { // Left of tables
if (lf > 3250000000 )
set_freq (SI4432_LO , lf/5 - local_IF/5);
@ -1619,28 +1651,32 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
#endif
{ // Else set LO ('s)
#ifdef __ULTRA_SA__
//#define IF_1 2550000000
//#define IF_1 2550000000
#define IF_2 2025000000 // First IF in Ultra SA mode
set_freq (2, IF_2 + lf); // Scanning LO up to IF2
set_freq (3, IF_2 - 433800000); // Down from IF2 to fixed second IF in Ultra SA mode
set_freq (SI4432_LO, 433800000); // Second IF fixe in Ultra SA mode
set_freq (2, IF_2 + lf); // Scanning LO up to IF2
set_freq (3, IF_2 - 433800000); // Down from IF2 to fixed second IF in Ultra SA mode
set_freq (SI4432_LO, 433800000); // Second IF fixe in Ultra SA mode
#else
if (setting.mode == M_LOW && !setting.tracking && S_STATE(setting.below_IF)) // if in low input mode and below IF
set_freq (SI4432_LO, local_IF-lf); // set LO SI4432 to below IF frequency
else
set_freq (SI4432_LO, local_IF+lf); // otherwise to above IF
#ifdef __SI4432__
if (setting.mode == M_LOW && !setting.tracking && S_STATE(setting.below_IF)) // if in low input mode and below IF
set_freq (SI4432_LO, local_IF-lf); // set LO SI4432 to below IF frequency
else
set_freq (SI4432_LO, local_IF+lf); // otherwise to above IF
#endif
#endif
}
if (MODE_OUTPUT(setting.mode)) {
#ifdef __SI4432__
my_microsecond_delay(200); // To prevent lockup of SI4432
#endif
}
// ------------------------- end of processing when in output mode ------------------------------------------------
skip_LO_setting:
skip_LO_setting:
if (i == 0 && t == 0) // if first point in scan (here is get 1 point data)
start_of_sweep_timestamp = chVTGetSystemTimeX(); // initialize start sweep time
@ -1649,25 +1685,27 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
}
// ---------------- Prepare RSSI ----------------------
// jump here if in zero span mode and all HW frequency setup is done.
// jump here if in zero span mode and all HW frequency setup is done.
#ifdef __SI4432__
#ifdef __FAST_SWEEP__
if (i == 0 && setting.frequency_step == 0 && setting.trigger == T_AUTO && setting.spur == 0 && SI4432_step_delay == 0 && setting.repeat == 1 && setting.sweep_time_us < 100*ONE_MS_TIME) {
// if ultra fast scanning is needed prefill the SI4432 RSSI read buffer
SI4432_Fill(MODE_SELECT(setting.mode), 0);
}
#endif
#endif
pureRSSI_t pureRSSI;
// if ( i < 3)
// shell_printf("%d %.3f %.3f %.1f\r\n", i, local_IF/1000000.0, lf/1000000.0, subRSSI);
// ************** trigger mode if need
// trigger on measure 4 point
// trigger on measure 4 point
#define T_POINTS 4
#define T_LEVEL_UNDEF (1<<(16-T_POINTS)) // should drop after 4 shifts left
#define T_LEVEL_BELOW 1
#define T_LEVEL_ABOVE 0
// Trigger mask, should have width T_POINTS bit
// Trigger mask, should have width T_POINTS bit
#define T_DOWN_MASK (0b0011) // 2 from up 2 to bottom
#define T_UP_MASK (0b1100) // 2 from bottom 2 to up
#define T_LEVEL_CLEAN ~(1<<T_POINTS) // cleanup old trigger data
@ -1685,9 +1723,13 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
t_mode = T_DOWN_MASK;
uint32_t additional_delay = 0;// reduce noise
if (setting.sweep_time_us >= 100*ONE_MS_TIME) additional_delay = 20;
#ifdef __SI4432__
SI4432_Sel = MODE_SELECT(setting.mode);
#endif
do{ // wait for trigger to happen
#ifdef __SI4432__
pureRSSI = DEVICE_TO_PURE_RSSI((deviceRSSI_t)SI4432_Read_Byte(SI4432_REG_RSSI));
#endif
if (break_on_operation && operation_requested) // allow aborting a wait for trigger
return 0; // abort
@ -1700,27 +1742,31 @@ pureRSSI_t perform(bool break_on_operation, int i, uint32_t f, int tracking)
my_microsecond_delay(additional_delay);
}while(1);
#ifdef __FAST_SWEEP__
#ifdef __SI4432__
if (setting.spur == 0 && SI4432_step_delay == 0 && setting.repeat == 1 && setting.sweep_time_us < 100*ONE_MS_TIME) {
SI4432_Fill(MODE_SELECT(setting.mode), 1); // fast mode possible to pre-fill RSSI buffer
}
#endif
#endif
if (setting.trigger == T_SINGLE) {
set_trigger(T_DONE);
}
start_of_sweep_timestamp = chVTGetSystemTimeX();
}
else
// pureRSSI = SI4432_RSSI(lf, MODE_SELECT(setting.mode)); // Get RSSI, either from pre-filled buffer
pureRSSI = Si446x_RSSI(); // Get RSSI, either from pre-filled buffer
else {
#ifdef __SI4432__
pureRSSI = SI4432_RSSI(lf, MODE_SELECT(setting.mode)); // Get RSSI, either from pre-filled buffer
#endif
}
#ifdef __SPUR__
static pureRSSI_t spur_RSSI = -1; // Initialization only to avoid warning.
if (setting.spur == 1) { // If first spur pass
spur_RSSI = pureRSSI; // remember measure RSSI
setting.spur = -1;
goto again; // Skip all other processing
spur_RSSI = pureRSSI; // remember measure RSSI
setting.spur = -1;
goto again; // Skip all other processing
} else if (setting.spur == -1) { // If second spur pass
pureRSSI = ( pureRSSI < spur_RSSI ? pureRSSI : spur_RSSI); // Take minimum of two
setting.spur = 1; // and prepare for next call of perform.
pureRSSI = ( pureRSSI < spur_RSSI ? pureRSSI : spur_RSSI); // Take minimum of two
setting.spur = 1; // and prepare for next call of perform.
}
#endif
@ -1995,12 +2041,14 @@ sweep_again: // stay in sweep loop when output mo
if (changed){
PE4302_Write_Byte((int) get_attenuation() * 2);
redraw_request |= REDRAW_CAL_STATUS;
#ifdef __SI4432__
SI4432_Sel = SI4432_RX ;
if (setting.atten_step) {
set_switch_transmit(); // This should never happen
} else {
set_switch_receive();
}
#endif
dirty = true; // Needed to recalculate the correction factor
}
}
@ -3156,7 +3204,9 @@ void self_test(int test)
#endif
setting.step_delay = setting.step_delay * 5 / 4;
setting.offset_delay = setting.step_delay / 2;
#ifdef __SI4432__
setting.rbw_x10 = SI4432_force_RBW(j);
#endif
shell_printf("RBW = %f, ",setting.rbw_x10/10.0);
#if 0
set_sweep_frequency(ST_SPAN, (uint32_t)(setting.rbw_x10 * 1000)); // Wide

60
si4432.c
Unescape View File

@ -59,6 +59,8 @@ static uint32_t new_port_moder;
#define CS_PE_HIGH palSetPad(GPIOA, GPIOA_PE_SEL)
#define RF_POWER_HIGH palSetPad(GPIOB, GPIOB_RF_PWR)
//#define SPI2_CLK_HIGH palSetPad(GPIOB, GPIO_SPI2_CLK)
//#define SPI2_CLK_LOW palClearPad(GPIOB, GPIO_SPI2_CLK)
#define CS_SI0_LOW palClearPad(GPIOB, GPIOB_RX_SEL)
#define CS_SI1_LOW palClearPad(GPIOB, GPIOB_LO_SEL)
@ -74,6 +76,10 @@ static uint32_t new_port_moder;
#define SPI1_SDO ((palReadPort(GPIOB)>>GPIOB_SPI_MISO)&1)
#define SPI1_portSDO (palReadPort(GPIOB)&(1<<GPIOB_SPI_MISO))
#define CS_PE_HIGH palSetPad(GPIOC, GPIO_PE_SEL)
#define CS_PE_LOW palClearPad(GPIOC, GPIO_PE_SEL)
//#define MAXLOG 1024
//unsigned char SI4432_logging[MAXLOG];
//volatile int log_index = 0;
@ -204,14 +210,32 @@ static void shiftOutBuf(uint8_t *buf, uint16_t size) {
}
#endif
const uint16_t SI_nSEL[MAX_SI4432+1] = { GPIOB_LO_SEL, GPIOB_LO_SEL, 0}; // #3 is dummy!!!!!!
int setting_frequency_10mhz = 10000000;
void set_10mhz(uint32_t f)
{
setting_frequency_10mhz = f;
}
#ifdef __SI4432__
#define CS_SI0_HIGH palSetPad(GPIOC, GPIO_RX_SEL)
#define CS_SI1_HIGH palSetPad(GPIOC, GPIO_LO_SEL)
#define RF_POWER_HIGH palSetPad(GPIOB, GPIO_RF_PWR)
#define CS_SI0_LOW palClearPad(GPIOC, GPIO_RX_SEL)
#define CS_SI1_LOW palClearPad(GPIOC, GPIO_LO_SEL)
const uint16_t SI_nSEL[MAX_SI4432+1] = { GPIO_RX_SEL, GPIO_LO_SEL, 0}; // #3 is dummy!!!!!!
volatile int SI4432_Sel = 0; // currently selected SI4432
// volatile int SI4432_guard = 0;
#ifdef __SI4432_H__
#define SELECT_DELAY 10
void SI4432_Write_Byte(byte ADR, byte DATA )
void SI4432_Write_Byte(uint8_t ADR, uint8_t DATA )
{
set_SPI_mode(SPI_MODE_SI);
// if (SI4432_guard)
@ -227,7 +251,7 @@ void SI4432_Write_Byte(byte ADR, byte DATA )
// SI4432_guard = 0;
}
void SI4432_Write_3_Byte(byte ADR, byte DATA1, byte DATA2, byte DATA3 )
void SI4432_Write_3_Byte(uint8_t ADR, uint8_t DATA1, uint8_t DATA2, uint8_t DATA3 )
{
set_SPI_mode(SPI_MODE_SI);
// if (SI4432_guard)
@ -245,10 +269,10 @@ void SI4432_Write_3_Byte(byte ADR, byte DATA1, byte DATA2, byte DATA3 )
// SI4432_guard = 0;
}
byte SI4432_Read_Byte( byte ADR )
uint8_t SI4432_Read_Byte( uint8_t ADR )
{
set_SPI_mode(SPI_MODE_SI);
byte DATA ;
uint8_t DATA ;
// if (SI4432_guard)
// while(1) ;
// SI4432_guard = 1;
@ -279,13 +303,13 @@ void SI4432_Reset(void)
void SI4432_Drive(int d)
{
SI4432_Write_Byte(SI4432_TX_POWER, (byte) (0x18+(d & 7)));
SI4432_Write_Byte(SI4432_TX_POWER, (uint8_t) (0x18+(d & 7)));
}
void SI4432_Transmit(int d)
{
int count = 0;
SI4432_Write_Byte(SI4432_TX_POWER, (byte) (0x18+(d & 7)));
SI4432_Write_Byte(SI4432_TX_POWER, (uint8_t) (0x18+(d & 7)));
if (( SI4432_Read_Byte(SI4432_DEV_STATUS) & 0x03 ) == 2)
return; // Already in transmit mode
chThdSleepMilliseconds(3);
@ -404,12 +428,6 @@ uint16_t SI4432_SET_RBW(uint16_t WISH) {
return SI4432_force_RBW(i);
}
int setting_frequency_10mhz = 10000000;
void set_10mhz(uint32_t f)
{
setting_frequency_10mhz = f;
}
int SI4432_frequency_changed = false;
int SI4432_offset_changed = false;
@ -626,10 +644,10 @@ void SI4432_Sub_Init(void)
// IF Filter Bandwidth
SI4432_SET_RBW(100) ;
// // Register 0x75 Frequency Band Select
// byte sbsel = 1 ; // recommended setting
// byte hbsel = 0 ; // low bands
// byte fb = 19 ; // 430<33>439.9 MHz
// byte FBS = (sbsel << 6 ) | (hbsel << 5 ) | fb ;
// uint8_t sbsel = 1 ; // recommended setting
// uint8_t hbsel = 0 ; // low bands
// uint8_t fb = 19 ; // 430<33>439.9 MHz
// uint8_t FBS = (sbsel << 6 ) | (hbsel << 5 ) | fb ;
// SI4432_Write_Byte(SI4432_FREQBAND, FBS) ;
// SI4432_Write_Byte(SI4432_FREQBAND, 0x46) ;
// Register 0x76 Nominal Carrier Frequency
@ -733,6 +751,8 @@ void SI4432_SetReference(int freq)
SI4432_Write_Byte(Si4432_UC_OUTPUT_CLOCK, freq & 0x07) ; // Set GPIO2 frequency
}
}
#endif
#endif
//------------PE4302 -----------------------------------------------
@ -784,8 +804,6 @@ bool PE4302_Write_Byte(unsigned char DATA )
return true;
}
#endif
#if 0
@ -918,8 +936,8 @@ unsigned int long RFint, // Output freq/10Hz
MOD, //Temp
FRAC; //Temp
byte OutputDivider; // Temp
byte lock=2; //Not used
uint8_t OutputDivider; // Temp
uint8_t lock=2; //Not used
// Lock = A4

23
si4432.h
Unescape View File

@ -21,6 +21,9 @@
#ifndef __SI4432_H__
#define __SI4432_H__
#ifdef __SI4432__
//
#define MAX_SI4432 2
@ -104,14 +107,18 @@
#define SI4432_FIFO 0x7F
typedef uint8_t byte;
extern volatile int SI4432_Sel; // currently selected SI4432
void start_SI4432_SPI_mode(void);
void stop_SI4432_SPI_mode(void);
void SI4432_Write_Byte(byte ADR, byte DATA );
byte SI4432_Read_Byte( byte ADR );
extern int SI4432_step_delay;
extern int SI4432_offset_delay;
extern int SI4432_frequency_changed;
extern int SI4432_offset_changed;
void SI4432_Write_Byte(uint8_t ADR, uint8_t DATA );
uint8_t SI4432_Read_Byte( uint8_t ADR );
void SI4432_Transmit(int d);
void SI4432_Receive(void);
@ -128,10 +135,6 @@ void SI4432_Set_Frequency ( uint32_t Freq );
uint16_t SI4432_force_RBW(int i);
uint16_t SI4432_SET_RBW(uint16_t WISH);
void SI4432_SetReference(int freq);
bool PE4302_Write_Byte(unsigned char DATA );
void PE4302_init(void);
#ifdef __FAST_SWEEP__
void SI4432_Fill(int s, int start);
#if 0
@ -139,6 +142,12 @@ int SI4432_is_fast_mode(void);
#endif
#endif
#endif
bool PE4302_Write_Byte(unsigned char DATA );
void PE4302_init(void);
#ifdef __ULTRA_SA__
extern int ADF4351_LE[];
extern int debug;

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.