Skip to content

fix tinySA3 build (issue #138) #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ho-Ro wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix tinySA3 build (issue #138) #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions chconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@
*/
#ifdef TINYSA4
#define CH_CFG_USE_WAITEXIT TRUE
#else
#define CH_CFG_USE_WAITEXIT FALSE
#endif

/**
Expand Down
9 changes: 7 additions & 2 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2266,13 +2266,18 @@ VNA_SHELL_FUNCTION(cmd_info)
(void)argc;
(void)argv;
int i = 0;
#ifdef TINYSA3
while (info_about[i]) {
shell_printf("%s%s\r\n", info_about[i], (i == 0 ? hw_text : ""));
shell_printf("%s\r\n", info_about[i]);
i++;
}
#ifdef TINYSA3
if (has_esd)
shell_printf("ESD protected\r\n");
#else
while (info_about[i]) {
shell_printf("%s%s\r\n", info_about[i], (i == 0 ? hw_text : ""));
i++;
}
#endif
}
#endif
Expand Down
4 changes: 2 additions & 2 deletions nanovna.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
*/
#include "ch.h"

//#ifdef TINYSA_F303
#ifdef TINYSA_F303
#ifdef TINYSA_F072
#error "Remove comment for #ifdef TINYSA_F303"
#endif
#ifndef TINYSA4
#define TINYSA4
#endif
#define TINYSA4_PROTO
//#endif
#endif

#ifdef TINYSA_F072
#ifdef TINYSA_F303
Expand Down
6 changes: 4 additions & 2 deletions sa_cmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,16 +608,18 @@ VNA_SHELL_FUNCTION(cmd_if)
#ifdef TINYSA4
if (hw_if)
t = "1067M..1073M";
usage_printf("usage: if {%s}\r\n%QHz\r\n", t, setting.frequency_IF);
#else
usage_printf("usage: if {433M..435M}\r\n%QHz\r\n", setting.frequency_IF);
t = "433M..435M";
#endif
usage_printf("usage: if {%s}\r\n%QHz\r\n", t, setting.frequency_IF);
return;
}
freq_t a = (freq_t)my_atoi(argv[0]);
freq_t f = DEFAULT_IF;
#ifdef TINYSA4
if (hw_if)
f = DEFAULT_IF_PLUS;
#endif
if (a!= 0 &&( a < (f - (freq_t)5000000) || a>(f + (freq_t)5000000)))
goto usage;
setting.auto_IF = false;
Expand Down
2 changes: 1 addition & 1 deletion ui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6396,7 +6396,7 @@ void draw_cal_status(void)
// Compact status string
// ili9341_set_background(LCD_FG_COLOR);
ili9341_set_foreground(LCD_FG_COLOR);
strncpy(buf," ",BLEN-1);
strncpy(buf," ",BLEN);
if (setting.auto_IF)
buf[0] = 'f';
else
Expand Down