ttrftech/NanoVNA
1
0
Fork 0
mirror of https://github.com/ttrftech/NanoVNA.git synced 2025-12-06 03:31:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add pause/resume

Browse source
This commit is contained in:
TT 2016-09-28 09:35:20 +09:00
parent 92161068db
commit 90db23ffc0
2 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chconf.h
View file

@ -193,7 +193,7 @@
* @note The default is @p FALSE.
* @note Requires @p CH_CFG_USE_MUTEXES.
*/
#define CH_CFG_USE_MUTEXES_RECURSIVE FALSE
#define CH_CFG_USE_MUTEXES_RECURSIVE TRUE
/**
* @brief Conditional Variables APIs.

43
main.c
View file

@ -39,6 +39,10 @@ int I2CRead(int addr, uint8_t d0)
void scan_lcd(void);
static MUTEX_DECL(mutex);
static THD_WORKING_AREA(waThread1, 512);
static THD_FUNCTION(Thread1, arg)
{
@ -57,11 +61,39 @@ static THD_FUNCTION(Thread1, arg)
palSetPad(GPIOC, 13);
chThdSleepMilliseconds(time);
#else
chMtxLock(&mutex);
scan_lcd();
chMtxUnlock(&mutex);
#endif
}
}
void
pause_sweep(void)
{
chMtxLock(&mutex);
}
void
resume_sweep(void)
{
chMtxUnlockAll();
}
static void cmd_pause(BaseSequentialStream *chp, int argc, char *argv[])
{
(void)argc;
(void)argv;
pause_sweep();
}
static void cmd_resume(BaseSequentialStream *chp, int argc, char *argv[])
{
(void)argc;
(void)argv;
resume_sweep();
}
static void cmd_reset(BaseSequentialStream *chp, int argc, char *argv[])
{
(void)argc;
@ -78,6 +110,7 @@ static void cmd_reset(BaseSequentialStream *chp, int argc, char *argv[])
;
}
int32_t frequency_offset = 5000;
int32_t frequency = 10000000;
uint8_t drive_strength = SI5351_CLK_DRIVE_STRENGTH_2MA;
@ -110,6 +143,7 @@ static void cmd_offset(BaseSequentialStream *chp, int argc, char *argv[])
static void cmd_freq(BaseSequentialStream *chp, int argc, char *argv[])
{
int freq;
pause_sweep();
if (argc != 1) {
chprintf(chp, "usage: freq {frequency(Hz)}\r\n");
return;
@ -240,6 +274,7 @@ static void cmd_data(BaseSequentialStream *chp, int argc, char *argv[])
int i, j;
int len;
pause_sweep();
if (argc == 1)
dump_selection = atoi(argv[0]);
@ -264,6 +299,7 @@ static void cmd_gamma(BaseSequentialStream *chp, int argc, char *argv[])
(void)argc;
(void)argv;
pause_sweep();
wait_count = 4;
while (wait_count)
;
@ -287,6 +323,7 @@ static void cmd_scan(BaseSequentialStream *chp, int argc, char *argv[])
(void)argc;
(void)argv;
pause_sweep();
freq = freq_start;
step = (freq_stop - freq_start) / (sweep_points-1);
delay = set_frequency(freq);
@ -345,6 +382,7 @@ static void cmd_scan_lcd(BaseSequentialStream *chp, int argc, char *argv[])
{
(void)argc;
(void)argv;
pause_sweep();
scan_lcd();
}
@ -389,6 +427,7 @@ static void cmd_test(BaseSequentialStream *chp, int argc, char *argv[])
(void)argc;
(void)argv;
pause_sweep();
#if 0
for (i = 0; i < 100; i++) {
palClearPad(GPIOC, GPIOC_LED);
@ -502,6 +541,8 @@ static const ShellCommand commands[] =
{ "sweep", cmd_sweep },
{ "test", cmd_test },
{ "plot", cmd_scan_lcd },
{ "pause", cmd_pause },
{ "resume", cmd_resume },
{ NULL, NULL }
};
@ -516,6 +557,8 @@ int main(void)
halInit();
chSysInit();
chMtxObjectInit(&mutex);
/*
* Starting DAC1 driver, setting up the output pin as analog as suggested
* by the Reference Manual.