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

Battery ICON in output mode repaired

Browse Source
Removed_REF_marker
erikkaashoek 5 years ago
parent 9f8467c7fa
commit e674ea70a6
6 changed files with 50 additions and 67 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,52 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project>
<configuration id="cdt.managedbuild.toolchain.gnu.cross.base.1338786050" name="Default">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1811835542642612462" 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.g++"/>
</provider>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
</extension>
</configuration>
<configuration id="cdt.managedbuild.toolchain.gnu.cross.base.1338786050.2017311615" name="tinySA4">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-1770377190971" 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.g++"/>
</provider>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
</extension>
</configuration>
<configuration id="cdt.managedbuild.toolchain.gnu.cross.base.1338786050" name="Default">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1944045455541829" 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.g++"/>
</provider>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
</extension>
</configuration>
<configuration id="cdt.managedbuild.toolchain.gnu.cross.base.1338786050.2017311615" name="tinySA4">
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1944045455541829" 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.g++"/>
</provider>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
</extension>
</configuration>
</project>

2
nanovna.h
Unescape View File

@ -69,8 +69,8 @@
#define __NICE_BIG_FONT__
#define __QUASI_PEAK__
#ifdef TINYSA4
#define __HARMONIC__
#define __REMOTE_DESKTOP__
#define __HARMONIC__
#endif
#ifdef TINYSA3

27
sa_core.c
Unescape View File

@ -1263,9 +1263,9 @@ void calculate_step_delay(void)
else if (actual_rbw_x10 >= 3000) { SI4432_step_delay = 400; SI4432_offset_delay = 100; spur_gate = 200000; }
else if (actual_rbw_x10 >= 1000) { SI4432_step_delay = 400; SI4432_offset_delay = 100; spur_gate = 100000; }
else if (actual_rbw_x10 >= 300) { SI4432_step_delay = 400; SI4432_offset_delay = 120; spur_gate = 100000; }
else if (actual_rbw_x10 >= 100) { SI4432_step_delay = 500; SI4432_offset_delay = 180; spur_gate = 100000; }
else if (actual_rbw_x10 >= 100) { SI4432_step_delay = 400; SI4432_offset_delay = 120; spur_gate = 100000; }
else if (actual_rbw_x10 >= 30) { SI4432_step_delay = 900; SI4432_offset_delay = 300; spur_gate = 100000; }
else if (actual_rbw_x10 >= 10) { SI4432_step_delay = 3000; SI4432_offset_delay = 1000; spur_gate = 100000; }
else if (actual_rbw_x10 >= 10) { SI4432_step_delay = 3000; SI4432_offset_delay = 600; spur_gate = 100000; }
else { SI4432_step_delay = 9000; SI4432_offset_delay =3000; spur_gate = 100000; }
#endif
if (setting.step_delay_mode == SD_PRECISE) // In precise mode wait twice as long for RSSI to stabilize
@ -1409,7 +1409,7 @@ void setup_sa(void)
#ifdef __SI4463__
SI4463_init_rx(); // Must be before ADF4351_setup!!!!
#endif
#ifdef TINYSA
#ifdef TINYSA4
ADF4351_Setup();
enable_extra_lna(false);
enable_ultra(false);
@ -2115,7 +2115,7 @@ static const int fm_modulation[4][MODULATION_STEPS] = // Avoid sign changes in
static const int fm_modulation_offset[4] =
{
#ifdef TINYSA
#ifdef TINYSA4
5000, //85000,
0, //80000,
-2700, //165000,
@ -2885,7 +2885,8 @@ modulation_again:
RCC->CFGR = orig_CFGR;
}
#define IGNORE_RSSI 30000
pureRSSI_t rssi = (RSSI>0 ? RSSI + correct_RSSI + correct_RSSI_freq : IGNORE_RSSI); // add correction
// pureRSSI_t rssi = (RSSI>0 ? RSSI + correct_RSSI + correct_RSSI_freq : IGNORE_RSSI); // add correction
pureRSSI_t rssi = RSSI + correct_RSSI + correct_RSSI_freq; // add correction
if (false) {
abort:
rssi = 0;
@ -4352,7 +4353,7 @@ void self_test(int test)
setting.repeat = 20;
#endif
setting.step_delay = setting.step_delay * 5 / 4;
setting.offset_delay = setting.step_delay / 2;
setting.offset_delay = setting.step_delay ;
setting.rbw_x10 = force_rbw(j);
shell_printf("RBW = %f, ",setting.rbw_x10/10.0);
@ -4378,7 +4379,7 @@ void self_test(int test)
// }
shell_printf("Start level = %f, ",peakLevel);
#if 1 // Enable for step delay tuning
while (setting.step_delay > 10 && test_value != 0 && test_value > saved_peakLevel - 0.5) {
while (setting.step_delay > 10 && test_value != 0 && test_value > saved_peakLevel - 1.5) {
test_prepare(TEST_RBW);
setting.spur_removal = S_OFF;
setting.step_delay_mode = SD_NORMAL;
@ -4391,7 +4392,7 @@ void self_test(int test)
// setting.repeat = 10;
test_acquire(TEST_RBW); // Acquire test
test_validate(TEST_RBW); // Validate test
// shell_printf(" Step %f, %d",peakLevel, setting.step_delay);
shell_printf(" Step delay %f, %d\n\r",peakLevel, setting.step_delay);
}
setting.step_delay = setting.step_delay * 5 / 4; // back one level
@ -4400,7 +4401,7 @@ void self_test(int test)
#endif
#ifdef TINYSA4
setting.offset_delay = 5000;
setting.offset_delay = 10000;
#else
setting.offset_delay = 1600;
#endif
@ -4410,7 +4411,7 @@ void self_test(int test)
while (setting.offset_delay > 0 && test_value != 0 && test_value > saved_peakLevel - 1.5) {
test_prepare(TEST_RBW);
setting.step_delay_mode = SD_FAST;
setting.offset_delay /= 2;
setting.offset_delay = setting.offset_delay * 4 / 5;
setting.spur_removal = S_OFF;
if (setting.rbw_x10 < 1000)
set_sweep_frequency(ST_SPAN, (freq_t)(setting.rbw_x10 * 5000)); // 50 times RBW
@ -4419,11 +4420,13 @@ void self_test(int test)
// setting.repeat = 10;
test_acquire(TEST_RBW); // Acquire test
test_validate(TEST_RBW); // Validate test
// shell_printf(" Step %f, %d",peakLevel, setting.step_delay);
shell_printf(" Offset delay %f, %d\n\r",peakLevel, setting.offset_delay);
}
setting.offset_delay = setting.offset_delay * 5 / 4; // back one level
}
#endif
shell_printf("End level = %f, step time = %d, fast delay = %d\n\r",peakLevel, setting.step_delay, setting.offset_delay*2);
shell_printf("End level = %f, step time = %d, fast delay = %d\n\r",peakLevel, setting.step_delay, setting.offset_delay);
shell_printf("---------------------------------------------\n\r");
if (setting.test_argument != 0)
break;
}

9
si4468.c
Unescape View File

@ -45,11 +45,11 @@
#define SI4432_SPI SPI1
//#define SI4432_SPI_SPEED SPI_BR_DIV64
//#define SI4432_SPI_SPEED SPI_BR_DIV32
#define SI4432_SPI_SPEED SPI_BR_DIV16
#define SI4432_SPI_SPEED SPI_BR_DIV4
//#define ADF_SPI_SPEED SPI_BR_DIV64
//#define ADF_SPI_SPEED SPI_BR_DIV32
#define ADF_SPI_SPEED SPI_BR_DIV4
#define ADF_SPI_SPEED SPI_BR_DIV2
#define PE_SPI_SPEED SPI_BR_DIV32
@ -1361,6 +1361,8 @@ static uint8_t SI4463_read_byte( uint8_t ADR )
{
uint8_t DATA ;
set_SPI_mode(SPI_MODE_SI);
SPI_BR_SET(SI4432_SPI, SI4432_SPI_SPEED);
SI_CS_LOW;
shiftOut( ADR );
DATA = shiftIn();
@ -1410,6 +1412,7 @@ static uint8_t SI4463_wait_response(void* buff, uint8_t len, uint8_t use_timeout
void SI4463_do_api(void* data, uint8_t len, void* out, uint8_t outLen)
{
set_SPI_mode(SPI_MODE_SI);
SPI_BR_SET(SI4432_SPI, SI4432_SPI_SPEED);
#if 0
if(SI4463_wait_response(NULL, 0, true)) // Make sure it's ok to send a command
#else
@ -1746,6 +1749,8 @@ static uint8_t SI4463_get_device_status(void)
uint8_t getFRR(uint8_t reg)
{
set_SPI_mode(SPI_MODE_SI);
SPI_BR_SET(SI4432_SPI, SI4432_SPI_SPEED);
return SI4463_read_byte(reg);
}

2
ui.c
Unescape View File

@ -1423,7 +1423,7 @@ menu_invoke(int item)
menuaction_acb_t cb = (menuaction_acb_t)menu->reference;
if (cb) (*cb)(item, menu->data, NULL);
// if (!(menu->type & MT_FORM))
redraw_request |= REDRAW_CAL_STATUS;
redraw_request |= REDRAW_CAL_STATUS | REDRAW_BATTERY;
break;
}
case MT_SUBMENU:

4
ui_sa.c
Unescape View File

@ -802,7 +802,7 @@ static UI_FUNCTION_ADV_CALLBACK(menu_spur_acb)
} else {
b->param_1.text = "MIRROR\nMASKING";
#ifdef TINYSA4
b->icon = AUTO_ICON(setting.mirror_masking);
b->icon = AUTO_ICON(setting.mirror_masking); // mirror_masking does not yet have an auto mode so this is never an auto icon
#else
b->icon = setting.mirror_masking == 0 ? BUTTON_ICON_NOCHECK : BUTTON_ICON_CHECK;
#endif
@ -2764,7 +2764,7 @@ redraw_cal_status:
ili9341_drawstring(buf, x, y);
y += YSTEP + YSTEP/2 ;
#endif
#ifdef TINYSA
#ifdef TINYSA4
if (setting.extra_lna){
ili9341_set_foreground(LCD_BRIGHT_COLOR_GREEN);
y = add_quick_menu("LNA:ON", x, y, (menuitem_t *)menu_level);

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.