From fd68556db71c0323d39393bc56548a7a5a40ac02 Mon Sep 17 00:00:00 2001 From: DiSlord Date: Mon, 6 Jul 2020 15:46:03 +0300 Subject: [PATCH] Move function description to another header --- nanovna.h | 22 +--------------------- si4432.h | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/nanovna.h b/nanovna.h index 0cfa323..e57cccc 100644 --- a/nanovna.h +++ b/nanovna.h @@ -854,27 +854,6 @@ int plot_printf(char *str, int, const char *fmt, ...); //extern int setting_step_delay; //extern int actualStepDelay; //extern int setting_mode; -void update_rbw(void); -int get_actual_RBW(void); - -#define byte uint8_t -extern volatile int SI4432_Sel; // currently selected SI4432 -void SI4432_Write_Byte(byte ADR, byte DATA ); -byte SI4432_Read_Byte( byte ADR ); - -void SI4432_Init(void); -void SI4432_Drive(int); -int16_t SI4432_RSSI(uint32_t i, int s); -#ifdef __FAST_SWEEP__ -void SI4432_Fill(int s, int start); -#if 0 -int SI4432_is_fast_mode(void); -#endif -#endif -void SI4432_Set_Frequency ( uint32_t Freq ); -uint16_t SI4432_SET_RBW(uint16_t WISH); -void SI4432_SetReference(int freq); -extern uint16_t SI4432_force_RBW(int i); // Speed profile definition #define START_PROFILE systime_t time = chVTGetSystemTimeX(); @@ -896,6 +875,7 @@ void set_unit(int); void set_switches(int); void set_trigger_level(float); void set_trigger(int); +void update_rbw(void); //extern int setting_measurement; void self_test(int); //extern int setting_test; diff --git a/si4432.h b/si4432.h index 81d4800..9337e75 100644 --- a/si4432.h +++ b/si4432.h @@ -104,24 +104,37 @@ #define SI4432_FIFO 0x7F -typedef byte uint8_t; +typedef uint8_t byte; extern volatile int SI4432_Sel; // currently selected SI4432 void SI4432_Write_Byte(byte ADR, byte DATA ); byte SI4432_Read_Byte( byte ADR ); +void SI4432_Transmit(int d); +void SI4432_Receive(void); + void SI4432_Init(void); +void SI4432_Drive(int); float getSI4432_RSSI_correction(void); int16_t SI4432_RSSI(uint32_t i, int s); #ifdef __SIMULATION__ float Simulated_SI4432_RSSI(uint32_t i, int s); #endif void SI4432_Set_Frequency ( uint32_t Freq ); -void SI4432_Transmit(int d); -void SI4432_Receive(void); + +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 +int SI4432_is_fast_mode(void); +#endif +#endif + #ifdef __ULTRA_SA__ extern int ADF4351_LE[]; extern int debug;