lili/amodem
1
0
Fork 0
mirror of https://github.com/romanz/amodem.git synced 2026-03-24 11:22:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix string formatting

Browse Source
This commit is contained in:
Roman Zeyde
2014-12-26 22:18:35 +02:00
parent b9dc85e857
commit ec5b5fa4c0
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
amodem-cli
View File

@@ -57,8 +57,8 @@ def FileType(mode, process=None):
def main(): def main():
fmt = ('Audio OFDM MODEM: {:.1f} kb/s ({:d}-QAM x {:d} carriers) ' fmt = ('Audio OFDM MODEM: {0:.1f} kb/s ({1:d}-QAM x {2:d} carriers) '
'Fs={:.1f} kHz') 'Fs={3:.1f} kHz')
description = fmt.format(config.modem_bps / 1e3, len(config.symbols), description = fmt.format(config.modem_bps / 1e3, len(config.symbols),
config.Nfreq, config.Fs / 1e3) config.Nfreq, config.Fs / 1e3)
p = argparse.ArgumentParser(description=description) p = argparse.ArgumentParser(description=description)

2
amodem/audio.py
View File

@@ -11,7 +11,7 @@ class ALSA(object):
self.bytes_per_sample = self.bits_per_sample / 8.0 self.bytes_per_sample = self.bits_per_sample / 8.0
self.bytes_per_second = self.bytes_per_sample * self.Fs self.bytes_per_second = self.bytes_per_sample * self.Fs
# PCM signed little endian # PCM signed little endian
self.audio_format = 'S{}_LE'.format(self.bits_per_sample) self.audio_format = 'S{0}_LE'.format(self.bits_per_sample)
self.audio_tool = tool self.audio_tool = tool
def launch(self, fname=None, **kwargs): def launch(self, fname=None, **kwargs):

2
amodem/calib.py
View File

@@ -68,7 +68,7 @@ def run_recorder(config, recorder):
error = not any(states) error = not any(states)
if error: if error:
error_index = flags.index(False) error_index = flags.index(False)
message = 'too {} signal'.format(errors[error_index]) message = 'too {0} signal'.format(errors[error_index])
yield dict( yield dict(
freq=freq, rms=rms, peak=peak, coherency=coherency, freq=freq, rms=rms, peak=peak, coherency=coherency,

6
amodem/recv.py
View File

@@ -135,7 +135,7 @@ class Receiver(object):
log.debug('Current phase on carrier: %.3f', last_phase) log.debug('Current phase on carrier: %.3f', last_phase)
log.debug('Frequency error: %.2f ppm', freq_err * 1e6) log.debug('Frequency error: %.2f ppm', freq_err * 1e6)
self.plt.title('Frequency drift: {:.3f} ppm'.format(freq_err * 1e6)) self.plt.title('Frequency drift: {0:.3f} ppm'.format(freq_err * 1e6))
return freq_err return freq_err
def _train(self, sampler, order, lookahead): def _train(self, sampler, order, lookahead):
@@ -177,7 +177,7 @@ class Receiver(object):
for (i, freq), snr in zip(enumerate(self.frequencies), SNRs): for (i, freq), snr in zip(enumerate(self.frequencies), SNRs):
log.debug('%5.1f kHz: SNR = %5.2f dB', freq / 1e3, snr) log.debug('%5.1f kHz: SNR = %5.2f dB', freq / 1e3, snr)
self._constellation(symbols[:, i], train_symbols[:, i], self._constellation(symbols[:, i], train_symbols[:, i],
'$F_c = {} Hz$'.format(freq), index=i) '$F_c = {0} Hz$'.format(freq), index=i)
assert error_rate == 0, error_rate assert error_rate == 0, error_rate
return equalization_filter return equalization_filter
@@ -260,7 +260,7 @@ class Receiver(object):
symbol_list = np.array(self.stats['symbol_list']) symbol_list = np.array(self.stats['symbol_list'])
for i, freq in enumerate(self.frequencies): for i, freq in enumerate(self.frequencies):
self._constellation(symbol_list[i], self.modem.symbols, self._constellation(symbol_list[i], self.modem.symbols,
'$F_c = {} Hz$'.format(freq), index=i) '$F_c = {0} Hz$'.format(freq), index=i)
self.plt.show() self.plt.show()
def _constellation(self, y, symbols, title, index=None): def _constellation(self, y, symbols, title, index=None):