mirror
/
nanovna-saver
kopia lustrzana https://github.com/NanoVNA-Saver/nanovna-saver
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
1 608 Commity
2 Gałęzie
51 Tagi
4,2 MiB
Wykres commitów

1608 Commity (main)

Autor SHA1 Wiadomość Data
Holger Müller d0dad2a746 Merge branch 'testing' into Development 2022-03-17 17:53:14 +01:00
Holger Müller 4d4ff52c15
Merge pull request #475 from silbe/version-recursion-fix 
Version: avoid infinite recursion
 2022-03-11 08:40:47 +01:00
Sascha Silbe ca97287fc4 Version: avoid infinite recursion 
The comparison operators (<, >, etc.) are not translated 1:1 to
customisation methods (__lt__, __gt__, ...) in Python. Instead the
type of the operands plays a role in determining on which of the two
sides the customisation method is invoked (see Python Language
Reference section 3.3.1 [1]). This means 'a > b' can end up invoking
b.__lt__(a) rather than a.__gt__(b).

This behaviour can causes infinite recursion in Version.__lt__():

2022-03-07 13:47:52,087 - NanoVNASaver.Hardware.NanoVNA_V2 - ERROR - Timeout reading version registers
Traceback (most recent call last):
  File "/home/sascha/nanovna-saver/NanoVNASaver/Controls/SerialControl.py", line 73, in serialButtonClick
    self.connect_device()
  File "/home/sascha/nanovna-saver/NanoVNASaver/Controls/SerialControl.py", line 93, in connect_device
    self.app.vna = get_VNA(self.interface)
  File "/home/sascha/nanovna-saver/NanoVNASaver/Hardware/Hardware.py", line 101, in get_VNA
    return NAME2DEVICE[iface.comment](iface)
  File "/home/sascha/nanovna-saver/NanoVNASaver/Hardware/NanoVNA_V2.py", line 76, in __init__
    super().__init__(iface)
  File "/home/sascha/nanovna-saver/NanoVNASaver/Hardware/VNA.py", line 71, in __init__
    self.read_features()
  File "/home/sascha/nanovna-saver/NanoVNASaver/Hardware/NanoVNA_V2.py", line 107, in read_features
    if self.board_revision >= Version("2.0.4"):
  File "/home/sascha/nanovna-saver/NanoVNASaver/Version.py", line 63, in __le__
    return self < other or self == other
  File "/home/sascha/nanovna-saver/NanoVNASaver/Version.py", line 57, in __lt__
    return other > self
  File "/home/sascha/nanovna-saver/NanoVNASaver/Version.py", line 57, in __lt__
    return other > self
  File "/home/sascha/nanovna-saver/NanoVNASaver/Version.py", line 57, in __lt__
    return other > self
  [Previous line repeated 491 more times]
RecursionError: maximum recursion depth exceeded in comparison

Fix it by explicitly invoking the customisation methods we expect.

[1] https://docs.python.org/3/reference/datamodel.html#object.__lt__
 2022-03-09 12:06:55 +01:00
Holger Müller 982dbe26ab version in workflow as string 2022-02-18 20:33:23 +01:00
Holger Müller d596ba7661 test build with python 3.10 2022-02-18 20:31:09 +01:00
Holger Müller 8432dcfbd3 use older setuptools for pyinstaller 2022-02-18 20:16:44 +01:00
Holger Müller 884207d910 updated pyinstaller 2022-02-18 19:36:56 +01:00
Holger Müller f613ee1a5a Version Bump 2022-02-18 19:32:43 +01:00
Holger Müller 1c8477f1a9 Linting and refactoring 2022-02-18 19:31:54 +01:00
Holger Müller cb3122d632
Merge pull request #465 from galileo-pkm/PA0JOZ_devel 
PA0JOZ Enhanced Response Correction
 2022-02-18 18:57:49 +01:00
Holger Müller 83d011122c
Merge pull request #461 from RandMental/Development 
self.sweep_control.progress_bar.setValue() needs an int value, percen…
 2022-01-17 08:50:41 +01:00
Holger Müller 55d86acec1
Update NanoVNASaver/NanoVNASaver.py 2022-01-17 08:50:04 +01:00
Holger Müller e6d9b47f83
Merge pull request #466 from galileo-pkm/i458 
fix for issue #458
 2022-01-17 08:47:48 +01:00
Galileo 55b7c4e42c fix for issue #458 2022-01-17 01:15:25 +01:00
Galileo 915da14ac1 PA0JOZ Enhanced Response Correction 2022-01-16 21:37:20 +01:00
Randmental 209a2e326b self.sweep_control.progress_bar.setValue() needs an int value, percentage sweep is not always guaranteed to be an int 2022-01-12 16:09:15 +02:00
Holger Müller 0c179388d3 Pyinstaller and numpy version fixes for binary builds 2022-01-11 17:22:33 +01:00
Holger Müller 3e78b490e9 linux workflows just knows python 3.9 2022-01-10 16:55:50 +01:00
Holger Müller 8208563ff3 Modified deps/workflows 
- setup.cfg should now work flowlessly with fedoro 36 (#456)
 - github actions are updated to use more current software versions
 2022-01-10 16:49:25 +01:00
Holger Müller c9ccaffa41
Merge pull request #454 from gaionim/pull/shebang 
Add shebang and make nanovna-saver.py  executable
 2022-01-09 15:28:18 +01:00
Holger Müller 28fd7e5478 fix bug #455 
vswr of datapoint now returns inf instead of going negative
 2022-01-09 15:24:04 +01:00
Mauro Gaioni d09ab02201 Add shebang and make nanovna-saver.py executable 2022-01-05 16:19:32 +01:00
Holger Müller cbcf61afb5
Merge pull request #452 from NanoVNA-Saver/testing 
Version 0.3.10
 2022-01-04 08:44:03 +01:00
Holger Müller 4a620a5686 Version 0.3.10 2022-01-04 08:30:40 +01:00
Holger Müller 3b35219d75 Use pyinstaller 4.7 on windows binary build 2022-01-04 08:18:38 +01:00
Holger Müller 700781288b
Merge pull request #451 from NanoVNA-Saver/Development 
Development
 2022-01-04 08:14:14 +01:00
Holger Müller fdb8f0ac43 prepare merge to testing 2022-01-04 08:13:49 +01:00
Holger Müller 8cc635ffa3
Merge pull request #450 from DiSlord/Development 
Calibration standarts fix and improve
 2022-01-04 08:09:45 +01:00
Holger Müller c194a32eac
Merge pull request #446 from rjordans/Development 
Change calculation of admittance value and unit in marker plotting code
 2022-01-04 08:09:33 +01:00
DiSlord d03982af73 Fix division on zero in Open calibration standard C0 value = 0 
Implement Load C calibration use
 2022-01-03 19:42:17 +03:00
Roel Jordans 4bee354bf7 Change calculation of admittance value and unit in marker plotting code 
Signed-off-by: Roel Jordans <r.jordans@tue.nl>
 2021-12-14 11:37:10 +01:00
Holger Müller 43fd3b7d88 increased pre version 2021-10-10 14:34:02 +02:00
Holger Müller a3c9dea92f pin required pyhon lib versions and use more curren pyinstaller 2021-10-10 14:33:25 +02:00
Holger Müller 7f161478d4
Merge pull request #432 from NanoVNA-Saver/Development 
use python3.9 for coverage
 2021-09-21 07:56:20 +02:00
Holger Müller 1c9eeb6db3 use python3.9 for coverage 2021-09-21 07:54:49 +02:00
Holger Müller 1c28b721ba
Merge pull request #430 from NanoVNA-Saver/Development 
Development
 2021-09-21 07:52:18 +02:00
Holger Müller 4b705d0d88
Merge pull request #431 from rjordans/Development 
Fixing test runner
 2021-09-21 07:51:15 +02:00
Roel Jordans 2e2ef886e9 Fixing test runner 2021-09-20 17:35:01 +02:00
Holger Müller cced02ebff
Merge pull request #428 from rjordans/Development 
Some minor fixes in plotting
 2021-09-20 12:42:26 +02:00
Holger Müller 0cee90b49e
Merge pull request #423 from kzembower/Development 
More cable data
 2021-09-20 12:41:33 +02:00
Holger Müller f8dbb34f5b
Update NanoVNASaver/Windows/TDR.py 2021-09-20 12:39:38 +02:00
Holger Müller 8aa3b8af51
Update NanoVNASaver/Windows/TDR.py 2021-09-20 12:39:21 +02:00
Holger Müller 404329570a
Update NanoVNASaver/Windows/TDR.py 2021-09-20 12:39:01 +02:00
Holger Müller 271549db9c
Update NanoVNASaver/Windows/TDR.py 2021-09-20 12:38:32 +02:00
Holger Müller 3131893f08
Update NanoVNASaver/Windows/TDR.py 2021-09-20 12:35:21 +02:00
Roel Jordans 01c58b82ca Proper plotting of close L values in L-series measurement 
Fixes #408
 2021-09-14 15:44:30 +02:00
Roel Jordans 8bece254a6 Improve plotting of R+jX charts 
Fixes #426
 2021-09-14 15:41:11 +02:00
Roel Jordans 9ea8b7da84 Resolve rounding issue on S11 C serial plot 
Fixes #424

Sets reserved space and number format consistent to other plot styles
 2021-09-14 15:41:00 +02:00
Kevin Zembower f4fa649956
Added Shireen cable and cleaned previous changes. 
1. Added Shireen RFC 400 RG-8/U Low loss cable (from actual measurement.
2. Cleaned previous comments and shortened too-long line.
 2021-08-03 13:00:43 -04:00
Kevin Zembower eaf64cd575
Delete TDR.py 
Uploaded in wrong directory. Sorry.
 2021-08-03 12:56:40 -04:00