Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

plugin: Add ADMT Plugin for ADMT4000 #1878

Open
wants to merge 102 commits into
base: dev
Choose a base branch
from
Open

plugin: Add ADMT Plugin for ADMT4000 #1878

wants to merge 102 commits into from
+7,634 −1

Conversation

JJuanill
Copy link

Adding implementation of ADMT4000 Harmonic Calibration plugin to Scopy

JJuanill added 30 commits May 29, 2024 12:46
@JJuanill
cmake: added post build to copy .DLLs when debugging or launching scopy
718a439 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
tools/plugingenerator: modified CMake list template to output generat…
a63abe9 
…ed library to plugins folder

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
doc: Included documentation for building Scopy locally on Windows env…
c6f3b9c 
…ironment

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Initialized plugin files
3298760 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Configured ADMT plugin
c420a2c 
- Added logic for compatible
- Changed Harmonic Calibration icon
- Changed plugin description

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Added test GUI textbox and button for rotation, count, and angle
8267a16 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
Merge remote-tracking branch 'origin/dev' into dev_windows_build
4f205fc
@JJuanill
Merge remote-tracking branch 'origin/dev_windows_build' into dev_admt
7a20c0f
@JJuanill
admt: Renamed plugin and include directories
47bbf6d 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Connected button to output to text field
290f4ec 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Added GRTimePlotAddon
6799ce1 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
Merge remote-tracking branch 'origin/dev' into dev_admt
3eb4887
@JJuanill
admt: Implemented channel control and init methods
69af835 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
Merge remote-tracking branch 'origin/dev' into dev_admt
76202a3
@JJuanill
admt: Update CMakeList
6f1d4d8 
- Reverted C++ standard from 20 to 17

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
Merge remote-tracking branch 'origin/dev' into dev_windows_build
0d3048f
@JJuanill
cmake: Added post build to copy library to binary path
eced5a4 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
Merge remote-tracking branch 'origin/dev_windows_build' into dev_admt
8f38f67
@JJuanill
admt: Added historical graph
3b82d92 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
Merge remote-tracking branch 'origin/dev' into dev_admt
32992dd
@JJuanill
admt: Implemented GUI interface and controller
292fe36 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Fixed axis scales when changing displayed graph
c42ce79 
- Changed data graph color to defined method
- Removed redundant plot direction declaration

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Added calibration tab
082b2bd 
- Created method for calibration widget
- Removed initial plot and data for acquisition tab

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Implemented export and import raw calibration data
c11588f 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Implemented calibration routine in controller
e3138d9 
- Renamed acquisition labels

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Layout for motor controls
e51d571 
- Added custom spinbox widget
- Styled line edits and combo boxes

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Added stepper motor control for calibration
c2fe9a1 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Adjusted Calibration GUI
995ed2f 
- Connected horizontal spinbox to stepper motor control
- Added conversions for real world values to stepper motor attributes
- Added FFT plot for magnitude and phase calibration values

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Added read device registry
578d08d 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Removed raw motor controls
574d315 
- Added tabs for raw and calibrated graphs
- Converted real-world values to motor values and vice versa
- Moved raw data list to static vector

Signed-off-by: John Lloyd Juanillo <[email protected]>
doun-doughnut and others added 19 commits November 13, 2024 09:22
@doun-doughnut
admt: Included import samples in calibration data
e814721 
- Initialized acquisition graph axes

Signed-off-by: dpineda2 <[email protected]>
@doun-doughnut
admt: Initial implement of acquisition graph data
813a576 
Signed-off-by: dpineda2 <[email protected]>
@doun-doughnut
admt: Added state for MT Diagnostics
55814c9 
- Updated import sample behavior
- Changed calibration UI timer rate

Signed-off-by: dpineda2 <[email protected]>
@doun-doughnut
admt: Removed resizing acquisition list
9607812 
Signed-off-by: dpineda2 <[email protected]>
@JJuanill
admt: Improved stability for applying sequence
c227e44 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Write zeros to fault register before read
83801bf 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Added fine control for DIGIOEN register
5dd5dcc 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Applied fixes for calibration
6059ae7 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Implemented multi-channel acquisition graph
ada74cc 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Fixed crashing issue when calibrating
786f4cf 
- Adjusted graph behavior for acquisition tab
- Adjusted layout for calibration

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Implemented mapping and graph for acquisition graph variables
80e15c3 
- Added guards for controller methods
- Added color map to ADMTStyleHelper

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Implemented multi-thread operations to acquisition tab
9257431 
- Set static value updates to 300ms
- Variable graph update interval
- Set acquisition to 16ms
- Added layout for fault register widget

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Implemented device status fault monitoring
6c7b05c 
- Added disconnect method for separate threads

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Code cleanup
f7b34b2 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Added disable states for tab widget while calibrating
f3cb3b9 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: Adjusted GPIO Monitor and Control
6303702 
- Included input and output for GPIO and disable function based on hardware
- Fixed sequence section not updating on switch tabs
- Added initialize for ADMT DIGIOEN register

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
Merge branch 'dev' of https://github.com/JJuanill/scopy into dev_admt
1fee592
@JJuanill
admt: Applied latest dev branch
c87a533 
- Applied new style method

Signed-off-by: John Lloyd Juanillo <[email protected]>
@JJuanill
admt: File cleanup
0020c57 
Signed-off-by: John Lloyd Juanillo <[email protected]>
JJuanill and others added 4 commits January 22, 2025 16:25
@JJuanill
admt: Added spinbox to new style property
9623c06 
- Adjusted calibration tab UI elements

Signed-off-by: John Lloyd Juanillo <[email protected]>
admt: Replaced timers with threads for utility tab
d6cc350 
- Added style for checkbox LED

Signed-off-by: U-ANALOG\JJuanill <[email protected]>
admt: Added license headers
5e2b175 
Signed-off-by: U-ANALOG\JJuanill <[email protected]>
admt: Cleanup license headers for remaining files
17309a8 
Signed-off-by: U-ANALOG\JJuanill <[email protected]>
@JJuanill
admt: Added regmap debug method
53dac52 
Signed-off-by: John Lloyd Juanillo <[email protected]>
@andrei47w
Copy link
Contributor

I see the PR is still in progess, but I noticed a few things that might need changing before this is ready for complete review.

  • create an xml for emulator so we can test the plugin without needing the hardware (https://github.com/analogdevicesinc/iio-emu/tree/main/tools)
  • format code using clang-format version 10 (run tools/format.sh)
  • revert change in the main CMakeLists.txt
  • admt/CMakeLists:
    • remove unused liked libs from cmake (scopy-gr-util, scopy-iioutil, scopy-iio-widgets)
    • remove UI_LIST uses
  • all larger stylesheets from inside .cpp files should be moved to qss using the style infrastructure
  • migrate admtstylehelper.cpp to qss style and use Style::getChannelColor instead of redefining colors
  • HorizontalSpinBox::setEnabled argument should be bool ?
  • rebase with main

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adisuciu adisuciu Awaiting requested review from adisuciu

@AlexandraTrifan AlexandraTrifan Awaiting requested review from AlexandraTrifan

@andrei47w andrei47w Awaiting requested review from andrei47w

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JJuanill @andrei47w @RainDalena @doun-doughnut