daniel/lolra
1
0
Fork 0
mirror of https://github.com/cnlohr/lolra.git synced 2026-06-17 00:09:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update with remote clock precision checking

Browse Source
This commit is contained in:
cnlohr
2024-10-15 05:50:57 -04:00
parent 2cb413d827
commit ccf9c1305b
2 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ch32v/ch32v203-goertzel/adcgoertzel.c
+4 -1
View File
@@ -779,8 +779,11 @@ int HandleHidUserGetReportSetup( struct _USBState * ctx, tusb_control_request_t
((uint32_t*)scratchpad)[1] = (g_lastper<<16) | g_lastlen;
((uint32_t*)scratchpad)[2] = (0<<16) | (((g_pwm_period+1)*g_goertzel_buffer)); //LSW = 144MHz / X
((uint32_t*)scratchpad)[3] = SysTick->CNT;
((uint32_t*)scratchpad)[4] = *((uint32_t*)adc_buffer);
int i;
for( i = 3; i < samps_to_send + 3; i++ )
for( i = 5; i < samps_to_send + 5; i++ )
{
last_baselog = (last_baselog+1)&(LOG_GOERTZEL_LIST-1);
((uint32_t*)(scratchpad))[i] = ((int32_t*)qibaselogs)[last_baselog];
ch32v/lib/webhidcontrol.js
+51 -3
View File
@@ -297,6 +297,45 @@ FMiirphase = 0.0; /* for FM */
FMlastphase = 0.0; /* for FM */
FMphaseout = 0.0; /* for FM */
lastadc = 0|0;
remote_clock_mhz = 0;
remote_clock_last_timestamp = 0|0;
remote_clock_last_timems = 0.0;
remote_clock_initted = false;
remote_clock_refinement = 1.0;
remote_clock_total_s = 0;
remote_clock_total_ticks = 0.0;
function ComputeRemoteClock( remote_time_ticks, now_ms )
{
if( !remote_clock_initted )
{
remote_clock_last_timestamp = remote_time_ticks;
remote_clock_last_timems = now_ms;
remote_clock_refinement = 1.0;
remote_clock_initted = true;
remote_clock_total_ms = 0;
remote_clock_total_ticks = 0|0;
return;
}
var delta_s = (now_ms - remote_clock_last_timems)/1000.0;
var delta_clock = ((remote_time_ticks - remote_clock_last_timestamp)|0)*2; // convert 144MHz to 288MHz
var this_mhz = delta_clock / delta_s;
remote_clock_total_s += delta_s;
remote_clock_total_ticks += delta_clock * 1.0;
remote_clock_mhz = remote_clock_total_ticks / remote_clock_total_s;
remote_clock_total_s *= 0.99999;
remote_clock_total_ticks *= 0.99999;
remote_clock_last_timestamp = remote_time_ticks;
remote_clock_last_timems = now_ms;
}
async function sendLoop()
{
@@ -331,7 +370,13 @@ async function sendLoop()
(kBsecAvg).toFixed(2) + " kB/s<br>" +
(xActionSecAvg).toFixed(2) + "x/s<br>";
document.getElementById( "GeneralData" ).innerHTML =
"Count: " + goodCount + " / " + badCount + "<br>Inten: " + ((Math.log( lastIntensity * lastIntensity )/Math.log(10)) * 10-120).toFixed(2) + "db (" + lastIntensity + ")";
"<TABLE WIDTH=100%><TR><TD width=25%>Count: " + goodCount + " / " + badCount + "</td>" +
"<td width=20%>Inten: " + ((Math.log( lastIntensity * lastIntensity )/Math.log(10)) * 10-120).toFixed(2) + "db (" + lastIntensity + ")</td>" +
"<td width=20%>ADCs: " + (lastadc>>16).toFixed(0) + " / " + (lastadc&0xffff).toFixed(0) + "</td>" +
"<td width=20%>Remote clock: <INPUT TYPE=SUBMIT VALUE=" + (remote_clock_mhz/1000000.0).toFixed(6) + ` ONMOUSEDOWN="document.getElementById('crystalmhz').value = ${remote_clock_mhz/1000000.0};">MHz ` + "</TD>" +
"<td width=20%>" + ((remote_clock_mhz-288000000)/288).toFixed(3) + " PPM</td>" +
"</tr></table>";
lastTime = thisTime;
}
else if( frameNo % updateStatsPerfPer == 2 )
@@ -407,17 +452,21 @@ async function sendLoop()
let receiveData = await receiveReport;
if( receiveData && receiveData.buffer )
{
// Receive data from USB (from HandleHidUserGetReportSetup)
let data = new Uint32Array( receiveData.buffer.slice( 0, 508 ) );
let intensity = data[0]>>8;
let numq = data[0] & 0xff;
let time_total = data[1]>>16;
let time_used = data[1]&0xffff;
let sample_divisor = data[2]&0xffff;
let remote_time = data[3];
ComputeRemoteClock( remote_time, performance.now() );
lastadc = data[4];
let demodbuffer = new Float32Array(numq);
let mulcoeff = 16.0 / lastIntensity;
for( var i = 0|0; i < numq; i++ )
{
let vv = IQHistoryArray[IQHistoryHead] = data[i+3];
let vv = IQHistoryArray[IQHistoryHead] = data[i+5];
let vi = vv >> 16;
let vq = vv & 0xffff;
if( vi >= 32768 ) vi = vi-65535;
@@ -455,7 +504,6 @@ async function sendLoop()
if( audioContext != null && playingAudioProcessor != null )
{
// TODO: Use crystalmhz
let sampleAdvance = (system_rate/sample_divisor) / audioContext.sampleRate;
let sampleAdvanceParam = playingAudioProcessor.parameters.get("sampleAdvance");
sampleAdvanceParam.setValueAtTime( sampleAdvance, audioContext.currentTime);