Drone Based GCS #76

ntlhui · 2023-07-28T04:42:55Z

Working drone-based GCS support

RctGcs/rctGCS.py

RctGcs/config.py

RctGcs/ui/display.py

RctGcs/droneSimulator.py

hgrehm · 2023-07-28T22:12:30Z

Having difficulties testing this with the simulator. Here's the traceback from my most recent attempt, which failed as I tried to connect the GCS to the sim:

2023-56-28 14:07:51.541: ERROR:rctComms.mavComms: Exception during callback
Traceback (most recent call last):
  File "C:\Users\hgreh\miniconda3\envs\rctGCS\lib\site-packages\RCTComms\comms.py", line 1222, in execute_cb
    cb_(**kwargs)
  File "C:\Users\hgreh\workspace\radio_collar_tracker_gcs\RctGcs\droneSimulator.py", line 562, in __do_get_options
    packet = RCTComms.comms.rctOptionsPacket(scope, **self.PP_options)
TypeError: keywords must be strings
{<Options.DSP_PING_WIDTH: 'DSP_ping_width'>: 27.0, <Options.DSP_PING_SNR: 'DSP_ping_snr'>: 0.1, <Options.DSP_PING_MAX: }

Curious if you're seeing this too? I can troubleshoot on my end if it might be an issue with versions or something else local to my machine. I don't see why an Enum shouldn't be allowed as a key since it's immutable...

ntlhui · 2023-07-28T22:18:48Z

Fixed in 8eb8907

All options are now of type Dict[Options, Any]. You cannot keyword expand into kwargs if the keys are not str. All option packets now accept a full dict instead of kwargs.

hgrehm · 2023-07-28T22:32:27Z

RctGcs/ui/popups.py

ConfigDialog and ConfigDialogPage still use connection_port and connection_addr

hgrehm · 2023-07-28T22:44:06Z

RctGcs/ui/controls.py

    def add_target(self):
        '''
        Internal function to facilitate users adding target frequencies
        '''
        try:
-            cntr_freq = int(self.option_vars['SDR_center_freq'].text())
-            samp_freq = int(self.option_vars['SDR_sampling_freq'].text())
-            sdr_gain = float(self.option_vars['SDR_gain'].text())
+            cntr_freq = int(self.option_vars[Options.SDR_CENTER_FREQ].text())
+            samp_freq = int(self.option_vars[Options.SDR_SAMPLING_FREQ].text())
+            sdr_gain = float(self.option_vars[Options.SDR_GAIN].text())
        except ValueError:
            UserPopups.show_warning("Please enter center and sampling frequences and SDR gain settings.")
            return


unused method

hgrehm · 2023-07-28T22:45:45Z

RctGcs/ui/controls.py

+    def validate_frequency(self, value: int) -> bool:
        '''
        Helper function to ensure frequencies are within an appropriate
        range
        Args:
            var: An integer value that is the frequency to be validated
        '''
-        cntr_freq = self.__root._mav_model.getOption('SDR_center_freq')
-        samp_freq = self.__root._mav_model.getOption('SDR_sampling_freq')
-        if abs(var - cntr_freq) > samp_freq:
+        try:
+            model = MAVModel.get_model()
+        except NoActiveModel:
+            return
+        cntr_freq = model.getOption(Options.SDR_CENTER_FREQ)
+        samp_freq = model.getOption(Options.SDR_SAMPLING_FREQ)
+        if abs(value - cntr_freq) > samp_freq:
            return False
        return True


unused method--should these checks be performed upon ~~add_entry (in widgets.py)~~?
Edit: __update_button_callback in controls.py would be a more appropriate place. Not sure what I was thinking with add_entry...

Nathan Hui added 30 commits July 13, 2023 08:15

chore: Updates RCTComms

af587f9

fix: updates RCTComms dependencies

f02b17a

chore: Adds support for GUI unit tests

89e3268

chore: Adds PyQt test support

ee54dd5

chore: Fixes imports

493fa74

feat: updates to use transport spec

eed3ae9

fix: Fixes DataManager import

e11a32a

fix: Update RCTComms

5a45c6e

chore: Remove unused method

2c0bf15

fix: Undoes duplication from f07e015

6eeb952

fix: Remove unnecessary whitelist

9f7bf5c

chore: Replace wildcard import

e855e5f

feat: Switches to transport spec in config

169716b

chore: Switches to single folder workspace

2eb34d7

fix: Fixes import errors

3a81df6

fix: Whitelisting PyQt5

cdcf42e

fix: Permits up to 10 instance vars

f1a4e65

fix: Adds IntArrayEdit

4afd3cd

fix!: Creates global registry for option vars

09f7068

fix: Imports

c54819f

fix!: Switches to new options

b8f1998

fix!: Updates to use new options

95052f1

chore: Adds logging

a4c3cc9

chore: Fixes imports

189cb63

fix: Fixes imports and enabling

88681ea

fix: Fixes import and naming

e84f5f7

chore: Deprecating non-compliant code

b1bdd3e

fix: Fixes logging timestamp format

c268d4b

fix: Fixes error display import

e7399bf

fix: Updated svg paths

d0e04f2

Nathan Hui added 4 commits July 27, 2023 22:04

chore: Updates pytest output

0f9353f

fix: Fixes test

c20377f

Update tests

e2056fc

fix: Fixes paths

25e0e74

hgrehm reviewed Jul 28, 2023

View reviewed changes

RctGcs/rctGCS.py Outdated Show resolved Hide resolved

hgrehm reviewed Jul 28, 2023

View reviewed changes

RctGcs/config.py Outdated Show resolved Hide resolved

hgrehm reviewed Jul 28, 2023

View reviewed changes

RctGcs/ui/display.py Outdated Show resolved Hide resolved

hgrehm reviewed Jul 28, 2023

View reviewed changes

RctGcs/droneSimulator.py Show resolved Hide resolved

Nathan Hui added 2 commits July 28, 2023 15:09

fix: Removes timestamp based log file

073c7e7

fix: Allows anaconda install

51632b2

Nathan Hui added 3 commits July 28, 2023 15:13

fix: Adds ConfigDialog import

f6d4037

fix: Adds spec specification to readme

5b5bffc

fix: Fixes options packet handler

8eb8907

ntlhui requested a review from hgrehm July 28, 2023 22:19

hgrehm reviewed Jul 28, 2023

View reviewed changes

RctGcs/ui/popups.py Outdated

Copy link

Contributor

hgrehm Jul 28, 2023

Choose a reason for hiding this comment

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

ConfigDialog and ConfigDialogPage still use connection_port and connection_addr

hgrehm reviewed Jul 28, 2023

View reviewed changes

ntlhui and others added 10 commits July 28, 2023 18:10

fix: Catches all exceptions on connect

660510f

fix: Adds warning for fail to set frequencies

99e3082

fix: Fixes no heartbeat warning

933f13f

fix: Enables write after set

41e671e

fix: Fixes user popups

90bfca7

fix: Adds error logging

998ccdb

fix: Only 1 attempt

f19e919

fix: Fixes update widgets

c0d11a6

fix: Updates Expert Options

500d890

fix: upgrades dependencies, merge from main

39ca9ad

ntlhui closed this Dec 17, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Drone Based GCS #76

Drone Based GCS #76

ntlhui commented Jul 28, 2023

hgrehm commented Jul 28, 2023

ntlhui commented Jul 28, 2023

hgrehm Jul 28, 2023

hgrehm Jul 28, 2023

hgrehm Jul 28, 2023 •

edited

Loading

Drone Based GCS #76

Drone Based GCS #76

Conversation

ntlhui commented Jul 28, 2023

hgrehm commented Jul 28, 2023

ntlhui commented Jul 28, 2023

hgrehm Jul 28, 2023

Choose a reason for hiding this comment

hgrehm Jul 28, 2023

Choose a reason for hiding this comment

hgrehm Jul 28, 2023 • edited Loading

Choose a reason for hiding this comment

hgrehm Jul 28, 2023 •

edited

Loading