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

cmd update

Browse Source
pull/34/head
erikkaashoek 3 years ago
parent 95f64ae07f
commit 698d45b483
5 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File

4
.settings/language.settings.xml
Unescape View File

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/> <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="300448615141682" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="461091318661355" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -17,7 +17,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/> <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="300448615141682" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="461091318661355" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

2
main.c
Unescape View File

@ -86,7 +86,7 @@ uint8_t auto_capture = false;
// Version text, displayed in Config->Version menu, also send by info command // Version text, displayed in Config->Version menu, also send by info command
const char *info_about[]={ const char *info_about[]={
BOARD_NAME, BOARD_NAME,
"2019-2020 Copyright @Erik Kaashoek", "2019-2022 Copyright @Erik Kaashoek",
"2016-2020 Copyright @edy555", "2016-2020 Copyright @edy555",
"SW licensed under GPL. See: https://github.com/erikkaashoek/tinySA", "SW licensed under GPL. See: https://github.com/erikkaashoek/tinySA",
"Version: " VERSION, "Version: " VERSION,

2
nanovna.h
Unescape View File

@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#include "ch.h" #include "ch.h"
//#define TINYSA_F303
#ifdef TINYSA_F303 #ifdef TINYSA_F303
#ifdef TINYSA_F072 #ifdef TINYSA_F072
#error "Remove comment for #ifdef TINYSA_F303" #error "Remove comment for #ifdef TINYSA_F303"

26
sa_cmd.c
Unescape View File

@ -22,14 +22,24 @@ static int points = 101; // For 's' and 'm' commands
VNA_SHELL_FUNCTION(cmd_mode) VNA_SHELL_FUNCTION(cmd_mode)
{ {
#ifdef TINYSA3
static const char cmd_low_high[] = "low|high"; static const char cmd_low_high[] = "low|high";
#endif
static const char cmd_in_out[] = "input|output"; static const char cmd_in_out[] = "input|output";
if (argc != 2) { if (argc != 2) {
usage: usage:
#ifdef TINYSA4
shell_printf("usage: mode low %s\r\n", cmd_in_out);
#else
shell_printf("usage: mode %s %s\r\n", cmd_low_high,cmd_in_out); shell_printf("usage: mode %s %s\r\n", cmd_low_high,cmd_in_out);
#endif
return; return;
} }
#ifdef TINYSA3
int lh = get_str_index(argv[0], cmd_low_high); int lh = get_str_index(argv[0], cmd_low_high);
#else
int lh = 0;
#endif
int io = get_str_index(argv[1], cmd_in_out); int io = get_str_index(argv[1], cmd_in_out);
if (lh < 0 || io<0) if (lh < 0 || io<0)
goto usage; goto usage;
@ -40,18 +50,22 @@ VNA_SHELL_FUNCTION(cmd_mode)
set_mode(M_LOW); set_mode(M_LOW);
ui_mode_normal(); ui_mode_normal();
break; break;
#ifdef TINYSA3
case 1: case 1:
set_mode(M_HIGH); set_mode(M_HIGH);
ui_mode_normal(); ui_mode_normal();
break; break;
#endif
case 2: case 2:
set_mode(M_GENLOW); set_mode(M_GENLOW);
menu_push_lowoutput(); menu_push_lowoutput();
break; break;
#ifdef TINYSA3
case 3: case 3:
set_mode(M_GENHIGH); set_mode(M_GENHIGH);
menu_push_highoutput(); menu_push_highoutput();
break; break;
#endif
} }
} }
@ -295,7 +309,11 @@ VNA_SHELL_FUNCTION(cmd_ext_gain)
VNA_SHELL_FUNCTION(cmd_levelchange) VNA_SHELL_FUNCTION(cmd_levelchange)
{ {
if (argc != 1) { if (argc != 1) {
#ifdef TINYSA4
shell_printf("usage: levelchange -90..+90\r\n");
#else
shell_printf("usage: levelchange -70..+70\r\n"); shell_printf("usage: levelchange -70..+70\r\n");
#endif
return; return;
} }
float f = my_atof(argv[0]); float f = my_atof(argv[0]);
@ -400,7 +418,7 @@ VNA_SHELL_FUNCTION(cmd_rbw)
if (argc != 1) { if (argc != 1) {
usage: usage:
#ifdef TINYSA4 #ifdef TINYSA4
shell_printf("usage: rbw 0.3..850|auto\r\n"); shell_printf("usage: rbw 0.2..850|auto\r\n");
#else #else
shell_printf("usage: rbw 2..600|auto\r\n"); shell_printf("usage: rbw 2..600|auto\r\n");
#endif #endif
@ -428,7 +446,11 @@ VNA_SHELL_FUNCTION(cmd_if)
{ {
if (argc != 1) { if (argc != 1) {
usage: usage:
#ifdef TINYSA4
shell_printf("usage: if {975M..979M}\r\n%QHz\r\n", setting.frequency_IF);
#else
shell_printf("usage: if {433M..435M}\r\n%QHz\r\n", setting.frequency_IF); shell_printf("usage: if {433M..435M}\r\n%QHz\r\n", setting.frequency_IF);
#endif
return; return;
} else { } else {
freq_t a = (freq_t)my_atoi(argv[0]); freq_t a = (freq_t)my_atoi(argv[0]);
@ -934,7 +956,7 @@ VNA_SHELL_FUNCTION(cmd_correction)
{ {
(void)argc; (void)argc;
#ifdef TINYSA4 #ifdef TINYSA4
static const char cmd[] = "low|lna|out|high"; static const char cmd[] = "low|lna|out";
static const char range[] = "0-19"; static const char range[] = "0-19";
#else #else
static const char cmd[] = "low|high"; static const char cmd[] = "low|high";

2
ui_sa.c
Unescape View File

@ -1600,7 +1600,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_traces_acb)
break; break;
#ifdef TINYSA4 #ifdef TINYSA4
case 6: case 6:
save_to_sd(1+2<<current_trace); // frequencies + trace save_to_sd(1+(2<<current_trace)); // frequencies + trace
break; break;
#endif #endif
} }

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.