diff --git a/nanovna.h b/nanovna.h index 9655563..8903fd4 100644 --- a/nanovna.h +++ b/nanovna.h @@ -18,12 +18,12 @@ */ #include "ch.h" -#ifdef TINYSA_F303 +//#ifdef TINYSA_F303 #include "adc_F303.h" #define TINYSA4 -#else -#define TINYSA3 -#endif +//#else +//#define TINYSA3 +//#endif // Need enable HAL_USE_SPI in halconf.h #define __USE_DISPLAY_DMA__ diff --git a/sa_cmd.c b/sa_cmd.c index 3169b3f..ca93428 100644 --- a/sa_cmd.c +++ b/sa_cmd.c @@ -385,6 +385,25 @@ VNA_SHELL_FUNCTION(cmd_selftest) } #ifdef __ADF4351__ + +uint32_t xtoi(char *t) +{ + + uint32_t v=0; + while (*t) { + if ('0' <= *t && *t <= '9') + v = v*16 + *t - '0'; + else if ('a' <= *t && *t <= 'f') + v = v*16 + *t - 'a' + 10; + else if ('A' <= *t && *t <= 'F') + v = v*16 + *t - 'A' + 10; + else + return v; + t++; + } + return v; +} + VNA_SHELL_FUNCTION(cmd_x) { uint32_t reg; diff --git a/sa_core.c b/sa_core.c index 05c8f51..3e7f230 100644 --- a/sa_core.c +++ b/sa_core.c @@ -1955,7 +1955,6 @@ modulation_again: set_freq (SI4463_RX, lf); // sweep RX, local_IF = 0 in high mode } // STOP_PROFILE; -#endif #endif }