Holger Müller
97c7c8f3f2
v0.3.8
2020-11-01 14:28:10 +01:00
Holger Müller
3ef4f7309f
use older scipy on windows release
...
pyinstaller seem to strugle with scipy > 1.4.x
2020-10-29 19:30:27 +01:00
Holger Müller
4a02c32bde
v0.3.8-rc01
2020-10-25 16:59:21 +01:00
Holger Müller
70c448af9d
bump version
2020-10-25 16:54:12 +01:00
Holger Müller
1608a9261f
Use String values in Bands to edit vals > 2e31
2020-10-25 16:53:01 +01:00
Holger Müller
d379777b95
Bump Version
2020-10-10 22:14:55 +02:00
Holger Müller
d54627f993
Fix #323
...
Start freq of V2 with S21 hack cannot go negative any longer
2020-10-03 14:01:30 +02:00
Holger Müller
7b8c40118a
Bump Version
2020-10-01 13:51:40 +02:00
Holger Müller
cd1f32e9dc
Version suffix for dev branch
2020-10-01 13:42:52 +02:00
Holger Müller
ed8319a66c
Splitted screenshot helper method
...
_capture_data splitted to remove code redundancy
2020-10-01 13:41:07 +02:00
Holger Müller
c4c2f2c6a8
Removed unneeded code from NanoVNA_F
...
Regarding to @sysjoint-tek changes, getScreenshot method is identical
to base class "NanoVNA"
2020-10-01 13:33:40 +02:00
Holger Müller
d1088dd931
Merge branch 'Development' into master
2020-10-01 12:22:05 +02:00
sysjoint-tek
2880ba187d
Delete Hardware.py
2020-09-27 16:55:22 +08:00
sysjoint-tek
767ccd0033
Create Hardware.py
2020-09-27 16:54:20 +08:00
sysjoint-tek
eb87006927
Update and rename NanoVNASaver/Hardware/Hardware.py to NanoVNASaver/硬件/Hardware.py
...
Added nanovna-F_v2 recognition and screenshots
2020-09-27 16:41:15 +08:00
sysjoint-tek
5705842d43
Add files via upload
...
Added NanoVNA-F_V2 recognition and screenshots
2020-09-27 16:38:39 +08:00
sysjoint-tek
de7d047ba2
Update NanoVNA_F.py
...
Remove 41 to 64 lines of code from the Nanovna-F file (this will cause the screen to be split into four blocks, each evenly distributed across the full screen??)
2020-09-27 16:35:55 +08:00
Holger Müller
467d08c87b
bump version
2020-08-23 18:45:35 +02:00
Holger Müller
d8ad21dc54
Update NanoVNA_V2.py
...
Only warn if first read didn't get the full dataset
2020-08-23 18:41:38 +02:00
Holger Müller
13bfe102b7
Update NanoVNA_V2.py
...
Ensure at least 0.1 of timeout
2020-08-23 18:37:00 +02:00
Mark Zachmann
244fc41308
Change the timeout handling by increasing the timeout and
...
by rereading on timeout via reading more bytes
2020-08-23 08:20:16 -04:00
Holger Müller
6f0f55ab79
Persist marker/chart geometry bug #314
2020-08-14 19:03:14 +02:00
Holger Müller
b38e4412b2
v0.3.7
2020-08-13 18:59:14 +02:00
Holger Müller
05b71ee8e8
RC07 - linting README.md and CHANGELOG.md
2020-08-04 17:34:34 +02:00
bicycleGuy
38108c1e8e
Fix serial connection status button updates
2020-08-03 23:12:36 -07:00
Holger Müller
7c5e493be7
RC06
2020-08-03 17:59:19 +02:00
Holger Müller
a7da9c1bfa
S21 first mag value error hack
2020-08-03 17:56:43 +02:00
Holger Müller
28ea171441
increased minimal retry time
2020-08-03 17:31:00 +02:00
Holger Müller
21733f9234
Fixed unitialized variable bug in get_info retry
2020-08-03 17:30:28 +02:00
Holger Müller
0d49b7e977
Remove not yet needed class and corrected test
...
test was failing as rounding for multiple segmets has changed
2020-08-01 10:46:15 +02:00
Holger Müller
a0b4762d6a
RC05
2020-08-01 10:28:04 +02:00
Holger Müller
56facd3ea9
Update selection of delta marker on settings change
2020-08-01 10:13:31 +02:00
Holger Müller
d8882c74bf
Better rounding with multiple segments
2020-07-31 12:52:07 +02:00
Holger Müller
323db84ef6
Assume every current H4 can do 201 datapoints
2020-07-31 10:26:04 +02:00
Holger Müller
9f5f4b5870
Use scan mask command for read_frequencies if possible
2020-07-31 10:19:29 +02:00
Holger Müller
ecd74d54db
Raise Error if no sweep attemp gets valid data.
2020-07-30 20:32:01 +02:00
Holger Müller
a713959245
RC-01
2020-07-30 09:32:04 +02:00
Holger Müller
7205aba13d
Removed old reference to a no mored existing button
2020-07-29 17:36:37 +02:00
Holger Müller
2176919ac0
fix empty min dataset
2020-07-29 15:55:13 +02:00
Holger Müller
0559540e30
Fixed -H4 starup crash
2020-07-29 13:04:42 +02:00
Holger Müller
93678a0293
Distribute initial markers evenly
2020-07-28 22:08:15 +02:00
Holger Müller
68eeabc4f1
NanoVNASaver.py: Use min and max functions
2020-07-28 21:04:43 +02:00
Holger Müller
569fcdb2e6
Do not validate inut by default.
...
As it crashes often with uncalibrated devices on connect
2020-07-28 17:34:16 +02:00
Holger Müller
89c809cf33
fixed truncating
2020-07-28 17:31:14 +02:00
Holger Müller
f30f4f02e5
Explanation for logarithmic sweep
2020-07-28 17:22:50 +02:00
Holger Müller
e93d17dce3
SweepControl refactoring
2020-07-28 17:07:53 +02:00
Holger Müller
b178301435
Sweep code updates
2020-07-28 10:34:31 +02:00
Holger Müller
06b379afb4
Use Sweep Class to communicate with SweepWorker
2020-07-27 20:01:08 +02:00
Holger Müller
fd6aad74cf
Set sweep modes via sweep class
2020-07-27 18:36:09 +02:00
Holger Müller
ec643ebefc
Bump version
2020-07-27 17:07:55 +02:00
Holger Müller
d79524bb12
Marker input editing signal change
2020-07-27 17:05:11 +02:00
Holger Müller
626b474bb6
V2: retry if bulk read has not all data
2020-07-27 16:29:59 +02:00
Holger Müller
4f5ad6eeca
Fixed crash with multiple segments
2020-07-27 16:28:50 +02:00
Holger Müller
54326fb86d
Version Bump
2020-07-26 12:04:58 +02:00
Holger Müller
6d74ae52a3
Phase of complex cannot be > 2 * pi
2020-07-26 11:47:12 +02:00
Holger Müller
3bfd99ad3d
Increased test coverage
2020-07-25 21:34:49 +02:00
Holger Müller
e6d3ea0c12
Added Wavelength to marker fields
2020-07-25 20:35:16 +02:00
Holger Müller
684a01beb4
Refactoring Sweep settings
2020-07-25 20:10:24 +02:00
Holger Müller
bf8d5a4544
Split history NanoVNASaver/SweepWorker.py to NanoVNASaver/Settings/Sweep.py
2020-07-25 19:43:51 +02:00
Holger Müller
9a53c9155b
Split history NanoVNASaver/SweepWorker.py to NanoVNASaver/Settings/Sweep.py
2020-07-25 19:43:51 +02:00
Holger Müller
87d8fb504d
Split history NanoVNASaver/Settings/Bands.py to NanoVNASaver/Settings/Version.py
2020-07-25 19:41:20 +02:00
Holger Müller
ea1de63c52
Split history NanoVNASaver/Settings/Bands.py to NanoVNASaver/Settings/Version.py
2020-07-25 19:41:20 +02:00
Holger Müller
29b8ed6760
Split history NanoVNASaver/Settings/Bands.py to NanoVNASaver/Settings/Version.py
2020-07-25 19:39:15 +02:00
Holger Müller
3d665a4724
Split history NanoVNASaver/Settings/Bands.py to NanoVNASaver/Settings/Version.py
2020-07-25 19:39:15 +02:00
Holger Müller
a1c194d03c
Split history to
2020-07-25 19:37:49 +02:00
Holger Müller
e48870e13b
updated README.md (pre01)
2020-07-24 22:09:47 +02:00
Holger Müller
8ca1606d5f
Prepare for logarithmic sweeping
2020-07-24 21:14:48 +02:00
Holger Müller
b03ba0adf0
added reconnect on sweep error
2020-07-24 21:11:34 +02:00
Holger Müller
f05a2c40a5
Fixed Version less than comparison
2020-07-24 21:09:52 +02:00
Holger Müller
37c56a9692
Fill marker labels after first sweep
2020-07-24 12:18:31 +02:00
Holger Müller
32004a8f99
markerUpdated only updates updated marker now
2020-07-24 12:17:03 +02:00
Holger Müller
c05268a5b4
Make marker column resizable
2020-07-23 15:27:53 +02:00
Holger Müller
8b6ae07ea5
Modified layout to get room for more markers
2020-07-22 13:37:06 +02:00
Holger Müller
3578210a81
Merge branch 'development' into feature/delta_marker
2020-07-20 20:58:13 +02:00
Holger Müller
ce717bad58
Fixed segments rename / allow some more retries
2020-07-20 20:50:52 +02:00
Holger Müller
635c692e93
Added Delta Marker
2020-07-19 16:38:03 +02:00
Holger Müller
0c59600f4a
Added allow_negative to some formatting functions
2020-07-19 16:37:18 +02:00
Holger Müller
69d88139ed
bugfix: Display settings data -> data11 rename
2020-07-18 15:59:01 +02:00
Holger Müller
66b07690ff
Fixed typo segements
2020-07-18 15:43:39 +02:00
Holger Müller
6052b09687
Refactored MarkerControl
2020-07-17 21:57:03 +02:00
Holger Müller
74a99b758e
bugfix: Display settings data -> data11 rename
2020-07-17 21:56:35 +02:00
Holger Müller
550b0a2937
Split history NanoVNASaver/NanoVNASaver.py to NanoVNASaver/Widgets/MarkerControl.py
2020-07-17 21:12:45 +02:00
Holger Müller
820ec3f82f
Split history NanoVNASaver/NanoVNASaver.py to NanoVNASaver/Widgets/MarkerControl.py
2020-07-17 21:12:45 +02:00
Holger Müller
5f4fa53223
Renamed count to segments for consistency
2020-07-17 20:45:21 +02:00
Holger Müller
202f1eaf10
Bump version
2020-07-17 20:45:21 +02:00
Holger Müller
b7dc4a66af
Enhancement: #147
...
Case-insensitive entry of frequency units
2020-07-17 20:45:21 +02:00
Holger Müller
4d4c65a230
Bump version to v0.3.6
2020-07-17 09:05:01 +02:00
Holger Müller
97f5083130
more -H/-H4 tests
2020-07-15 17:13:37 +02:00
Holger Müller
675512d1b7
v0.3.6-rc1
2020-07-15 14:53:43 +02:00
Holger Müller
0fb7cd6768
Implemented dislord bandwidth method
2020-07-15 14:47:06 +02:00
Holger Müller
4ef83a44f9
No VNA instance for info reading
...
this was needed as -H variants don't responds the same way classical do
2020-07-14 14:52:19 +02:00
Holger Müller
8ac23b0872
added __init__.py for Widgets modules
2020-07-14 13:30:43 +02:00
Holger Müller
098bd26346
bugfix: copy reference data
2020-07-14 12:00:03 +02:00
Holger Müller
72aef86d4c
Bumped version
2020-07-14 11:33:23 +02:00
Holger Müller
b4ba24d42d
Implemented bandwidth selection
2020-07-14 11:32:52 +02:00
Holger Müller
19493012b2
Read initial frequencies from NanoVNA
...
On first run get frequencies from VNA even with scan mask
2020-07-14 10:02:41 +02:00
Holger Müller
f3c7e71c1a
SweepControl widget enhancements
2020-07-14 10:01:36 +02:00
Holger Müller
a5a6287a4d
Input value validation defaul set to false
...
As it just crashes the program when scan values out of the expected
range I think it's more sane to ignore it atm.
2020-07-14 10:00:37 +02:00
Holger Müller
1a78c66a4c
refactoring fixes
2020-07-13 17:41:27 +02:00
Holger Müller
6d38474f49
sweep refactor fix in calibration
2020-07-13 16:54:06 +02:00
Holger Müller
d8ac822963
Increased retry count
2020-07-13 14:20:23 +02:00
Holger Müller
fa4edfff56
Refresh markers to Input values after sweep
2020-07-13 13:49:23 +02:00
Holger Müller
98ab43aead
refactorung issue: fix sweep_start in callibration
2020-07-13 13:19:21 +02:00
Holger Müller
22c4a320e6
Better retry logging in serial communication
2020-07-13 00:09:00 +02:00
Holger Müller
099e1b2087
Refactored SweepControl Widget
2020-07-12 23:49:01 +02:00
Holger Müller
66345c29d0
Split history NanoVNASaver/NanoVNASaver.py to NanoVNASaver/SweepSettings.py
2020-07-12 21:49:22 +02:00
Holger Müller
a174c72f8a
Split history NanoVNASaver/NanoVNASaver.py to NanoVNASaver/SweepSettings.py
2020-07-12 21:49:22 +02:00
Holger Müller
9a73e8ba81
Tune timeouts in serial
2020-07-12 21:33:19 +02:00
Holger Müller
2244f57779
scan mask if dislord firmware
2020-07-11 16:51:41 +02:00
Holger Müller
b28b010903
Fixed scan mask with nanavna
2020-07-11 15:58:30 +02:00
Holger Müller
11082ff062
record runtime exceptions in debug log
2020-07-11 14:00:05 +02:00
Holger Müller
8d8d350068
Fixed Bug in Firmware variant detection
2020-07-10 17:11:36 +02:00
Holger Müller
50b5c9e105
assume -H4 has screenshot capability
2020-07-10 12:59:41 +02:00
Holger Müller
58b41d7bba
Updated CHANGELOG and About
2020-07-10 12:14:26 +02:00
Holger Müller
717de3fb6d
v0.3.5-rc
2020-07-10 11:35:50 +02:00
Holger Müller
d4621aad13
Refactored sweep worker
...
Data now initialized when sweep settings are done.
Thus no range risizing of charts in multi segment mode
2020-07-10 11:10:40 +02:00
Holger Müller
8a8436dfc1
added gui_error method to SweepWorker
2020-07-09 13:02:04 +02:00
Holger Müller
0920761e9f
Refactored SweepWorker
...
should fix marker problem #230
2020-07-09 12:46:26 +02:00
Holger Müller
e69349814b
Added pause after each write in NanoVNA_V2
2020-07-09 10:52:05 +02:00
Holger Müller
9ba5f48a96
Refactored data -> data11
2020-07-09 10:45:43 +02:00
Holger Müller
430a970563
Only assume DiSlord firmware has 201 Datapoints
2020-07-08 17:39:35 +02:00
Holger Müller
b6f36dc4a8
no need for excessive logging of drain_serial
2020-07-08 17:30:53 +02:00
Holger Müller
8bb5a9821b
Assume -H4 has always 201 point sweep capability
2020-07-08 17:29:41 +02:00
Holger Müller
8fbe360778
Added properties to Version class
2020-07-08 17:14:16 +02:00
Holger Müller
51af621433
Fixed version comparison glitches
2020-07-08 15:47:07 +02:00
Holger Müller
a6c3a20445
readded MagLoopAnalysis
2020-07-08 15:47:07 +02:00
Mauro Gaioni
f67e00ca2d
cleanup and comments
2020-07-08 15:47:07 +02:00
Holger Müller
5b71657e17
removed left free file
2020-07-07 20:38:40 +02:00
Holger Müller
675e7adc2c
Use with for locking / linting
2020-07-07 20:14:10 +02:00
Holger Müller
6fa8929f94
fix crash when trying to connect empty interface
2020-07-07 16:56:09 +02:00
Holger Müller
55dd5eda4f
fixed typo
2020-07-07 16:50:59 +02:00
Holger Müller
28fb2e280f
Removed redundant code from hardware
2020-07-07 16:48:43 +02:00
Holger Müller
27bd5ca2b6
Disabled currently broken MagLoopAnalysis
2020-07-07 14:17:32 +02:00
Holger Müller
27d3f492d8
add interpolation for touchstone data
2020-07-07 14:09:58 +02:00
Holger Müller
948c04f154
Fix custom datapoints on H4
2020-07-07 12:33:32 +02:00
Holger Müller
496494900f
Merge pull request #226 from zarath/feature/refactor_hardware
...
This patchset refactors many hardware related functions.
It can break things especially with AVNA/NanoVNA-F/-H/-H4. As I don't have access to that hardware devices I need some feedback, if general functionality is given.
I personally was impressed, how much faster sweeping is with the original NanoVNA
2020-07-05 14:08:24 +02:00
Holger Müller
71ba759ada
Fixed percentage in continous sweep
2020-07-05 14:06:57 +02:00
Holger Müller
113be4d1db
Removed code doubling in sweep worker
2020-07-05 13:51:01 +02:00
Holger Müller
cd9b4da1af
Added connected() method to VNA class
2020-07-05 13:00:03 +02:00
Holger Müller
764a9aaa0b
More robust scanning in NanoVNA.py
2020-07-05 12:32:20 +02:00
Holger Müller
ac050a0a4c
Fix merge to wrong line in NanoVNASaver.py
2020-07-04 23:43:40 +02:00
Holger Müller
d039a1192a
Merge branch 'development' into feature/refactor_hardware
2020-07-04 23:38:12 +02:00
Holger Müller
887a74d040
Merge pull request #35 from RandMental/patch-3
...
Update NanoVNASaver.py
2020-07-04 23:36:07 +02:00
Holger Müller
d3fe370d80
High speed scanning with mask for NanoVNA > 0.7.1
2020-07-04 23:30:14 +02:00
Holger Müller
089455505b
Ensure that vna.readFrequencies always list of int
2020-07-04 20:37:37 +02:00
Holger Müller
0b8641c20a
Device connection refactoring
2020-07-04 20:14:18 +02:00
Holger Müller
8b6ce5e142
Removed unneeded methods
2020-07-04 19:59:47 +02:00
Holger Müller
5e32ff177b
Use exceptions instead of if in About.py
2020-07-04 19:58:20 +02:00
RandMental
22b5116573
Update NanoVNASaver.py
...
Format Serial Control Box
2020-07-04 16:55:52 +02:00
RandMental
428aafa6ce
Update Hardware.py
...
Spelling mistake
2020-07-04 16:51:11 +02:00
Holger Müller
b8b2a78ab4
Merge pull request #34 from RandMental/patch-1
...
Formatting to increase readability
2020-07-04 14:44:44 +02:00
Holger Müller
67334257a1
Bump version
2020-07-04 14:32:45 +02:00
Holger Müller
a06b9191be
Get rid of InvalidVNA
2020-07-04 14:26:20 +02:00
Holger Müller
3dbbd165ac
Merge branch 'feature/refactor_hardware' of github.com:zarath/nanovna-saver into feature/refactor_hardware
2020-07-04 13:23:07 +02:00
Holger Müller
88245d640d
Merge pull request #33 from RandMental/patch-1
...
Formatting to increase readability - windows\About.py
2020-07-04 13:22:53 +02:00
RandMental
64a7fd914d
Formatting to increase readability
...
Copyright notices
Firmware version
2020-07-04 13:16:49 +02:00
Holger Müller
8e7e6b81ac
Moved duplicate code to parent class
2020-07-04 13:10:29 +02:00
Holger Müller
935b58648e
Refactored Hardware
...
- App opject no longer neened in VNA classes
- serial port locking moved in Interface class
2020-07-04 12:08:54 +02:00
Holger Müller
e743a4a5a3
Fix 201 datapoint setting with -H4
2020-07-04 09:28:00 +02:00
Holger Müller
9ec71ebc8d
Bump Version
2020-07-03 19:16:45 +02:00
Holger Müller
143e1dda02
detect -H versions
2020-07-03 18:43:39 +02:00
Mark Zachmann
94421b80a8
add checking for None in serial port for button click
...
repair the typo in AntennaAnalysis import
2020-07-03 07:27:22 -04:00
Holger Müller
2252d78de4
Merge pull request #212 from zarath/development
...
Bugfixes and simplifications
2020-07-03 09:22:26 +02:00
Holger Müller
354a3d764e
fixed typo with drain_serial function call
2020-07-02 12:00:54 +02:00
Holger Müller
7cb71c0ab0
Merge pull request #213 from gaionim/pull/analizeMagLoop
...
refactoring Vswr Analysis
2020-07-01 21:19:36 +02:00
Mauro Gaioni
cec57bacb5
MagLoopAnalysis
2020-07-01 20:47:15 +02:00
Holger Müller
2e62d13f0f
fixed s21 save bug #211
2020-07-01 20:26:13 +02:00
Holger Müller
24b34d6f70
Simplified Serial port locking
2020-07-01 20:11:12 +02:00
Holger Müller
eae377bbe2
Clean up calculations
2020-07-01 16:52:30 +02:00
Holger Müller
da729a3bab
Bumped Version
2020-07-01 07:45:18 +02:00
Holger Müller
4819b25ac1
Fixed through calibration
2020-06-30 21:46:47 +02:00
Holger Müller
fa19aaab37
Version bump / CHANGELOG
2020-06-30 12:23:23 +02:00
Holger Müller
3341564cb2
Refactored Calibration
...
Utilize scipy to implement spline interpolation between calibration
data points
2020-06-30 12:04:50 +02:00
Holger Müller
4045a18271
removed unneeded import
2020-06-30 12:01:03 +02:00
Holger Müller
30032a08fe
FIxed V2 data acquivsion
2020-06-30 12:00:20 +02:00
Holger Müller
374924299d
Fix crash when marker outside new scan range
2020-06-29 18:55:00 +02:00
Holger Müller
e70aa7d3e1
Fixed cal crash and s21 cals
2020-06-29 18:46:15 +02:00
Holger Müller
75d77c1703
Refactoring NanoNVASaver window methods
2020-06-28 18:48:41 +02:00
Holger Müller
48f8aaea32
put charts in dictionary
2020-06-28 17:37:23 +02:00
Holger Müller
fbdf325b51
Test for cor_att_data function
2020-06-28 16:57:52 +02:00
Holger Müller
c0e1cfb310
reordered RFTools functions alphabetically
...
added some test cases
2020-06-28 15:43:47 +02:00
Holger Müller
ee4d3b6765
Version bump
2020-06-28 12:57:16 +02:00
Holger Müller
790c8aac2b
Linting SweepWorker
2020-06-28 12:55:07 +02:00
Holger Müller
c139a531e7
Fixed average truncation
...
Also use geometrical distance to sort out extrema
2020-06-28 11:43:02 +02:00
Holger Müller
76420abd57
Updated version and changelog
2020-06-27 21:48:28 +02:00
Holger Müller
3dca605297
bump version
2020-06-27 21:37:55 +02:00
Holger Müller
0a2bf51c63
fixed calibration assitant save crash
2020-06-27 21:27:52 +02:00
Holger Müller
8bdf5ecb77
NanoVNA-H4 now also supports 202 datapoint/scan
2020-06-27 14:49:21 +02:00
Holger Müller
9e629f0350
Updated copyright headers
2020-06-25 19:52:30 +02:00
Holger Müller
d6acb7121c
Prepartion for new github orginisational location
2020-06-25 19:48:03 +02:00
Holger Müller
3c77a86b58
fixed button connection in calibration
2020-06-24 23:54:59 +02:00
Holger Müller
cb568cf6ad
Linting
2020-06-24 23:10:35 +02:00
Holger Müller
658cc6f231
Removed no longer needed properties
2020-06-24 22:49:24 +02:00
Holger Müller
5ce5de163c
Refactored Calibration Code
2020-06-24 22:09:19 +02:00
Holger Müller
62958d31c3
Merge branch 'pr/gaionim/20' into development
2020-06-21 21:03:35 +02:00
Holger Müller
cb1c1a99f5
Pylint ...
2020-06-21 20:54:23 +02:00
Mauro Gaioni
02f964bb62
Merge remote-tracking branch 'origin/development' into z/attenuatore
2020-06-21 20:31:41 +02:00
Holger Müller
38a54e801c
refactored parseFrequency
2020-06-21 19:54:00 +02:00
Holger Müller
4ba8f22109
Choosable datapoint also for NanoVNA-H with recent firmware
...
- Removed unused methods. Simplified V2 readValues
- Code linting
2020-06-21 19:20:36 +02:00
Mark Zachmann
da864ea008
repair multi segment sweeps for v2
...
Some of the code relies on checking the sweepData length so make it the same as the requested number of datapoints
2020-06-20 07:55:31 -04:00