mirror
/
DSRemote
kopia lustrzana https://gitlab.com/Teuniz/DSRemote
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Work in progress.

merge-requests/1/head
Teuniz 2016-12-29 11:59:12 +01:00
rodzic 8c70ec3782
commit 3386340059
3 zmienionych plików z 43 dodań i 34 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
global.h
Wyświetl plik

@ -35,7 +35,7 @@
#define PROGRAM_NAME "DSRemote" #define PROGRAM_NAME "DSRemote"
#define PROGRAM_VERSION "0.33_1612291056" #define PROGRAM_VERSION "0.34_1612291151"
#define MAX_PATHLEN 4096 #define MAX_PATHLEN 4096

10
notes.txt
Wyświetl plik

@ -1,10 +1,15 @@
DSRemote 0.34
-------------
Added the Wave Inspector
DSRemote 0.33 DSRemote 0.33
------------- -------------
Added partial support for serial decoding. Added partial support for serial decoding.
Started to implement the Wave Inspector.
DSRemote 0.32 DSRemote 0.32
@ -13,7 +18,6 @@ DSRemote 0.32
Added support for FFT. Added support for FFT.
DSRemote 0.31 DSRemote 0.31
------------- -------------

65
wave_view.cpp
Wyświetl plik

@ -949,6 +949,9 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
char str[256]; char str[256];
painter->setClipping(true);
painter->setClipRegion(QRegion(0, 0, dw, dh), Qt::ReplaceClip);
samples_per_div = devparms->samplerate * devparms->timebasescale; samples_per_div = devparms->samplerate * devparms->timebasescale;
sample_start = devparms->wave_mem_view_sample_start; sample_start = devparms->wave_mem_view_sample_start;
@ -1022,9 +1025,9 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
{ {
if((devparms->math_decode_uart_tx_val_pos[i] >= sample_start) && (devparms->math_decode_uart_tx_val_pos[i] < sample_end)) if((devparms->math_decode_uart_tx_val_pos[i] >= sample_start) && (devparms->math_decode_uart_tx_val_pos[i] < sample_end))
{ {
painter->fillRect(devparms->math_decode_uart_tx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_tx - 13, cell_width, 26, Qt::black); painter->fillRect((devparms->math_decode_uart_tx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_tx - 13, cell_width, 26, Qt::black);
painter->drawRect(devparms->math_decode_uart_tx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_tx - 13, cell_width, 26); painter->drawRect((devparms->math_decode_uart_tx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_tx - 13, cell_width, 26);
} }
} }
} }
@ -1035,9 +1038,9 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
{ {
if((devparms->math_decode_uart_rx_val_pos[i] >= sample_start) && (devparms->math_decode_uart_rx_val_pos[i] < sample_end)) if((devparms->math_decode_uart_rx_val_pos[i] >= sample_start) && (devparms->math_decode_uart_rx_val_pos[i] < sample_end))
{ {
painter->fillRect(devparms->math_decode_uart_rx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_rx - 13, cell_width, 26, Qt::black); painter->fillRect((devparms->math_decode_uart_rx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_rx - 13, cell_width, 26, Qt::black);
painter->drawRect(devparms->math_decode_uart_rx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_rx - 13, cell_width, 26); painter->drawRect((devparms->math_decode_uart_rx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_rx - 13, cell_width, 26);
} }
} }
} }
@ -1070,19 +1073,19 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
{ {
sprintf(str, "%02X", devparms->math_decode_uart_tx_val[i]); sprintf(str, "%02X", devparms->math_decode_uart_tx_val[i]);
painter->drawText(devparms->math_decode_uart_tx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_tx - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_uart_tx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_tx - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 1) // ASCII else if(devparms->math_decode_format == 1) // ASCII
{ {
ascii_decode_control_char(devparms->math_decode_uart_tx_val[i], str); ascii_decode_control_char(devparms->math_decode_uart_tx_val[i], str);
painter->drawText(devparms->math_decode_uart_tx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_tx - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_uart_tx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_tx - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 2) // decimal else if(devparms->math_decode_format == 2) // decimal
{ {
sprintf(str, "%u", (unsigned int)devparms->math_decode_uart_tx_val[i]); sprintf(str, "%u", (unsigned int)devparms->math_decode_uart_tx_val[i]);
painter->drawText(devparms->math_decode_uart_tx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_tx - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_uart_tx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_tx - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 3) // binary else if(devparms->math_decode_format == 3) // binary
{ {
@ -1093,7 +1096,7 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
str[j] = 0; str[j] = 0;
painter->drawText(devparms->math_decode_uart_tx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_tx - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_uart_tx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_tx - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 4) // line else if(devparms->math_decode_format == 4) // line
{ {
@ -1104,14 +1107,14 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
str[j] = 0; str[j] = 0;
painter->drawText(devparms->math_decode_uart_tx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_tx - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_uart_tx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_tx - 13, cell_width, 30, Qt::AlignCenter, str);
} }
if(devparms->math_decode_uart_tx_err[i]) if(devparms->math_decode_uart_tx_err[i])
{ {
painter->setPen(Qt::red); painter->setPen(Qt::red);
painter->drawText(devparms->math_decode_uart_tx_val_pos[i - sample_start] * pix_per_smpl + cell_width, line_h_uart_tx - 13, 25, 25, Qt::AlignCenter, "?"); painter->drawText((devparms->math_decode_uart_tx_val_pos[i] - sample_start) * pix_per_smpl + cell_width, line_h_uart_tx - 13, 25, 25, Qt::AlignCenter, "?");
painter->setPen(Qt::white); painter->setPen(Qt::white);
} }
@ -1145,19 +1148,19 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
{ {
sprintf(str, "%02X", devparms->math_decode_uart_rx_val[i]); sprintf(str, "%02X", devparms->math_decode_uart_rx_val[i]);
painter->drawText(devparms->math_decode_uart_rx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_rx - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_uart_rx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_rx - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 1) // ASCII else if(devparms->math_decode_format == 1) // ASCII
{ {
ascii_decode_control_char(devparms->math_decode_uart_rx_val[i], str); ascii_decode_control_char(devparms->math_decode_uart_rx_val[i], str);
painter->drawText(devparms->math_decode_uart_rx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_rx - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_uart_rx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_rx - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 2) // decimal else if(devparms->math_decode_format == 2) // decimal
{ {
sprintf(str, "%u", (unsigned int)devparms->math_decode_uart_rx_val[i]); sprintf(str, "%u", (unsigned int)devparms->math_decode_uart_rx_val[i]);
painter->drawText(devparms->math_decode_uart_rx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_rx - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_uart_rx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_rx - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 3) // binary else if(devparms->math_decode_format == 3) // binary
{ {
@ -1168,7 +1171,7 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
str[j] = 0; str[j] = 0;
painter->drawText(devparms->math_decode_uart_rx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_rx - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_uart_rx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_rx - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 4) // line else if(devparms->math_decode_format == 4) // line
{ {
@ -1179,14 +1182,14 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
str[j] = 0; str[j] = 0;
painter->drawText(devparms->math_decode_uart_rx_val_pos[i - sample_start] * pix_per_smpl, line_h_uart_rx - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_uart_rx_val_pos[i] - sample_start) * pix_per_smpl, line_h_uart_rx - 13, cell_width, 30, Qt::AlignCenter, str);
} }
if(devparms->math_decode_uart_rx_err[i]) if(devparms->math_decode_uart_rx_err[i])
{ {
painter->setPen(Qt::red); painter->setPen(Qt::red);
painter->drawText(devparms->math_decode_uart_rx_val_pos[i - sample_start] * pix_per_smpl + cell_width, line_h_uart_rx - 13, 25, 25, Qt::AlignCenter, "?"); painter->drawText((devparms->math_decode_uart_rx_val_pos[i] - sample_start) * pix_per_smpl + cell_width, line_h_uart_rx - 13, 25, 25, Qt::AlignCenter, "?");
painter->setPen(Qt::white); painter->setPen(Qt::white);
} }
@ -1248,9 +1251,9 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
cell_width = (devparms->math_decode_spi_mosi_val_pos_end[i] - devparms->math_decode_spi_mosi_val_pos[i]) * cell_width = (devparms->math_decode_spi_mosi_val_pos_end[i] - devparms->math_decode_spi_mosi_val_pos[i]) *
pix_per_smpl; pix_per_smpl;
painter->fillRect(devparms->math_decode_spi_mosi_val_pos[i] * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 26, Qt::black); painter->fillRect((devparms->math_decode_spi_mosi_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 26, Qt::black);
painter->drawRect(devparms->math_decode_spi_mosi_val_pos[i] * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 26); painter->drawRect((devparms->math_decode_spi_mosi_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 26);
} }
} }
@ -1261,9 +1264,9 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
cell_width = (devparms->math_decode_spi_miso_val_pos_end[i] - devparms->math_decode_spi_miso_val_pos[i]) * cell_width = (devparms->math_decode_spi_miso_val_pos_end[i] - devparms->math_decode_spi_miso_val_pos[i]) *
pix_per_smpl; pix_per_smpl;
painter->fillRect(devparms->math_decode_spi_miso_val_pos[i] * pix_per_smpl, line_h_spi_miso - 13, cell_width, 26, Qt::black); painter->fillRect((devparms->math_decode_spi_miso_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_miso - 13, cell_width, 26, Qt::black);
painter->drawRect(devparms->math_decode_spi_miso_val_pos[i] * pix_per_smpl, line_h_spi_miso - 13, cell_width, 26); painter->drawRect((devparms->math_decode_spi_miso_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_miso - 13, cell_width, 26);
} }
} }
@ -1303,7 +1306,7 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
break; break;
} }
painter->drawText(devparms->math_decode_spi_mosi_val_pos[i] * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_spi_mosi_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 1) // ASCII else if(devparms->math_decode_format == 1) // ASCII
{ {
@ -1312,13 +1315,13 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
j += ascii_decode_control_char(devparms->math_decode_spi_mosi_val[i] >> (k * 8), str + j); j += ascii_decode_control_char(devparms->math_decode_spi_mosi_val[i] >> (k * 8), str + j);
} }
painter->drawText(devparms->math_decode_spi_mosi_val_pos[i] * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_spi_mosi_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 2) // decimal else if(devparms->math_decode_format == 2) // decimal
{ {
sprintf(str, "%u", devparms->math_decode_spi_mosi_val[i]); sprintf(str, "%u", devparms->math_decode_spi_mosi_val[i]);
painter->drawText(devparms->math_decode_spi_mosi_val_pos[i] * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_spi_mosi_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 3) // binary else if(devparms->math_decode_format == 3) // binary
{ {
@ -1329,7 +1332,7 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
str[j] = 0; str[j] = 0;
painter->drawText(devparms->math_decode_spi_mosi_val_pos[i] * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_spi_mosi_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 4) // line else if(devparms->math_decode_format == 4) // line
{ {
@ -1340,7 +1343,7 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
str[devparms->math_decode_spi_width] = 0; str[devparms->math_decode_spi_width] = 0;
painter->drawText(devparms->math_decode_spi_mosi_val_pos[i] * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_spi_mosi_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_mosi - 13, cell_width, 30, Qt::AlignCenter, str);
} }
} }
} }
@ -1379,7 +1382,7 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
break; break;
} }
painter->drawText(devparms->math_decode_spi_miso_val_pos[i] * pix_per_smpl, line_h_spi_miso - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_spi_miso_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_miso - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 1) // ASCII else if(devparms->math_decode_format == 1) // ASCII
{ {
@ -1388,13 +1391,13 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
j += ascii_decode_control_char(devparms->math_decode_spi_miso_val[i] >> (k * 8), str + j); j += ascii_decode_control_char(devparms->math_decode_spi_miso_val[i] >> (k * 8), str + j);
} }
painter->drawText(devparms->math_decode_spi_miso_val_pos[i] * pix_per_smpl, line_h_spi_miso - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_spi_miso_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_miso - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 2) // decimal else if(devparms->math_decode_format == 2) // decimal
{ {
sprintf(str, "%u", devparms->math_decode_spi_miso_val[i]); sprintf(str, "%u", devparms->math_decode_spi_miso_val[i]);
painter->drawText(devparms->math_decode_spi_miso_val_pos[i] * pix_per_smpl, line_h_spi_miso - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_spi_miso_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_miso - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 3) // binary else if(devparms->math_decode_format == 3) // binary
{ {
@ -1405,7 +1408,7 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
str[j] = 0; str[j] = 0;
painter->drawText(devparms->math_decode_spi_miso_val_pos[i] * pix_per_smpl, line_h_spi_miso - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_spi_miso_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_miso - 13, cell_width, 30, Qt::AlignCenter, str);
} }
else if(devparms->math_decode_format == 4) // line else if(devparms->math_decode_format == 4) // line
{ {
@ -1416,11 +1419,13 @@ void WaveCurve::draw_decoder(QPainter *painter, int dw, int dh)
str[devparms->math_decode_spi_width] = 0; str[devparms->math_decode_spi_width] = 0;
painter->drawText(devparms->math_decode_spi_miso_val_pos[i] * pix_per_smpl, line_h_spi_miso - 13, cell_width, 30, Qt::AlignCenter, str); painter->drawText((devparms->math_decode_spi_miso_val_pos[i] - sample_start) * pix_per_smpl, line_h_spi_miso - 13, cell_width, 30, Qt::AlignCenter, str);
} }
} }
} }
} }
painter->setClipping(false);
} }