Skip to content

plugin: Add ADMT Plugin for ADMT4000 #1878

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
Open
wants to merge 112 commits into
base: main
Choose a base branch
from
Open

plugin: Add ADMT Plugin for ADMT4000 #1878

wants to merge 112 commits into from

Conversation

JJuanill
Copy link

Adding implementation of ADMT4000 Harmonic Calibration plugin to Scopy

@andrei47w
Copy link
Contributor

andrei47w commented Feb 3, 2025 •
edited
Loading

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-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

@adisuciu adisuciu added the v2.1 label Feb 4, 2025
andrei47w
andrei47w requested changes Mar 5, 2025
View reviewed changes
Copy link
Contributor

@andrei47w andrei47w left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can include the emulator xml you generated in this PR as is, since iio-emu does not support regmaps. Also use the xml to test the plugin as a demo (functionalities are not expected to work, but it should not crash)

Fix the failing tests:
https://github.com/analogdevicesinc/scopy/actions/runs/13560535173/job/37910054758?pr=1878#step:5:1307

@JJuanill JJuanill changed the base branch from dev to main March 10, 2025 07:20
@JJuanill JJuanill force-pushed the dev_admt branch 2 times, most recently from 35bc8d7 to 82eb140 Compare March 10, 2025 07:48
@JJuanill JJuanill requested a review from andrei47w March 13, 2025 05:14
andrei47w
andrei47w requested changes Mar 14, 2025
View reviewed changes
andrei47w
andrei47w requested changes Mar 14, 2025
View reviewed changes
@JJuanill JJuanill force-pushed the dev_admt branch 6 times, most recently from 229c485 to aa54bcf Compare March 20, 2025 01:16
@JJuanill JJuanill requested a review from andrei47w March 20, 2025 01:51
@adisuciu
Copy link
Contributor

This looks good ..

Can you clean up the commit history a little bit ?
We can also squash and have a single commit for this pull request.

@JJuanill
admt: Configured ADMT plugin
f50531f 
- Added logic for compatible
- Changed Harmonic Calibration icon
- Changed plugin description

Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
U-ANALOG\JJuanill and others added 27 commits April 21, 2025 09:37
@JJuanill
admt: Replaced timers with threads for utility tab
b5daa22 
- Added style for checkbox LED

Signed-off-by: U-ANALOG\JJuanill <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Added license headers
9db87d8 
Signed-off-by: U-ANALOG\JJuanill <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Cleanup license headers for remaining files
3bcf131 
Signed-off-by: U-ANALOG\JJuanill <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Added regmap debug method
ed51605 
Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Implemented continuous calibration
7d65183 
- Migrating styles to separate .qss
- Changed status LED behavior

Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Removed unused libraries in CMakeLists
d0d7de4 
- Removed UI_LIST uses

Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Format C++ and CMakeLists
dce09f3 
Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Applied clang-format for C++ files
32930e8 
Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Styles cleanup
ebd1329 
- Added sequence mode 2 graph checkboxes
- Updated calibration graphs to align with styles infrastructure
- Added formatter for graphs
- Added colored checkbox
- Disabled SPI CRC and Flag
- Set default motor RPM to 30
- Changed uint16_t to quint16 for slot and signals

Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Include XML IIO Emulator for ADMT4000
84a1e98 
Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Migrated styles
86effff 
- Removed ADMTStyleHelper and dependencies
- Removed unused horizontal spinbox
- Updated labels to subtle style
- Set fixed size for custom switch

Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Added slot and signal for acquisition tab data
3148c4e 
- Removed graph update interval
- Optimized GUI updates using slots and signals
- Removed threaded UI update for acquisition tab

Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Moved XML emulator file
166848d 
Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Added slot and signal for calibration UI updates
97b1027 
- Code cleanup

Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Handled validations for register maps for emulator
ad213e6 
Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
resources: Added ADMT4000 emulator device
6272a42 
Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Disable ECC when configuring DIGIOEN, GENERAL, and Harmonic reg…
e805fa8 
…isters

Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Use general_use_native_dialogs preference
b915d47 
Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Resolve tests
c464b91 
Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Fix displayed turn count
2028da1 
- Code cleanup potential memory leaks
- Disabled ECC on startup
- Adusted layout for calibration tab
- Replaced maps with QMap

Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Changed samples per cycle to total samples in calibration tab
98ba8c6 
- Revised displayed turn count in acquisition tab

Signed-off-by: John Lloyd Juanillo <[email protected]>
Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Added turn count to acquisition tab
bf024c6 
- Removed raw motor target and current position
- Added reset motor position button
- Revised ABS angle turn count calculation
- Code cleanup

Signed-off-by: John Lloyd Juanillo <[email protected]>

Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Inverted CW and CCW motor direction
aafd094 
- Added call to stop reset to zero
- Clear harmonic registers on init

Signed-off-by: John Lloyd Juanillo <[email protected]>

Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Save calibration coeff. hex code to CSV
381b841 
- Revised CSV saving format
- Included post calibration samples, corrected errors, and FFTs

Signed-off-by: John Lloyd Juanillo <[email protected]>

Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Updated CNV change method
0ae5e80 
- Changed CNV page to uint8_t
- Added registry read for rotation, angle, count, temp channels
- Added disable state for lineedit
- Changed error value for double to UINT32_MAX

Signed-off-by: John Lloyd Juanillo <[email protected]>

Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Fixed sequence configuration
b968ad9 
- Added conversion restart on calibration
- Fixed bug when deselect all graph channel in acquisition
- Changed ramp mode variable for reset motor to zero
- Remove unused methods

Signed-off-by: John Lloyd Juanillo <[email protected]>

Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Updated channel read value
5652da8 
Signed-off-by: John Lloyd Juanillo <[email protected]>

Signed-off-by: JJuanill <[email protected]>
JJuanill added 2 commits April 28, 2025 12:55
@JJuanill
admt: Updated channel read
fd704c3 
- Added disable state for colored checkbox

Signed-off-by: JJuanill <[email protected]>
@JJuanill
admt: Added mixed read mode
63eb05a 
- Changed fast motor RPM to 200

Signed-off-by: JJuanill <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@adisuciu adisuciu adisuciu approved these changes

@AlexandraTrifan AlexandraTrifan Awaiting requested review from AlexandraTrifan

@andrei47w andrei47w Awaiting requested review from andrei47w

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
v2.1
Projects
None yet
Milestone
No milestone
Development

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