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

Merge DiSlor speed improvements

Browse Source
Removed_REF_marker
erikkaashoek 5 years ago
parent acc5cf582e
commit 9e287c0fe0
9 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File

14
chprintf.c
Unescape View File

@ -42,19 +42,15 @@
#define MAX_FILLER 11 #define MAX_FILLER 11
#define FLOAT_PRECISION 9 #define FLOAT_PRECISION 9
#pragma pack(push, 2)
static const uint32_t pow10[FLOAT_PRECISION+1] = { static const uint32_t pow10[FLOAT_PRECISION+1] = {
1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000
}; };
// Prefixes for values bigger then 1000.0 // Prefixes for values bigger then 1000.0
// 1 1e3, 1e6, 1e9, 1e12, 1e15, 1e18, 1e21, 1e24 // 1 1e3, 1e6, 1e9, 1e12, 1e15, 1e18, 1e21, 1e24
static char bigPrefix[] = {' ', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y', 0}; static const char bigPrefix[] = {' ', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y', 0};
// Prefixes for values less then 1.0 // Prefixes for values less then 1.0
// 1e-3, 1e-6, 1e-9, 1e-12, 1e-15, 1e-18, 1e-21, 1e-24 // 1e-3, 1e-6, 1e-9, 1e-12, 1e-15, 1e-18, 1e-21, 1e-24
static char smallPrefix[] = {'m', 0x1d, 'n', 'p', 'f', 'a', 'z', 'y', 0}; static const char smallPrefix[] = {'m', 0x1d, 'n', 'p', 'f', 'a', 'z', 'y', 0};
#pragma pack(pop)
#ifdef TINYSA4 #ifdef TINYSA4
typedef uint64_t ulong_t; typedef uint64_t ulong_t;
@ -189,7 +185,7 @@ static char *ftoa(char *p, float num, uint32_t precision) {
static char *ftoaS(char *p, float num, int precision) { static char *ftoaS(char *p, float num, int precision) {
char prefix=0; char prefix=0;
char *ptr; const char *ptr;
if (num > 1000.0){ if (num > 1000.0){
for (ptr = bigPrefix+1; *ptr && num > 1000.0; num/=1000, ptr++) for (ptr = bigPrefix+1; *ptr && num > 1000.0; num/=1000, ptr++)
; ;

54
ili9341.c
Unescape View File

@ -280,8 +280,14 @@ void spi_DMATxBuffer(uint8_t *buffer, uint16_t len) {
dmaStreamFlush(len); dmaStreamFlush(len);
} }
static void dmaWaitCompletionRxTx(void){
// Wait DMA completion
dmaWaitCompletion(dmatx);
dmaWaitCompletion(dmarx);
}
// SPI transmit byte buffer use DMA // SPI transmit byte buffer use DMA
void spi_DMARxBuffer(uint8_t *buffer, uint16_t len) { void spi_DMARxBuffer(uint8_t *buffer, uint16_t len, bool wait) {
uint8_t dummy_tx = 0xFF; uint8_t dummy_tx = 0xFF;
// Init Rx DMA buffer, size, mode (spi and mem data size is 8 bit) // Init Rx DMA buffer, size, mode (spi and mem data size is 8 bit)
dmaStreamSetMemory0(dmarx, buffer); dmaStreamSetMemory0(dmarx, buffer);
@ -296,9 +302,8 @@ void spi_DMARxBuffer(uint8_t *buffer, uint16_t len) {
// Start DMA exchange // Start DMA exchange
dmaStreamEnable(dmarx); dmaStreamEnable(dmarx);
dmaStreamEnable(dmatx); dmaStreamEnable(dmatx);
// Wait DMA completion if (wait)
dmaWaitCompletion(dmatx); dmaWaitCompletionRxTx();
dmaWaitCompletion(dmarx);
} }
#endif // __USE_DISPLAY_DMA__ #endif // __USE_DISPLAY_DMA__
@ -643,17 +648,9 @@ void ili9341_read_memory(int x, int y, int w, int h, uint16_t *out)
// receive pixel data to buffer // receive pixel data to buffer
#ifndef __USE_DISPLAY_DMA_RX__ #ifndef __USE_DISPLAY_DMA_RX__
spi_RxBuffer((uint8_t *)out, len * 3); spi_RxBuffer((uint8_t *)out, len * 3);
#else
spi_DMARxBuffer((uint8_t *)out, len * 3);
#endif
// restore speed if need
#ifdef LCD_SPI_RX_SPEED
SPI_BR_SET(LCD_SPI, LCD_SPI_SPEED);
#endif
LCD_CS_HIGH;
// Parse received data to RGB565 format // Parse received data to RGB565 format
uint8_t *rgbbuf = (uint8_t *)out; uint8_t *rgbbuf = (uint8_t *)out;
while (len-- > 0) { do {
uint8_t r, g, b; uint8_t r, g, b;
// read data is always 18bit // read data is always 18bit
r = rgbbuf[0]; r = rgbbuf[0];
@ -661,7 +658,34 @@ void ili9341_read_memory(int x, int y, int w, int h, uint16_t *out)
b = rgbbuf[2]; b = rgbbuf[2];
*out++ = RGB565(r, g, b); *out++ = RGB565(r, g, b);
rgbbuf += 3; rgbbuf += 3;
} }while(--len);
#else
// Set data size for DMA read
len*=3;
// Start DMA read, and not wait completion
spi_DMARxBuffer((uint8_t *)out, len, false);
// Parse received data to RGB565 format while data receive by DMA
uint8_t *rgbbuf = (uint8_t *)out;
do {
uint16_t left = dmaStreamGetTransactionSize(dmarx); // Get DMA data left
if (left+3 > len) continue;// Next pixel RGB data not ready
while (left < len){ // Process completed by DMA data
uint8_t r, g, b; // read data is always 18bit in RGB888 format
r = rgbbuf[0];
g = rgbbuf[1];
b = rgbbuf[2];
*out++ = RGB565(r, g, b);
rgbbuf+= 3;
len -= 3;
}
} while(len);
dmaWaitCompletionRxTx(); // Wait DMA completion and stop it
#endif
// restore speed if need
#ifdef LCD_SPI_RX_SPEED
SPI_BR_SET(LCD_SPI, LCD_SPI_SPEED);
#endif
LCD_CS_HIGH;
} }
#endif #endif
@ -685,7 +709,7 @@ void ili9341_read_memory(int x, int y, int w, int h, uint16_t *out)
#ifndef __USE_DISPLAY_DMA_RX__ #ifndef __USE_DISPLAY_DMA_RX__
spi_RxBuffer((uint8_t *)out, len * 2); spi_RxBuffer((uint8_t *)out, len * 2);
#else #else
spi_DMARxBuffer((uint8_t *)out, len * 2); spi_DMARxBuffer((uint8_t *)out, len * 2, true);
#endif #endif
// restore speed if need // restore speed if need
#ifdef LCD_SPI_RX_SPEED #ifdef LCD_SPI_RX_SPEED

11
main.c
Unescape View File

@ -896,16 +896,16 @@ VNA_SHELL_FUNCTION(cmd_capture)
} }
} }
void send_region(const char *t, int x, int y, int w, int h) void send_region(const char *t, int16_t x, int16_t y, int16_t w, int16_t h)
{ {
if (SDU1.config->usbp->state == USB_ACTIVE) { if (SDU1.config->usbp->state == USB_ACTIVE) {
shell_printf(t); shell_printf(t);
struct { struct {
char new_str[2]; char new_str[2];
uint16_t x; int16_t x;
uint16_t y; int16_t y;
uint16_t w; int16_t w;
uint16_t h; int16_t h;
} region={"\r\n", x,y,w,h}; } region={"\r\n", x,y,w,h};
streamWrite(shell_stream, (void*)&region, sizeof(region)); streamWrite(shell_stream, (void*)&region, sizeof(region));
} }
@ -1060,6 +1060,7 @@ void load_LCD_properties(void)
#endif #endif
setting.trace_scale = 10.0; setting.trace_scale = 10.0;
setting.trace_refpos = 0; setting.trace_refpos = 0;
setting.waterfall = W_OFF;
memcpy(setting._trace, def_trace, sizeof(def_trace)); memcpy(setting._trace, def_trace, sizeof(def_trace));
memcpy(setting._markers, def_markers, sizeof(def_markers)); memcpy(setting._markers, def_markers, sizeof(def_markers));
#ifdef __VNA__ #ifdef __VNA__

5
nanovna.h
Unescape View File

@ -205,7 +205,7 @@ void my_microsecond_delay(int t);
float my_atof(const char *p); float my_atof(const char *p);
int shell_printf(const char *fmt, ...); int shell_printf(const char *fmt, ...);
#ifdef __REMOTE_DESKTOP__ #ifdef __REMOTE_DESKTOP__
void send_region(const char *t, int x, int y, int w, int h); void send_region(const char *t, int16_t x, int16_t y, int16_t w, int16_t h);
void send_buffer(uint8_t * buf, int s); void send_buffer(uint8_t * buf, int s);
#endif #endif
void set_marker_frequency(int m, freq_t f); void set_marker_frequency(int m, freq_t f);
@ -998,7 +998,7 @@ enum {W_OFF, W_SMALL, W_BIG};
extern freq_t frequencies[POINTS_COUNT]; extern freq_t frequencies[POINTS_COUNT];
extern const float unit_scale_value[]; extern const float unit_scale_value[];
extern const char * const unit_scale_text[]; extern const char unit_scale_text[];
#ifdef TINYSA4 #ifdef TINYSA4
extern int debug_frequencies; extern int debug_frequencies;
#endif #endif
@ -1256,7 +1256,6 @@ typedef int16_t pureRSSI_t;
extern uint16_t actual_rbw_x10; extern uint16_t actual_rbw_x10;
int get_waterfall(void);
void toggle_tracking(void); void toggle_tracking(void);
void toggle_hambands(void); void toggle_hambands(void);
void reset_calibration(void); void reset_calibration(void);

36
plot.c
Unescape View File

@ -154,10 +154,8 @@ void update_grid(void)
grid_offset = (WIDTH) * ((fstart % grid) / 100) / (fspan / 100); grid_offset = (WIDTH) * ((fstart % grid) / 100) / (fspan / 100);
grid_width = (WIDTH) * (grid / 100) / (fspan / 1000); grid_width = (WIDTH) * (grid / 100) / (fspan / 1000);
if (get_waterfall()){ if (setting.waterfall)
ili9341_set_background(LCD_BG_COLOR); toggle_waterfall();
ili9341_fill(OFFSETX, graph_bottom, LCD_WIDTH - OFFSETX, CHART_BOTTOM - graph_bottom);
}
redraw_request |= REDRAW_FREQUENCY | REDRAW_AREA; redraw_request |= REDRAW_FREQUENCY | REDRAW_AREA;
} }
@ -1634,11 +1632,6 @@ static void update_waterfall(void){
// STOP_PROFILE; // STOP_PROFILE;
} }
int get_waterfall(void)
{
return(setting.waterfall);
}
//extern float peakLevel; //extern float peakLevel;
//extern float min_level; //extern float min_level;
//int w_max = -130; //int w_max = -130;
@ -1646,30 +1639,21 @@ int get_waterfall(void)
void void
toggle_waterfall(void) toggle_waterfall(void)
{ {
if (setting.waterfall == W_OFF) { if (setting.waterfall == W_SMALL) graph_bottom = SMALL_WATERFALL;
// w_min = (int)min_level; else if (setting.waterfall == W_BIG) graph_bottom = BIG_WATERFALL;
// w_max = (int)peakLevel; else /*if (setting.waterfall == W_OFF)*/graph_bottom = NO_WATERFALL;
// if (w_max < w_min + 20)
// w_max = w_min + 20;
graph_bottom = SMALL_WATERFALL;
setting.waterfall = W_SMALL;
} else if (setting.waterfall == W_SMALL) {
graph_bottom = BIG_WATERFALL;
setting.waterfall = W_BIG;
} else {
graph_bottom = NO_WATERFALL;
setting.waterfall = W_OFF;
}
_grid_y = graph_bottom / NGRIDY; _grid_y = graph_bottom / NGRIDY;
ili9341_set_background(LCD_BG_COLOR); if (setting.waterfall != W_OFF){
ili9341_fill(OFFSETX, graph_bottom, LCD_WIDTH - OFFSETX, CHART_BOTTOM - graph_bottom); ili9341_set_background(LCD_BG_COLOR);
ili9341_fill(OFFSETX, graph_bottom, LCD_WIDTH - OFFSETX, CHART_BOTTOM - graph_bottom);
}
request_to_redraw_grid(); request_to_redraw_grid();
} }
void void
disable_waterfall(void) disable_waterfall(void)
{ {
setting.waterfall = W_BIG; setting.waterfall = W_OFF;
toggle_waterfall(); toggle_waterfall();
} }

2
sa_cmd.c
Unescape View File

@ -870,7 +870,7 @@ VNA_SHELL_FUNCTION(cmd_scanraw)
points = my_atoi(argv[2]); points = my_atoi(argv[2]);
} }
if (get_waterfall()) if (setting.waterfall)
disable_waterfall(); // display dma hangs when waterfall is enabled disable_waterfall(); // display dma hangs when waterfall is enabled
freq_t old_step = setting.frequency_step; freq_t old_step = setting.frequency_step;

18
sa_core.c
Unescape View File

@ -193,7 +193,6 @@ void reset_settings(int m)
setting.auto_attenuation = false; setting.auto_attenuation = false;
setting.subtract_stored = false; setting.subtract_stored = false;
setting.normalize_level = 0.0; setting.normalize_level = 0.0;
setting.waterfall = W_OFF;
#ifdef TINYSA4 #ifdef TINYSA4
setting.lo_drive=1; setting.lo_drive=1;
#else #else
@ -1091,8 +1090,9 @@ void set_unit(int u)
redraw_request|=REDRAW_AREA; redraw_request|=REDRAW_AREA;
//dirty = true; // No HW update required, only status panel refresh //dirty = true; // No HW update required, only status panel refresh
} }
float const unit_scale_value[]={1,0.001,0.000001,0.000000001,0.000000000001};
const char * const unit_scale_text[]= {"","m", "\035", "n", "p"}; const float unit_scale_value[]={ 1, 0.001, 0.000001, 0.000000001, 0.000000000001};
const char unit_scale_text[]= {' ', 'm', '\035', 'n', 'p'};
void user_set_reflevel(float level) void user_set_reflevel(float level)
{ {
@ -1117,7 +1117,7 @@ void set_reflevel(float level)
setting.unit_scale_index = 0; setting.unit_scale_index = 0;
setting.unit_scale = 1.0; setting.unit_scale = 1.0;
while (UNIT_IS_LINEAR(setting.unit) && setting.unit_scale_index < sizeof(unit_scale_value)/sizeof(float) - 1) { while (UNIT_IS_LINEAR(setting.unit) && setting.unit_scale_index < ARRAY_COUNT(unit_scale_value) - 1) {
if (level > unit_scale_value[setting.unit_scale_index]) if (level > unit_scale_value[setting.unit_scale_index])
break; break;
setting.unit_scale_index++; setting.unit_scale_index++;
@ -1436,7 +1436,7 @@ float min_level;
freq_t peakFreq; freq_t peakFreq;
int peakIndex; int peakIndex;
float temppeakLevel; float temppeakLevel;
int temppeakIndex; uint16_t temppeakIndex;
// volatile int t; // volatile int t;
void setup_sa(void) void setup_sa(void)
@ -3044,11 +3044,11 @@ modulation_again:
} }
#define MAX_MAX 4 #define MAX_MAX 4
int16_t max_index[MAX_MAX]; static uint16_t max_index[MAX_MAX];
int16_t cur_max = 0; static uint16_t cur_max = 0;
static int low_count = 0; static uint8_t low_count = 0;
static int sweep_counter = 0; // Only used for HW refresh static uint8_t sweep_counter = 0; // Only used for HW refresh
// main loop for measurement // main loop for measurement
static bool sweep(bool break_on_operation) static bool sweep(bool break_on_operation)

4
ui.c
Unescape View File

@ -2231,8 +2231,8 @@ leave_ui_mode()
// Erase bottom area (not redraw on area update) // Erase bottom area (not redraw on area update)
if (MENU_BUTTON_HEIGHT*MENU_BUTTON_MAX - area_height > 0) if (MENU_BUTTON_HEIGHT*MENU_BUTTON_MAX - area_height > 0)
ili9341_fill(LCD_WIDTH-MENU_BUTTON_WIDTH, area_height, MENU_BUTTON_WIDTH, MENU_BUTTON_HEIGHT*MENU_BUTTON_MAX - area_height); ili9341_fill(LCD_WIDTH-MENU_BUTTON_WIDTH, area_height, MENU_BUTTON_WIDTH, MENU_BUTTON_HEIGHT*MENU_BUTTON_MAX - area_height);
if (get_waterfall()) if (setting.waterfall)
ili9341_fill(OFFSETX, graph_bottom, LCD_WIDTH - OFFSETX, CHART_BOTTOM - graph_bottom); toggle_waterfall();
redraw_request|=REDRAW_AREA | REDRAW_FREQUENCY | REDRAW_CAL_STATUS | REDRAW_BATTERY; redraw_request|=REDRAW_AREA | REDRAW_FREQUENCY | REDRAW_CAL_STATUS | REDRAW_BATTERY;
} }

13
ui_sa.c
Unescape View File

@ -1118,9 +1118,10 @@ static UI_FUNCTION_ADV_CALLBACK(menu_waterfall_acb){
(void)item; (void)item;
(void)data; (void)data;
if (b){ if (b){
b->icon = get_waterfall() ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK; b->icon = setting.waterfall ? BUTTON_ICON_CHECK : BUTTON_ICON_NOCHECK;
return; return;
} }
setting.waterfall++; if (setting.waterfall>W_BIG)setting.waterfall = W_OFF;
toggle_waterfall(); toggle_waterfall();
ui_mode_normal(); ui_mode_normal();
} }
@ -2619,7 +2620,7 @@ redraw_cal_status:
ili9341_drawstring("AUTO", x, y); ili9341_drawstring("AUTO", x, y);
} }
#endif #endif
plot_printf(buf, BLEN, "%s%s",unit_scale_text[setting.unit_scale_index], unit); plot_printf(buf, BLEN, "%c%s",unit_scale_text[setting.unit_scale_index], unit);
y = add_quick_menu(buf, x, y, (menuitem_t *)menu_unit); y = add_quick_menu(buf, x, y, (menuitem_t *)menu_unit);
// Scale // Scale
@ -2627,10 +2628,10 @@ redraw_cal_status:
ili9341_set_foreground(color); ili9341_set_foreground(color);
#if 1 #if 1
unsigned int i = 0; unsigned int i = 0;
while (i < sizeof(scale_value)/sizeof(float)) { while (i < ARRAY_COUNT(scale_value)) {
float t = (setting.scale/setting.unit_scale) / scale_value[i];; float t = (setting.scale/setting.unit_scale) / scale_value[i];
if (t > 0.9 && t < 1.1){ if (t > 0.9 && t < 1.1){
plot_printf(buf, BLEN, "%s%s/",scale_vtext[i],unit_scale_text[setting.unit_scale_index]); plot_printf(buf, BLEN, "%s%c/",scale_vtext[i],unit_scale_text[setting.unit_scale_index]);
break; break;
} }
i++; i++;
@ -2889,7 +2890,7 @@ redraw_cal_status:
} }
// ili9341_set_background(LCD_BG_COLOR); // ili9341_set_background(LCD_BG_COLOR);
if (!get_waterfall()) { // Do not draw bottom level if in waterfall mode if (!setting.waterfall) { // Do not draw bottom level if in waterfall mode
// Bottom level // Bottom level
y = area_height + OFFSETY; y = area_height + OFFSETY;
if (rounding) if (rounding)

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.