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

Removed space in CSV

Browse Source
pull/94/head
erikkaashoek 2 years ago
parent dbc78b7fac
commit fd66848f19
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

6
plot.c
Unescape View File

@ -399,7 +399,7 @@ value(const float v)
return expf(v*(logf(10.0)/20.0)) * (powf(10, -30.0/20.0)*sqrtf(50));// expf(v*logf(10.0)/20.0) * powf(10, -30.0/20.0) * sqrtf(50) return expf(v*(logf(10.0)/20.0)) * (powf(10, -30.0/20.0)*sqrtf(50));// expf(v*logf(10.0)/20.0) * powf(10, -30.0/20.0) * sqrtf(50)
case U_VPP: case U_VPP:
// return powf(10.0, (v-30.0)/20.0) * sqrtf(50.0); // powf(10.0, v /20.0) * powf(10, -30.0/20.0) * sqrtf(50) // return powf(10.0, (v-30.0)/20.0) * sqrtf(50.0); // powf(10.0, v /20.0) * powf(10, -30.0/20.0) * sqrtf(50)
return 2.88 * expf(v*(logf(10.0)/20.0)) * (powf(10, -30.0/20.0)*sqrtf(50));// expf(v*logf(10.0)/20.0) * powf(10, -30.0/20.0) * sqrtf(50) return 2.828 * expf(v*(logf(10.0)/20.0)) * (powf(10, -30.0/20.0)*sqrtf(50));// expf(v*logf(10.0)/20.0) * powf(10, -30.0/20.0) * sqrtf(50)
case U_WATT: case U_WATT:
// return powf(10.0, v/10.0)/1000.0; // powf(10.0, v /10.0) / 1000.0 // return powf(10.0, v/10.0)/1000.0; // powf(10.0, v /10.0) / 1000.0
return expf(v*(logf(10.0)/10.0)) / 1000.0; // expf(v*logf(10.0)/10.0) / 1000.0 return expf(v*(logf(10.0)/10.0)) / 1000.0; // expf(v*logf(10.0)/10.0) / 1000.0
@ -423,7 +423,7 @@ to_dBm(const float v)
return logf(v/(sqrtf(50.0)))*(20.0/logf(10.0)) + 30.0; return logf(v/(sqrtf(50.0)))*(20.0/logf(10.0)) + 30.0;
case U_VPP: case U_VPP:
// return log10f(v/(sqrtf(50.0)))* 20.0 + 30.0; // return log10f(v/(sqrtf(50.0)))* 20.0 + 30.0;
return logf((v/2.88)/(sqrtf(50.0)))*(20.0/logf(10.0)) + 30.0; return logf((v/2.828)/(sqrtf(50.0)))*(20.0/logf(10.0)) + 30.0;
case U_WATT: case U_WATT:
// return log10f(v*1000.0)* 10.0; // return log10f(v*1000.0)* 10.0;
return logf(v*1000.0)*(10.0/logf(10.0)); return logf(v*1000.0)*(10.0/logf(10.0));
@ -486,7 +486,7 @@ trace_into_index_y_array(index_y_t *y, float *array, int points)
case U_DBMV: ref_shift = 30.0 + 20.0*log10f(sqrtf(50.0));break; case U_DBMV: ref_shift = 30.0 + 20.0*log10f(sqrtf(50.0));break;
case U_DBUV: ref_shift = 90.0 + 20.0*log10f(sqrtf(50.0));break; case U_DBUV: ref_shift = 90.0 + 20.0*log10f(sqrtf(50.0));break;
case U_VOLT: vmult = powf(10, -30.0/20.0) * sqrtf(50.0); mult = logf(10.0)/20.0;break; case U_VOLT: vmult = powf(10, -30.0/20.0) * sqrtf(50.0); mult = logf(10.0)/20.0;break;
case U_VPP: vmult = 2.88* powf(10, -30.0/20.0) * sqrtf(50.0); mult = logf(10.0)/20.0;break; case U_VPP: vmult = 2.828* powf(10, -30.0/20.0) * sqrtf(50.0); mult = logf(10.0)/20.0;break;
case U_WATT: vmult = 1.0/1000.0; mult = logf(10.0)/10.0;break; case U_WATT: vmult = 1.0/1000.0; mult = logf(10.0)/10.0;break;
default: default:
return; return;

10
ui.c
Unescape View File

@ -7715,12 +7715,12 @@ static void sa_save_file(uint8_t format) {
if (config._mode & _MODE_MHZ_CSV) if (config._mode & _MODE_MHZ_CSV)
buf += plot_printf(buf, 100, "%.6f,", ((float)getFrequency(i))/1000000); buf += plot_printf(buf, 100, "%.6f,", ((float)getFrequency(i))/1000000);
else else
buf += plot_printf(buf, 100, "%U, ", getFrequency(i)); buf += plot_printf(buf, 100, "%U,", getFrequency(i));
} }
if (file_mask & 2) buf += plot_printf(buf, 100, "%f ", value(measured[TRACE_ACTUAL][i])); if (file_mask & 2) buf += plot_printf(buf, 100, "%f", value(measured[TRACE_ACTUAL][i]));
if (file_mask & 4) buf += plot_printf(buf, 100, "%f ", value(measured[TRACE_STORED][i])); if (file_mask & 4) buf += plot_printf(buf, 100, " %f ", value(measured[TRACE_STORED][i]));
if (file_mask & 8) buf += plot_printf(buf, 100, "%f ", value(measured[TRACE_STORED2][i])); if (file_mask & 8) buf += plot_printf(buf, 100, " %f ", value(measured[TRACE_STORED2][i]));
if (file_mask & 16) buf += plot_printf(buf, 100, "%f", value(measured[TRACE_TEMP][i])); if (file_mask & 16) buf += plot_printf(buf, 100, " %f", value(measured[TRACE_TEMP][i]));
buf += plot_printf(buf, 100, "\r\n"); buf += plot_printf(buf, 100, "\r\n");
res = f_write(fs_file, (char *)spi_buffer, buf - (char *)spi_buffer, &size); res = f_write(fs_file, (char *)spi_buffer, buf - (char *)spi_buffer, &size);
} }

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.