diff --git a/nanovna.h b/nanovna.h index e9e451e..f400233 100644 --- a/nanovna.h +++ b/nanovna.h @@ -25,7 +25,7 @@ #define __USE_DISPLAY_DMA__ #define __SA__ -#define __SI4432__ +//#define __SI4432__ //#define __SIMULATION__ //#define __PIPELINE__ #define __SCROLL__ diff --git a/sa_cmd.c b/sa_cmd.c index 30131f5..9d32281 100644 --- a/sa_cmd.c +++ b/sa_cmd.c @@ -311,6 +311,7 @@ VNA_SHELL_FUNCTION(cmd_z) return; } if (argc == 1) { +#ifdef __SI4432__ SI4432_Sel = VFO; int type = get_str_index(argv[0], cmd_z_list); switch(type) { @@ -324,6 +325,7 @@ VNA_SHELL_FUNCTION(cmd_z) SI4432_Reset(); break; } +#endif } } diff --git a/si4432.c b/si4432.c index 53002fb..362d577 100644 --- a/si4432.c +++ b/si4432.c @@ -75,10 +75,10 @@ static uint32_t new_port_moder; #define SPI1_SDO ((palReadPort(GPIOB)>>GPIOB_SPI_MISO)&1) #define SPI1_portSDO (palReadPort(GPIOB)&(1< -void SI4463_write_byte(byte ADR, byte DATA) +void SI4463_write_byte(uint8_t ADR, uint8_t DATA) { set_SPI_mode(SPI_MODE_SI); // if (SI4432_guard) @@ -1246,7 +1247,7 @@ void SI4463_write_byte(byte ADR, byte DATA) // SI4432_guard = 0; } -void SI4463_write_buffer(byte ADR, byte *DATA, int len) +void SI4463_write_buffer(uint8_t ADR, uint8_t *DATA, int len) { set_SPI_mode(SPI_MODE_SI); // if (SI4432_guard) @@ -1267,10 +1268,10 @@ void SI4463_write_buffer(byte ADR, byte *DATA, int len) } -byte SI4463_read_byte( byte ADR ) +uint8_t SI4463_read_byte( uint8_t ADR ) { // set_SPI_mode(SPI_MODE_SI); - byte DATA ; + uint8_t DATA ; // if (SI4432_guard) // while(1) ; // SI4432_guard = 1;