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.

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

dependecies updated #2

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 44 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@

See the Wiki section of this repository for a list of related papers and MATLAB Live Scripts explaining some of the details of the software design.

# Copyright 2019 Michel Barbeau, Carleton University.
# Author: Michel Barbeau
# Version: February 22, 2019
## Copyright 2019 Michel Barbeau, Carleton University.
## Author: Michel Barbeau
## Version: February 22, 2019
-----------------------------
#### Latest build on GNURadio 3.8, updated by Jay Patel on June 26, 2020.


## Installing

`git clone https://github.com/michelbarbeau/gr-uwspr`
`git clone https://github.com/patel999jay/gr-uwspr.git`

Note : This is just fork of the original repo : https://github.com/michelbarbeau/gr-uwspr . Please refer the same for more details.

## Building

Expand All @@ -20,7 +25,41 @@ mkdir build

cd build

cmake ../
cmake -DENABLE_DOXYGEN=OFF -DGNURADIO_ALL_INCLUDE_DIRS=/usr/include/gnuradio/swig ../

make

make test

ctest
```
### [Newer GNURadio version 3.8 update](https://www.gnuradio.org/news/2019-08-10-gnu-radio-v3-8-0-0-release/):

#### GRC
- YAML instead of XML

#### gr-utils
- `gr_modtool` now vastly improved

#### Removed
##### project scope
- Modules `gr-comedi`, `gr-fcd` and `gr-wxgui` are gone.
#### gr-digital
- python-based packet_encoder and related tools: Bugs that were sporadic and never fixed, so after long deprecation, we’re removing it
```
cd ..

gr_modtool makeyaml c2file_source_impl

gr_modtool makeyaml c2file_source_impl

gr_modtool makeyaml FDR

gr_modtool makeyaml sliding_window_stream_to_pdu_impl

gr_modtool makeyaml sync_and_demodulate_impl

gr_modtool makeyaml WSPR_unpacker_impl

make

Expand Down
4 changes: 3 additions & 1 deletion lib/slm.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
*/

#include "slm.h"
#include <stdio.h>
#include <cmath> // standard libraries and cmath libraries are included to use sqrt and abs function. added by Jay
#include <math.h>

#ifndef DEBUG
Expand Down Expand Up @@ -53,7 +55,7 @@
2 - 1;
//
double numerator =
abs(
std::abs(
m_nl.V1 * ( m_nl.V1 * t+m_nl.p1 )
+
m_nl.V2 * ( m_nl.V2 * t+m_nl.p2 )
Expand Down