diff --git a/.github/workflows/build_server.yml b/.github/workflows/build_server.yml index 38129049..a9472a3d 100644 --- a/.github/workflows/build_server.yml +++ b/.github/workflows/build_server.yml @@ -48,9 +48,6 @@ jobs: brew install portaudio python -m pip install --upgrade pip pip3 install pyaudio - export PYTHONPATH=/Library/Frameworks/Python.framework/Versions/3.11/lib/:$PYTHONPATH - otool -L /Library/Frameworks/Python.framework/Versions/3.11/lib/python3.11/site-packages/_sounddevice_data/portaudio-binaries/libportaudio.dylib - otool -L /usr/local/lib/libportaudio.2.dylib - name: Install Python dependencies run: | diff --git a/modem/arq_session.py b/modem/arq_session.py index d89b639c..cf203840 100644 --- a/modem/arq_session.py +++ b/modem/arq_session.py @@ -166,6 +166,7 @@ class ARQSession: } def update_histograms(self, confirmed_bytes, total_bytes): + stats = self.calculate_session_statistics(confirmed_bytes, total_bytes) self.snr_histogram.append(self.snr) self.bpm_histogram.append(stats['bytes_per_minute']) diff --git a/modem/arq_session_iss.py b/modem/arq_session_iss.py index c7916896..2e1d0712 100644 --- a/modem/arq_session_iss.py +++ b/modem/arq_session_iss.py @@ -161,11 +161,6 @@ class ARQSessionISS(arq_session.ARQSession): # update statistics self.update_histograms(self.confirmed_bytes, self.total_length) self.update_speed_level(irs_frame) - #if 'offset' in irs_frame: - # self.confirmed_bytes = irs_frame['offset'] - # self.log(f"IRS confirmed {self.confirmed_bytes}/{self.total_length} bytes") - # self.event_manager.send_arq_session_progress( - # True, self.id, self.dxcall, self.confirmed_bytes, self.total_length, self.state.name, statistics=self.calculate_session_statistics(self.confirmed_bytes, self.total_length)) if self.expected_byte_offset > self.total_length: