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

Some code size squeezing

Browse Source
pull/8/head
erikkaashoek 5 years ago
parent 922c682164
commit 28b6712338
6 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File

6
main.c
Unescape View File

@ -476,7 +476,7 @@ calculate:
return value; return value;
} }
double float
my_atof(const char *p) my_atof(const char *p)
{ {
int neg = FALSE; int neg = FALSE;
@ -484,11 +484,11 @@ my_atof(const char *p)
neg = TRUE; neg = TRUE;
if (*p == '-' || *p == '+') if (*p == '-' || *p == '+')
p++; p++;
double x = my_atoi(p); float x = my_atoi(p);
while (_isdigit((int)*p)) while (_isdigit((int)*p))
p++; p++;
if (*p == '.') { if (*p == '.') {
double d = 1.0f; float d = 1.0f;
p++; p++;
while (_isdigit((int)*p)) { while (_isdigit((int)*p)) {
d /= 10; d /= 10;

33
nanovna.h
Unescape View File

@ -130,7 +130,7 @@ void update_frequencies(void);
void set_sweep_frequency(int type, uint32_t frequency); void set_sweep_frequency(int type, uint32_t frequency);
uint32_t get_sweep_frequency(int type); uint32_t get_sweep_frequency(int type);
void my_microsecond_delay(int t); void my_microsecond_delay(int t);
double my_atof(const char *p); float my_atof(const char *p);
int shell_printf(const char *fmt, ...); int shell_printf(const char *fmt, ...);
void toggle_sweep(void); void toggle_sweep(void);
@ -710,7 +710,7 @@ extern uint32_t frequencies[POINTS_COUNT];
extern const float unit_scale_value[]; extern const float unit_scale_value[];
extern const char * const unit_scale_text[]; extern const char * const unit_scale_text[];
#if 1 #if 1 // Still sufficient flash
// Flash save area - flash7 : org = 0x0801B000, len = 20k in *.ld file // Flash save area - flash7 : org = 0x0801B000, len = 20k in *.ld file
// 2k - for config save // 2k - for config save
// 9 * 2k for setting_t + stored trace // 9 * 2k for setting_t + stored trace
@ -725,20 +725,23 @@ extern const char * const unit_scale_text[];
#define SAVE_PROP_CONFIG_SIZE 0x00000800 #define SAVE_PROP_CONFIG_SIZE 0x00000800
// Should include all save slots // Should include all save slots
#define SAVE_CONFIG_AREA_SIZE (SAVE_CONFIG_SIZE + SAVEAREA_MAX * SAVE_PROP_CONFIG_SIZE) #define SAVE_CONFIG_AREA_SIZE (SAVE_CONFIG_SIZE + SAVEAREA_MAX * SAVE_PROP_CONFIG_SIZE)
#else // Just in case flash runs out
#else // Flash save area - flash7 : org = 0x0801D000, len = 12k in *.ld file
#define SAVEAREA_MAX 4 // 2k - for config save
// Begin addr 0x0801C000 // 9 * 2k for setting_t + stored trace
#define SAVE_CONFIG_AREA_SIZE 0x00004000 #define SAVEAREA_MAX 5
// config save area // STM32 minimum page size for write
#define SAVE_CONFIG_ADDR 0x0801C000 #define FLASH_PAGESIZE 0x800
// properties_t save area // config save area (flash7 addr)
#define SAVE_PROP_CONFIG_0_ADDR 0x0801C800 #define SAVE_CONFIG_ADDR 0x0801D000
#define SAVE_PROP_CONFIG_1_ADDR 0x0801D000 #define SAVE_CONFIG_SIZE 0x00000800
#define SAVE_PROP_CONFIG_2_ADDR 0x0801D800 // setting_t save area (save area + config size)
#define SAVE_PROP_CONFIG_3_ADDR 0x0801E000 #define SAVE_PROP_CONFIG_ADDR (SAVE_CONFIG_ADDR + SAVE_CONFIG_SIZE)
#define SAVE_PROP_CONFIG_4_ADDR 0x0801e800 #define SAVE_PROP_CONFIG_SIZE 0x00000800
// Should include all save slots
#define SAVE_CONFIG_AREA_SIZE (SAVE_CONFIG_SIZE + SAVEAREA_MAX * SAVE_PROP_CONFIG_SIZE)
#endif #endif
#if 0 #if 0
typedef struct properties { typedef struct properties {
uint32_t magic; uint32_t magic;

29
plot.c
Unescape View File

@ -466,30 +466,31 @@ draw_on_strut(int v0, int d, int color)
#define SQRT_50 ((float)7.0710678118654) #define SQRT_50 ((float)7.0710678118654)
#define LOG_10_SQRT_50 ((float)0.84948500216800) #define LOG_10_SQRT_50 ((float)0.84948500216800)
#define POW_30_20 ((float) 0.215443469) #define POW_30_20 ((float) 0.215443469)
#define POW_SQRT 1.5234153789 #define POW_SQRT ((float)1.5234153789)
/* /*
* calculate log10(abs(gamma)) * calculate log10f(abs(gamma))
*/ */
float float
value(const float v) value(const float v)
{ {
switch(setting.unit) switch(setting.unit)
{ {
case U_DBMV: case U_DBMV:
// return v + 30.0 + 20.0*log10(sqrt(50)); // return v + 30.0 + 20.0*log10f(sqrt(50));
return v + 30.0 + 20.0*LOG_10_SQRT_50; //TODO convert constants to single float number as GCC compiler does runtime calculation return v + 30.0 + 20.0*LOG_10_SQRT_50; //TODO convert constants to single float number as GCC compiler does runtime calculation
break; break;
case U_DBUV: case U_DBUV:
// return v + 90.0 + 20.0*log10(sqrt(50.0)); //TODO convert constants to single float number as GCC compiler does runtime calculation // return v + 90.0 + 20.0*log10f(sqrt(50.0)); //TODO convert constants to single float number as GCC compiler does runtime calculation
return v + 90.0 + 20.0*LOG_10_SQRT_50; return v + 90.0 + 20.0*LOG_10_SQRT_50;
break; break;
case U_VOLT: case U_VOLT:
// return pow(10, (v-30.0)/20.0) * sqrt(50.0); // return pow(10, (v-30.0)/20.0) * sqrt((float)50.0);
return pow(10, (v-30.0)/20.0)*SQRT_50; return pow((float)10.0, (v-(float)30.0)/(float)20.0)*SQRT_50; // Do NOT change pow to powf as this will increase the size
// return pow(10, v/20.0) * POW_SQRT; //TODO there is an error in this calculation as the outcome is different from the not optimized version // return pow(10, v/20.0) * POW_SQRT; //TODO there is an error in this calculation as the outcome is different from the not optimized version
break; break;
case U_WATT: case U_WATT:
return pow(10, v/10.0)/1000.0; return pow((float)10.0, v/10.0)/1000.0; // Do NOT change pow to powf as this will increase the size
break; break;
} }
// case U_DBM: // case U_DBM:
@ -503,19 +504,19 @@ to_dBm(const float v)
switch(setting.unit) switch(setting.unit)
{ {
case U_DBMV: case U_DBMV:
// return v - 30.0 - 20.0*log10(sqrt(50)); // return v - 30.0 - 20.0*log10f(sqrt(50));
return v - 30.0 - 20.0*LOG_10_SQRT_50; return v - 30.0 - 20.0*LOG_10_SQRT_50;
break; break;
case U_DBUV: case U_DBUV:
// return v - 90.0 - 20.0*log10(sqrt(50.0)); //TODO convert constants to single float number as GCC compiler does runtime calculation // return v - 90.0 - 20.0*log10f(sqrt(50.0)); //TODO convert constants to single float number as GCC compiler does runtime calculation
return v - 90.0 - 20.0*LOG_10_SQRT_50; return v - 90.0 - 20.0*LOG_10_SQRT_50;
break; break;
case U_VOLT: case U_VOLT:
// return log10( v / (sqrt(50.0))) * 20.0 + 30.0 ; // return log10f( v / (sqrt(50.0))) * 20.0 + 30.0 ;
return log10( v / (SQRT_50)) * 20.0 + 30.0 ; return log10f( v / (SQRT_50)) * 20.0 + 30.0 ;
break; break;
case U_WATT: case U_WATT:
return log10(v*1000.0)*10.0; return log10f(v*1000.0)*10.0;
break; break;
} }
// case U_DBM: // case U_DBM:
@ -846,7 +847,7 @@ trace_get_value_string_delta(int t, char *buf, int len, float array[POINTS_COUNT
extern const char *unit_string[]; extern const char *unit_string[];
static void trace_get_value_string( void trace_get_value_string(
int t, char *buf, int len, int t, char *buf, int len,
int i, float coeff[POINTS_COUNT], int i, float coeff[POINTS_COUNT],
int ri, int mtype, int ri, int mtype,
@ -916,7 +917,7 @@ static void trace_get_value_string(
#endif #endif
v = value(coeff[i]); v = value(coeff[i]);
if (mtype & M_NOISE) if (mtype & M_NOISE)
v = v - 10*log10(actual_rbw_x10*100.0); v = v - 10*log10f(actual_rbw_x10*100.0);
if (v == -INFINITY) if (v == -INFINITY)
plot_printf(buf, len, "-INF"); plot_printf(buf, len, "-INF");
else { else {

4
sa_cmd.c
Unescape View File

@ -14,6 +14,8 @@
* the Free Software Foundation, Inc., 51 Franklin Street, * the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#pragma GCC push_options
#pragma GCC optimize ("Os")
static int VFO = 0; static int VFO = 0;
@ -606,4 +608,6 @@ VNA_SHELL_FUNCTION(cmd_scanraw)
redraw_request = 0; // disable screen update in this mode redraw_request = 0; // disable screen update in this mode
} }
#pragma GCC pop_options

2
sa_core.c
Unescape View File

@ -22,7 +22,7 @@
#include "stdlib.h" #include "stdlib.h"
#pragma GCC push_options #pragma GCC push_options
#pragma GCC optimize ("Og") #pragma GCC optimize ("Os")
//#define __DEBUG_AGC__ If set the AGC value will be shown in the stored trace and FAST_SWEEP rmmode will be disabled //#define __DEBUG_AGC__ If set the AGC value will be shown in the stored trace and FAST_SWEEP rmmode will be disabled

4
ui_sa.c
Unescape View File

@ -16,6 +16,9 @@
* the Free Software Foundation, Inc., 51 Franklin Street, * the Free Software Foundation, Inc., 51 Franklin Street,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#pragma GCC push_options
#pragma GCC optimize ("Os")
#define FORM_ICON_WIDTH 16 #define FORM_ICON_WIDTH 16
#define FORM_ICON_HEIGHT 16 #define FORM_ICON_HEIGHT 16
@ -1998,3 +2001,4 @@ menu_move_top(void)
menu_move_back(); menu_move_back();
} }
#pragma GCC pop_options

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.