Skip to content

Commit

Permalink
restructure Signal block a little
Browse files Browse the repository at this point in the history
  • Loading branch information
ka9q committed Aug 21, 2024
1 parent 2430414 commit 4105577
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions control.c
Original file line number Diff line number Diff line change
Expand Up @@ -1295,30 +1295,30 @@ static void display_sig(WINDOW *w,struct channel const *channel){
Frontend.if_gain);

// Calculate actual input power in dBm by subtracting net RF gain
pprintw(w,row++,col,"Input","%.1f dBm ",
pprintw(w,row++,col,"Input","%.1f dBm ",
power2dB(Frontend.if_power) - (Frontend.rf_gain - Frontend.rf_atten + Frontend.rf_level_cal));
if(!isnan(channel->sig.bb_power))
pprintw(w,row++,col,"A/D","%.1f dBFS ",power2dB(Frontend.if_power));
pprintw(w,row++,col,"A/D","%.1f dBFS",power2dB(Frontend.if_power));
// These gain figures only affect the relative A/D input level in dBFS because an equal
// amount of digital attenutation is applied to the A/D output to maintain unity gain
pprintw(w,row++,col,"RF Gain","%.1f dB ",Frontend.rf_gain);
pprintw(w,row++,col,"RF Atten","%.1f dB ",Frontend.rf_atten);
pprintw(w,row++,col,"RF lev cal","%.1f dB ",Frontend.rf_level_cal);
pprintw(w,row++,col,"Baseband","%.1f dBm ",power2dB(channel->sig.bb_power));
pprintw(w,row++,col,"RF Gain","%.1f dB ",Frontend.rf_gain);
pprintw(w,row++,col,"RF Atten","%.1f dB ",Frontend.rf_atten);
pprintw(w,row++,col,"RF lev cal","%.1f dB ",Frontend.rf_level_cal);
pprintw(w,row++,col,"Baseband","%.1f dBm ",power2dB(channel->sig.bb_power));
if(!isnan(channel->sig.n0)){
pprintw(w,row++,col,"N₀","%.1f dBm/Hz",power2dB(channel->sig.n0));
pprintw(w,row++,col,"N₀","%.1f dBmJ",power2dB(channel->sig.n0));
float temp = channel->sig.n0 / (1000 * BOLTZMANN); // 1000 converts from joules to millijoules (for power in dBm)
pprintw(w,row++,col,"N Temp","%.5g K ",temp);
pprintw(w,row++,col,"N Temp","%.5g K ",temp);
float nf = power2dB(1 + temp / 290); // convert to noise figure
pprintw(w,row++,col,"NF","%.1f dB ",nf);
pprintw(w,row++,col,"NF","%.1f dB ",nf);
}
// Derived numbers
if(!isnan(Local.sn0))
pprintw(w,row++,col,"S/N₀","%.1f dBHz ",power2dB(Local.sn0));
pprintw(w,row++,col,"S/N₀","%.1f dBHz",power2dB(Local.sn0));
if(!isnan(Local.noise_bandwidth))
pprintw(w,row++,col,"NBW","%.1f dBHz ",power2dB(Local.noise_bandwidth));
pprintw(w,row++,col,"NBW","%.1f dBHz",power2dB(Local.noise_bandwidth));
if(!isnan(Local.sn0) && !isnan(Local.noise_bandwidth))
pprintw(w,row++,col,"S/N","%.1f dB ",power2dB(Local.sn0/Local.noise_bandwidth));
pprintw(w,row++,col,"S/N","%.1f dB ",power2dB(Local.sn0/Local.noise_bandwidth));
box(w,0,0);
mvwaddstr(w,0,1,"Signal");
wnoutrefresh(w);
Expand Down

0 comments on commit 4105577

Please sign in to comment.