Fixed merge conflict (e6fb3d69) · Commits · DELTA / DELTA Low-Cost 5.8GHz FMCW Radar PCB / AP-S 2020 Software / AP-S 2020 - PyRaTk · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

AP-S 2020 - PyRaTk
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

e6fb3d69

Commit e6fb3d69 authored 4 years ago by Merlo, Jason

Downloads
- Plain Diff

Fixed merge conflict

parents 0e9c75d6 f3cae7a7

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

pyratk/acquisition/daq.py 23 additions, 0 deletions

pyratk/acquisition/daq.py
pyratk/acquisition/data_mgr.py 2 additions, 2 deletions

pyratk/acquisition/data_mgr.py
pyratk/acquisition/synth_daq.py 1 addition, 1 deletion

pyratk/acquisition/synth_daq.py
pyratk/acquisition/virtual_daq.py 1 addition, 1 deletion

pyratk/acquisition/virtual_daq.py
pyratk/radars/radar.py 3 additions, 1 deletion

pyratk/radars/radar.py
pyratk/trackers/aps_tracker.py 17 additions, 8 deletions

pyratk/trackers/aps_tracker.py
pyratk/widgets/polar_tracker_widget.py 36 additions, 3 deletions

pyratk/widgets/polar_tracker_widget.py
pyratk/widgets/range_doppler_widget.py 2 additions, 2 deletions

pyratk/widgets/range_doppler_widget.py

with 85 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment