Cherry picks from main #483
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
do not print : " Failed to check if device has trigger. Error:No such file or directory" The message is misleading, as there is no error. Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 31d21bf)
Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit d934ac7)
The adrv9002 driver was updated to the 68.8.1 API. This patch updates the profiles/streams accordingly. Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit db87b69)
Making sure that changing the carrier is properly handled is now done in the kernel. Hence, all the logic in the plugin can be dropped. The only thing the plugin now has to care about is to properly update the value of the LO's that might automatically change value. Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit 6639701)
Apparently the only way for the icon to appear in the window (for themes that support it) is to explicitly call gtk_window_set_icon_name(). Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit 510b39e)
This allows to select different icons depending on the message type. Alongside this change, two new helper macros were added to easily call supported level types. While at it, also moved to gtk_message_dialog_new_with_markup() as it will be needed (as the above change) in a follow up patch. Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit 149c4c9)
Add new button and combo box for initial calibrations. As the feature is not super obvious, an help button is also being added. Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit b08926d)
Add support for the new device attribute that allow us to set the calibration mode to: * off: Initial calibrations won't run automatically * auto: Initial calibrations will run automatically for Carrier changes bigger or equal to 100MHz. There's also a dedicated button to manually run the initial calibrations. Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit 2b4e48b)
The plugin supports 8 GPIOs (as is the design of the CN0540 board). With some minor customizations, more GPIOs can be adapted (for some extra controls). When that happens, OSC will crash as 'gpio_ch[++idx].gpio = iio_device_find_channel()' will go beyond the size of the gpio_ch[] array. So, a quick fix is to just allow more GPIOs (64 should be enough for anyone). But mainly, it would be guard against going above the size of the gpio_ch[] array. Signed-off-by: Alexandru Ardelean <alex@shruggie.ro> (cherry picked from commit 22bbffd)
Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 4a6538d)
correctly get window allocation pass x and y coordinates to gdk_pixbuf_get_from_window Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit a069d68)
not all channels are input or scan channels, so omit them. Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> (cherry picked from commit a0e8f49)
Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 584eccc)
Building osc in arch linux started to fail because of warnings being
treated as errors:
"
error: implicit declaration of function ‘calloc’ [-Werror=implicit-function-declaration]
188 | text = (char *)calloc(1, sizeof(char)); /* Create an empty string */
| ^~~~~~
note: include ‘<stdlib.h>’ or provide a declaration of ‘calloc’
error: incompatible implicit declaration of built-in function ‘calloc’ [-Werror=builtin-declaration-mismatch]
"
The likely reason is that stdlib.h was somehow being indirectly included
and maybe a change in libxml changed that. Hence, let's just explicitly
include the needed header.
Signed-off-by: Nuno Sa <nuno.sa@analog.com>
(cherry picked from commit 1925e45)
check button to enable window correction, disabled by default Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 2fe837c)
window correction enabled by default check button becomes inactive when plot is running Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 5c3fcaa)
This would make compiling with clang fail with Werror Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit 6ca8470)
This would make compiling with clang fail with Werror Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit 3d4f21b)
Often, one wants to enable/disable certain features in a plugin depending on the present or not of some attribute. hence, let's add an helper for it. For now, this only supports checking device and channel attributes as that should cover most of the cases. Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit 861b42e)
Give a more descriptive name on the initial calibrations frame. This will be used in follow change to hide the frame if the feature is not supported. Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit 64a510d)
If the adrv9002 does not have support (older version) for initial_calibrations handling, the plugin was crashing. Fixing it by making use of the new iio_attr_not_found() helper. If not found, let's hide the calibrations frame and move on with life. While at it, removed useless comment. Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit 0a05c14)
Add missing new line and improving it by stating that the failure might also be from gtk_builder_add_from_file() failing to load the file and not necessarily by the file not being found. Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit bcd122b)
This will give more clarity on the smalled version of libgtkdatabox that iio-oscilloscope supports. Signed-off-by: Dan <dan.nechita@analog.com> (cherry picked from commit 4aa2fc8)
The hardware is obsoleted and so should be the plugin. Signed-off-by: Dan <dan.nechita@analog.com> (cherry picked from commit 780b1a5)
Signed-off-by: Dan <dan.nechita@analog.com> (cherry picked from commit b4efb0f)
Adrv9003 only has 1 TX. As such we should not try to update the other TX carrier value as that would lead to a segfault. Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit 616f5d9)
this ensures the app can be compiled with clang too this will be removed once gdk threading issues are addressed Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 92e8bc4)
use gdk_cursor_new_for_display instead of gdk_cursor_new Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 9ec231c)
replace gdk_screen_get_width/height with monitor geometry Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 1840649)
use gtk_container_add instead of gtk_widget_reparent get widget current parent, hide widget ref widget before removing from current container, gtk_container_remove automatically unrefs widget remove widget from current container and add to the new one Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit e4cf1d2)
use gtk_widget_set_halign/valign instead of gtk_misc_set_alignment Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit b8d6b45)
use gtk_widget_get_preffered_size instead of gtk_widget_size_request use gtk_widget_set_halign/valign instead of gtk_misc_set_alignment use gtk_widget_set_margin_start/end/top/bottom instead of gtk_misc_set_padding use gtk_container_add instead of gtk_widget_reparent get current parent for widget and hide the widget add ref for the widget before removing, gtk_container_remove automatically unrefs object when removing from container add widget to new container and show widget Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 440dfd5)
use CSS style provider to set box widget color instead of gtk_widget_override_color add box colors to style sheet Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 3937778)
use gtk_tool_button_set_icon_name instead of gtk_tool_button_set_stock_id Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 5fc10f1)
The device widgets were not being updated when pressing the reload button or when a new profile is loaded. Signed-off-by: Nuno Sa <nuno.sa@analog.com> (cherry picked from commit 607060b)
SRaus
requested review from
mhennerich,
dNechita,
nunojsa and
cristina-suteu
Signed-off-by: Raluca Chis <raluca.chis@analog.com> (cherry picked from commit 0dff7fa)
install and use gcc when compiling osc on macOS Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit dfd75d7)
add apt-get update before installing packages this solves E:Failed to fetch package error Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit afb850d)
when creating dir hier. for win installer, copy xmls dir to bin dir this ensures the detailed SPI Reg Map is visible on windows Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit d29fe60)
nunojsa
approved these changes
Feb 28, 2024
to build osc on linux systems use artifcts generated on branches: - libiio-v0 - libad9361-iio-v0 - libad9166-iio-v0 Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit c91952c)
Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 93b23cb)
Signed-off-by: Cristina Suteu <cristina.suteu@analog.com> (cherry picked from commit 4853198)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick commits with fixes from main to 2022_r2, as preparation for 2022_r2 patch1.