Skip to content

Commit

Permalink
Merge pull request #6 from martynvdijke/dev
Browse files Browse the repository at this point in the history
Update to version 0.2
  • Loading branch information
martynvdijke authored Feb 8, 2021
2 parents 8f92720 + 32c8495 commit 0050431
Show file tree
Hide file tree
Showing 350 changed files with 5,613 additions and 40,357 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dev_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest -C $BUILD_TYPE
run: ctest -V $BUILD_TYPE

- name: Remove build dir
working-directory: ${{runner.workspace}}
Expand Down
7 changes: 1 addition & 6 deletions .github/workflows/master_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,5 @@ jobs:
# Execute the build. You can specify a specific target with "--target <NAME>"
run: cmake --build . --config $BUILD_TYPE

- name: Test
working-directory: ${{runner.workspace}}/dev/build
shell: bash
# Execute tests defined by the CMake configuration.
# See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
run: ctest -C $BUILD_TYPE


135 changes: 7 additions & 128 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,135 +1,14 @@
##git ignore

#Declarations in this file will be ignored
#ignore build direcotry
build/
#except build scripts
##debug build script
!build/buils.sh
##release build script
!build/release_build.sh

#test folder
#ignore test folder
test/

#####
#Pycharm and VsCode directories

# Created by https://www.toptal.com/developers/gitignore/api/vscode
# Edit at https://www.toptal.com/developers/gitignore?templates=vscode

apps/profiling/
### vscode ###
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace


# Created by https://www.toptal.com/developers/gitignore/api/pycharm
# Edit at https://www.toptal.com/developers/gitignore?templates=pycharm

### PyCharm ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839

# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
.idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf

# Generated files
.idea/**/contentModel.xml

# Sensitive or high-churn files
.idea/**/dataSources/
.idea/**/dataSources.ids
.idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml

# Gradle
.idea/**/gradle.xml
.idea/**/libraries

# Gradle and Maven with auto-import
# When using Gradle or Maven with auto-import, you should exclude module files,
# since they will be recreated, and may cause churn. Uncomment if using
# auto-import.
# .idea/artifacts
# .idea/compiler.xml
# .idea/jarRepositories.xml
# .idea/modules.xml
# .idea/*.iml
# .idea/modules
# *.iml
# *.ipr

# CMake
cmake-build-*/

# Mongo Explorer plugin
.idea/**/mongoSettings.xml

# File-based project format
*.iws

# IntelliJ
out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Cursive Clojure plugin
.idea/replstate.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

# Editor-based Rest Client
.idea/httpRequests

# Android studio 3.1+ serialized cache file
.idea/caches/build_file_checksums.ser

### PyCharm Patch ###
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721

# *.iml
# modules.xml
# .idea/misc.xml
# *.ipr

# Sonarlint plugin
# https://plugins.jetbrains.com/plugin/7973-sonarlint
.idea/**/sonarlint/

# SonarQube Plugin
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
.idea/**/sonarIssues.xml

# Markdown Navigator plugin
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
.idea/**/markdown-navigator.xml
.idea/**/markdown-navigator-enh.xml
.idea/**/markdown-navigator/

# Cache file creation bug
# See https://youtrack.jetbrains.com/issue/JBR-2257
.idea/$CACHE_FILE$
.vscode/

# CodeStream plugin
# https://plugins.jetbrains.com/plugin/12206-codestream
.idea/codestream.xml
cmake-build-debug/

# End of https://www.toptal.com/developers/gitignore/api/pycharm
##Pycharm
.idea/
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "testcase-generator"]
path = testcase-generator
url = [email protected]:martynvdijke/gr-lora_sdr-testcase-generator.git
[submodule "profiler"]
path = profiler
url = [email protected]:martynvdijke/gr-lora_sdr-profiler.git
8 changes: 0 additions & 8 deletions .idea/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions .idea/gr-lora_sdr.iml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/misc.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

51 changes: 0 additions & 51 deletions .vscode/launch.json

This file was deleted.

78 changes: 0 additions & 78 deletions .vscode/settings.json

This file was deleted.

7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## v0.2
- Made seperate git modules for test-case-generator and profiler
- Large improbments and updates of profiler
- Revamped system to use gnuradio stream tagging function in order to close simulation mode
- Added new data_source_sim block for simulation mode
- Made Tx and Rx block that house all individual components of the receiving and transmitting side.
- Added new assertions in grc
## v0.1

#### Enhancements:
Expand Down
8 changes: 2 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ message(STATUS "Build type is ${CMAKE_BUILD_TYPE}" )
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
message(STATUS "Build type is ${CMAKE_BUILD_TYPE}, including logging...")
message(STATUS "Build type is ${CMAKE_BUILD_TYPE}, setting GRLORA_DEBUG=True")
# set( CMAKE_VERBOSE_MAKEFILE on )

add_definitions(-DGRLORA_DEBUG=True)

Expand All @@ -65,7 +66,7 @@ endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules)

# Set the version information here
set(VERSION_MAJOR 1)
set(VERSION_MAJOR 2)
set(VERSION_API 0)
set(VERSION_ABI 0)
set(VERSION_PATCH git)
Expand Down Expand Up @@ -172,11 +173,6 @@ endif(APPLE)
########################################################################
find_package(Doxygen)
##Add Cpp unit Testing
find_package(CppUnit)

if(NOT CPPUNIT_FOUND)
message(FATAL_ERROR "CppUnit required to compile lora_sdr")
endif()

########################################################################
# Setup doxygen option
Expand Down
Loading

0 comments on commit 0050431

Please sign in to comment.