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

Small memory optim

Browse Source
tinySA
erikkaashoek 6 years ago
parent 4683b88d0c
commit b3e8065857
3 changed files with 26 additions and 41 deletions
Show Stats Download Patch File Download Diff File

4
STM32F072xB.ld
Unescape View File

@ -19,14 +19,14 @@
*/ */
MEMORY MEMORY
{ {
flash0 : org = 0x08000000, len = 96k flash0 : org = 0x08000000, len = 104k
flash1 : org = 0x00000000, len = 0 flash1 : org = 0x00000000, len = 0
flash2 : org = 0x00000000, len = 0 flash2 : org = 0x00000000, len = 0
flash3 : org = 0x00000000, len = 0 flash3 : org = 0x00000000, len = 0
flash4 : org = 0x00000000, len = 0 flash4 : org = 0x00000000, len = 0
flash5 : org = 0x00000000, len = 0 flash5 : org = 0x00000000, len = 0
flash6 : org = 0x00000000, len = 0 flash6 : org = 0x00000000, len = 0
flash7 : org = 0x08018000, len = 32k flash7 : org = 0x0801C000, len = 16k
ram0 : org = 0x20000000, len = 16k ram0 : org = 0x20000000, len = 16k
ram1 : org = 0x00000000, len = 0 ram1 : org = 0x00000000, len = 0
ram2 : org = 0x00000000, len = 0 ram2 : org = 0x00000000, len = 0

14
nanovna.h
Unescape View File

@ -427,15 +427,15 @@ void show_logo(void);
#if 1 #if 1
#define SAVEAREA_MAX 5 #define SAVEAREA_MAX 5
// Begin addr 0x08018000 // Begin addr 0x08018000
#define SAVE_CONFIG_AREA_SIZE 0x00008000 #define SAVE_CONFIG_AREA_SIZE 0x00000800
// config save area // config save area
#define SAVE_CONFIG_ADDR 0x08018000 #define SAVE_CONFIG_ADDR 0x0801C000
// properties_t save area // properties_t save area
#define SAVE_PROP_CONFIG_0_ADDR 0x08018800 #define SAVE_PROP_CONFIG_0_ADDR 0x0801C800
#define SAVE_PROP_CONFIG_1_ADDR 0x0801a000 #define SAVE_PROP_CONFIG_1_ADDR 0x0801D000
#define SAVE_PROP_CONFIG_2_ADDR 0x0801b800 #define SAVE_PROP_CONFIG_2_ADDR 0x0801D800
#define SAVE_PROP_CONFIG_3_ADDR 0x0801d000 #define SAVE_PROP_CONFIG_3_ADDR 0x0801E000
#define SAVE_PROP_CONFIG_4_ADDR 0x0801e800 #define SAVE_PROP_CONFIG_4_ADDR 0x0801E800
#else #else
#define SAVEAREA_MAX 4 #define SAVEAREA_MAX 4
// Begin addr 0x0801C000 // Begin addr 0x0801C000

45
ui_sa.c
Unescape View File

@ -780,8 +780,7 @@ static void menu_item_modify_attribute(
int mark = false; int mark = false;
if (menu == menu_mode) { if (menu == menu_mode) {
if (item == GetMode()+1) { if (item == GetMode()+1) {
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} else if (item == 5) { } else if (item == 5) {
plot_printf(uistat.text, sizeof uistat.text, menu_reffer_text[get_refer_output()+1]); plot_printf(uistat.text, sizeof uistat.text, menu_reffer_text[get_refer_output()+1]);
} }
@ -793,73 +792,59 @@ static void menu_item_modify_attribute(
} }
} else if (menu == menu_reffer) { } else if (menu == menu_reffer) {
if (item < 5 && item == get_refer_output() + 1){ if (item < 5 && item == get_refer_output() + 1){
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
} else if (menu == menu_reffer2) { } else if (menu == menu_reffer2) {
if (item == get_refer_output() - 4){ if (item == get_refer_output() - 4){
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
} else if (menu == menu_stimulus) { } else if (menu == menu_stimulus) {
if (item == 5 /* PAUSE */ && !(sweep_mode&SWEEP_ENABLE)) { if (item == 5 /* PAUSE */ && !(sweep_mode&SWEEP_ENABLE)) {
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
} else if (menu == menu_scale) { } else if (menu == menu_scale) {
#if 0 #if 0
if (item == 4 /* Spur reduction */ && GetSpur()) { if (item == 4 /* Spur reduction */ && GetSpur()) {
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
#endif #endif
} else if (menu == menu_average) { } else if (menu == menu_average) {
if (item == GetAverage()){ if (item == GetAverage()){
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
} else if (menu == menu_dBper) { } else if (menu == menu_dBper) {
if (menu_dBper_value[item] == get_trace_scale(1)){ if (menu_dBper_value[item] == get_trace_scale(1)){
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
} else if (menu == menu_rbw) { } else if (menu == menu_rbw) {
if (rbwsel[item] == GetRBW()){ if (rbwsel[item] == GetRBW()){
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
} else if (menu == menu_drive || menu == menu_drive_wide) { } else if (menu == menu_drive || menu == menu_drive_wide) {
if (item == setting_drive){ if (item == setting_drive){
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
} else if (menu == menu_storage) { } else if (menu == menu_storage) {
if (item ==0 && GetStorage()){ if (item ==0 && GetStorage()){
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
if (item == 2 && GetSubtractStorage()){ if (item == 2 && GetSubtractStorage()){
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
if (item == 3 && get_waterfall()){ if (item == 3 && get_waterfall()){
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
} else if (menu == menu_settings2 || menu == menu_settingshigh2) { } else if (menu == menu_settings2 || menu == menu_settingshigh2) {
if (item ==0 && setting_agc){ if (item ==0 && setting_agc){
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
if (item == 1 && setting_lna){ if (item == 1 && setting_lna){
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
if (item == 2 && setting_tracking){ // should not happen in high mode if (item == 2 && setting_tracking){ // should not happen in high mode
*bg = DEFAULT_MENU_TEXT_COLOR; mark = true;
*fg = config.menu_normal_color;
} }
} }
if (mark) { if (mark) {

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.