diff --git a/nanovna.h b/nanovna.h index d21752f..40eb852 100644 --- a/nanovna.h +++ b/nanovna.h @@ -18,7 +18,7 @@ */ #include "ch.h" -//#ifdef TINYSA_F303 +#ifdef TINYSA_F303 #ifdef TINYSA_F072 #error "Remove comment for #ifdef TINYSA_F303" #endif @@ -26,16 +26,16 @@ #define TINYSA4 #endif #define TINYSA4_PROTO -//#endif +#endif -#ifdef TINYSA_F072 +//#ifdef TINYSA_F072 #ifdef TINYSA_F303 #error "Remove comment for #ifdef TINYSA_F072" #endif #ifndef TINYSA3 #define TINYSA3 #endif -#endif +//#endif // Need enable HAL_USE_SPI in halconf.h #define __USE_DISPLAY_DMA__ diff --git a/si4432.c b/si4432.c index c920c7d..836ebdd 100644 --- a/si4432.c +++ b/si4432.c @@ -390,60 +390,60 @@ static const RBW_t RBW_choices[] = {IF_BW(1,0,14),-9,6207}, #else {IF_BW(0,5,3),1,31}, - {IF_BW(0,5,4),-4,32}, - {IF_BW(0,5,5),1,37}, - {IF_BW(0,5,6),-3,42}, - {IF_BW(0,5,7),-3,45}, - {IF_BW(0,4,1),-4,49}, - {IF_BW(0,4,2),-4,54}, - {IF_BW(0,4,3),-3,59}, - {IF_BW(0,4,4),-4,61}, - {IF_BW(0,4,5),1,72}, - {IF_BW(0,4,6),1,82}, - {IF_BW(0,4,7),1,88}, - {IF_BW(0,3,1),-4,95}, - {IF_BW(0,3,2),-4,106}, - {IF_BW(0,3,3),-3,115}, - {IF_BW(0,3,4),-8,121}, - {IF_BW(0,3,5),1,142}, - {IF_BW(0,3,6),1,162}, - {IF_BW(0,3,7),1,175}, - {IF_BW(0,2,1),-4,189}, - {IF_BW(0,2,2),-4,210}, - {IF_BW(0,2,3),1,227}, - {IF_BW(0,2,4),-4,240}, - {IF_BW(0,2,5),1,282}, - {IF_BW(0,2,6),1,322}, - {IF_BW(0,2,7),1,347}, - {IF_BW(0,1,1),-4,377}, - {IF_BW(0,1,2),-4,417}, - {IF_BW(0,1,3),-3,452}, - {IF_BW(0,1,4),-4,479}, - {IF_BW(0,1,5),1,562}, - {IF_BW(0,1,6),1,641}, - {IF_BW(0,1,7),1,692}, - {IF_BW(0,0,1),-4,752}, - {IF_BW(0,0,2),-4,832}, - {IF_BW(0,0,3),-3,900}, - {IF_BW(0,0,4),-4,953}, - {IF_BW(0,0,5),6,1121}, - {IF_BW(0,0,6),1,1279}, - {IF_BW(0,0,7),1,1379}, - {IF_BW(1,1,4),16,1428}, - {IF_BW(1,1,5),22,1678}, - {IF_BW(1,1,9),-53,1811}, - {IF_BW(1,0,15),-104,1915}, - {IF_BW(1,0,1),16,2251}, - {IF_BW(1,0,2),21,2488}, - {IF_BW(1,0,3),17,2693}, - {IF_BW(1,0,4),11,2849}, - {IF_BW(1,0,8),-19,3355}, - {IF_BW(1,0,9),-54,3618}, - {IF_BW(1,0,10),-14,4202}, - {IF_BW(1,0,11),-14,4684}, - {IF_BW(1,0,12),-23,5188}, - {IF_BW(1,0,13),-14,5770}, - {IF_BW(1,0,14),-9,6207}, + {IF_BW(0,5,4),2,32}, + {IF_BW(0,5,5),-4,37}, + {IF_BW(0,5,6),-9,42}, + {IF_BW(0,5,7),-14,45}, + {IF_BW(0,4,1),-15,49}, + {IF_BW(0,4,2),-7,54}, + {IF_BW(0,4,3),0,59}, + {IF_BW(0,4,4),3,61}, + {IF_BW(0,4,5),-4,72}, + {IF_BW(0,4,6),-8,82}, + {IF_BW(0,4,7),-15,88}, + {IF_BW(0,3,1),-15,95}, + {IF_BW(0,3,2),-7,106}, + {IF_BW(0,3,3),0,115}, + {IF_BW(0,3,4),2,121}, + {IF_BW(0,3,5),-4,142}, + {IF_BW(0,3,6),-9,162}, + {IF_BW(0,3,7),-15,175}, + {IF_BW(0,2,1),-15,189}, + {IF_BW(0,2,2),-8,210}, + {IF_BW(0,2,3),-1,227}, + {IF_BW(0,2,4),1,240}, + {IF_BW(0,2,5),-5,282}, + {IF_BW(0,2,6),-10,322}, + {IF_BW(0,2,7),-15,347}, + {IF_BW(0,1,1),-16,377}, + {IF_BW(0,1,2),-8,417}, + {IF_BW(0,1,3),-1,452}, + {IF_BW(0,1,4),1,479}, + {IF_BW(0,1,5),-5,562}, + {IF_BW(0,1,6),-10,641}, + {IF_BW(0,1,7),-16,692}, + {IF_BW(0,0,1),-16,752}, + {IF_BW(0,0,2),-8,832}, + {IF_BW(0,0,3),-1,900}, + {IF_BW(0,0,4),1,953}, + {IF_BW(0,0,5),-5,1121}, + {IF_BW(0,0,6),-10,1279}, + {IF_BW(0,0,7),-16,1379}, + {IF_BW(1,1,4),20,1428}, + {IF_BW(1,1,5),14,1678}, + {IF_BW(1,1,9),-62,1811}, + {IF_BW(1,0,15),-118,1915}, + {IF_BW(1,0,1),5,2251}, + {IF_BW(1,0,2),13,2488}, + {IF_BW(1,0,3),18,2693}, + {IF_BW(1,0,4),20,2849}, + {IF_BW(1,0,8),-17,3355}, //-19 + {IF_BW(1,0,9),-62,3618}, + {IF_BW(1,0,10),-31,4202}, + {IF_BW(1,0,11),-32,4684}, + {IF_BW(1,0,12),-38,5188}, + {IF_BW(1,0,13),-25,5770}, // -14 + {IF_BW(1,0,14),-15,6207}, // -9 #endif