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

Updating branch with master #16

Open
wants to merge 208 commits into
base: praveen/pipeline
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
208 commits
Select commit Hold shift + click to select a range
b5ef6d3
local changes
shreyExp Apr 10, 2021
1c09544
Merge pull request #11 from shreyExp/praveen/pipeline
praveen-uofg Apr 11, 2021
e57df65
merging praveen/pipeline to master. Changed Makefile to include libra…
shreyExp Apr 11, 2021
c5a2ef5
Merge branch 'master' of https://github.com/shreyExp/DreamHacker
shreyExp Apr 11, 2021
6279079
Merge pull request #15 from shreyExp/praveen/pipeline
praveen-uofg Apr 15, 2021
6fb0b7c
PulseSensor based on cpptimer
shreyExp Apr 15, 2021
e1a4f45
Based on cpp timer
shreyExp Apr 15, 2021
b233520
Incorporation of cpp timer: Renaming certain files
shreyExp Apr 15, 2021
d736230
Seperated timer implementation in an include file
shreyExp Apr 15, 2021
60af53d
Graph added
shreyExp Apr 15, 2021
d9c6cb5
Sepperation of interface and implementation of SensorTimer class
shreyExp Apr 16, 2021
9f478a6
merging to master
Apr 16, 2021
604dc00
Added Json Pipeline
Apr 16, 2021
df2115c
Merge pull request #30 from praveen1992/praveen/json-pipeline
praveen-uofg Apr 16, 2021
bf62647
Added Audio changes
shreyExp Apr 16, 2021
022b80b
Updated Cmake to include fcgi
Apr 16, 2021
0c488a6
Merge pull request #32 from praveen1992/praveen/json-pipeline
praveen-uofg Apr 16, 2021
17ffe1a
Merge pull request #1 from praveen1992/praveen/json-pipeline
praveen-uofg Apr 16, 2021
c3ae865
.gitignore html/ folder (contains gh-pages branch)
Apr 16, 2021
20956ce
doxygen test run
praveen-uofg Apr 16, 2021
94bd52b
doxygen test run
praveen-uofg Apr 16, 2021
98ed8ea
doxygen test run
praveen-uofg Apr 16, 2021
0a51774
Set theme jekyll-theme-cayman
praveen-uofg Apr 16, 2021
5d6e9e5
Merge pull request #31 from shreyExp/shreyansh/AudioCppTimer
praveen-uofg Apr 17, 2021
383d76f
Merge branch 'master' into praveen/json-pipeline
praveen-uofg Apr 17, 2021
64ef7e4
Merge pull request #33 from shreyExp/praveen/json-pipeline
praveen-uofg Apr 17, 2021
f3535ff
Audio Stopping in the appropriate time
shreyExp Apr 17, 2021
efc1db4
CMakeLists.txt corrected
shreyExp Apr 17, 2021
3be51f6
Working Audio
shreyExp Apr 17, 2021
c5b68b5
Removed unwanted file
shreyExp Apr 17, 2021
a1fd487
Removing unwanted pvt vars from SensorTimer
shreyExp Apr 17, 2021
ebdab13
Changed readme
shreyExp Apr 17, 2021
c0cba28
Changed Readme
shreyExp Apr 17, 2021
369fa4d
Adding Logo File
shreyExp Apr 17, 2021
d2cb667
Adding logo to readme
shreyExp Apr 17, 2021
a455a0c
Merge branch 'shreyansh/AudioCppTimer' of https://github.com/shreyExp…
shreyExp Apr 17, 2021
fe67c43
Image added to readme
shreyExp Apr 17, 2021
ebba3c0
Image added to readme
shreyExp Apr 17, 2021
216fca6
Image added to readme
shreyExp Apr 17, 2021
63736bc
Added SIGINT handler to end the program gracefully
shreyExp Apr 17, 2021
ff42983
readme modified
shreyExp Apr 17, 2021
582dfcf
Fixed conflicts
Apr 17, 2021
d1089c5
Merge branch 'shreyansh/AudioCppTimer'
Apr 17, 2021
e4df673
Merge pull request #2 from shreyExp/master
praveen-uofg Apr 17, 2021
b7ebe26
added docs
praveen-uofg Apr 17, 2021
215e1ac
added docs
praveen-uofg Apr 17, 2021
c4844fc
Create License File
praveen-uofg Apr 17, 2021
a3bfa14
Merge pull request #35 from shreyExp/add-license-1
praveen-uofg Apr 17, 2021
f87fb10
Update readme.md
praveen-uofg Apr 17, 2021
b777488
Update readme.md
praveen-uofg Apr 17, 2021
280c0fa
Updated read Me
praveen-uofg Apr 17, 2021
b44cf01
Merge pull request #3 from shreyExp/master
praveen-uofg Apr 17, 2021
ec6757c
Updated readme
praveen-uofg Apr 17, 2021
6e02d3f
Updated
praveen-uofg Apr 17, 2021
c53a54c
Updated readMe
praveen-uofg Apr 17, 2021
a0514cf
Updated readMe
praveen-uofg Apr 17, 2021
a0e45ae
Updated Read Me
praveen-uofg Apr 17, 2021
ff9feea
Merge pull request #36 from praveen1992/master
praveen-uofg Apr 17, 2021
08ff66f
Set theme jekyll-theme-cayman
praveen-uofg Apr 17, 2021
404dc1d
Updated readme
praveen-uofg Apr 17, 2021
d347f6b
added file
praveen-uofg Apr 17, 2021
b13b2de
created server folder and files
praveen-uofg Apr 17, 2021
078c4fc
Update readme
praveen-uofg Apr 17, 2021
253757b
Updated ReadMe
praveen-uofg Apr 17, 2021
e2efaa9
Updated ReadMe
praveen-uofg Apr 17, 2021
a599cf2
nothing
shreyExp Apr 17, 2021
be4fde9
Put sensor call back in private
shreyExp Apr 17, 2021
d8ada5d
Set theme jekyll-theme-cayman
shreyExp Apr 18, 2021
325da9d
Updated Index.md
praveen-uofg Apr 18, 2021
d5ff262
added docs
praveen-uofg Apr 18, 2021
168e179
Updated ReadMe
praveen-uofg Apr 18, 2021
6b76dc0
added docs
praveen-uofg Apr 18, 2021
137024a
Merge branch 'praveen/documentation' of https://github.com/shreyExp/D…
praveen-uofg Apr 18, 2021
94ded88
added docs
praveen-uofg Apr 18, 2021
2bfbbcf
added docs
praveen-uofg Apr 18, 2021
5b09e81
added docs
praveen-uofg Apr 18, 2021
f3abaa7
added docs
praveen-uofg Apr 18, 2021
151f963
Updated readMe
praveen-uofg Apr 18, 2021
9f61d8e
Fixed Audio Issue
shreyExp Apr 18, 2021
b059193
Merge pull request #39 from shreyExp/shreyansh/FixAudio
praveen-uofg Apr 18, 2021
a567f2f
Merge pull request #37 from shreyExp/praveen/documentation
praveen-uofg Apr 18, 2021
6b67bec
Printing format changed.
shreyExp Apr 18, 2021
c9eb5af
Added prameters to be passed to the main function
shreyExp Apr 18, 2021
064c488
Readme modified to install mpg123 program
shreyExp Apr 18, 2021
096b320
modes added for extensive testing
shreyExp Apr 18, 2021
c6716fa
Merge pull request #40 from shreyExp/shreyansh/addModalArguments
praveen-uofg Apr 18, 2021
80b2065
frontend updates
Mhiluf Apr 18, 2021
de15244
Folder name changed from audio to Audio:
shreyExp Apr 18, 2021
5be3e05
audio dir changed to Audio
shreyExp Apr 18, 2021
eab3759
countdown added
shreyExp Apr 18, 2021
ed23e26
resolving conflicts
praveen-uofg Apr 18, 2021
ffc5b47
Merge branch 'praveen/json-pipeline' into praveen/frontend
praveen-uofg Apr 18, 2021
dba544b
test case added
shreyExp Apr 18, 2021
367d079
Addition of Audio Files
Mhiluf Apr 18, 2021
ea6d782
Addition of New Logo
Mhiluf Apr 18, 2021
b4567cc
Rename of logo
Mhiluf Apr 18, 2021
5ffe615
Update readme.md
Mhiluf Apr 18, 2021
ca34625
New Logo Image
Mhiluf Apr 18, 2021
a9a9fca
Merge branch 'master' of https://github.com/shreyExp/DreamHacker
Mhiluf Apr 18, 2021
86da577
Final Logo Update
Mhiluf Apr 18, 2021
1073ddd
Update readme
Mhiluf Apr 18, 2021
9253a98
Merge branch 'praveen/frontend' into michael
praveen-uofg Apr 18, 2021
70bc950
Merge branch 'michael' into praveen/frontend
praveen-uofg Apr 18, 2021
8a17016
Integrating live data
praveen-uofg Apr 18, 2021
f19a719
Updating path variables and data
praveen-uofg Apr 18, 2021
111dd9d
Resolving conflicts
praveen-uofg Apr 18, 2021
f25022d
Create Dream Hacker SQL Script
Mhiluf Apr 18, 2021
06eaa51
Update Readme.md
Mhiluf Apr 18, 2021
1233b8c
Merge pull request #48 from shreyExp/sqlscript
praveen-uofg Apr 18, 2021
43ae571
Added threshold to pipeline and updated callbacks
praveen-uofg Apr 18, 2021
156e46f
Adding chart
praveen-uofg Apr 18, 2021
e954c61
Adding chart
praveen-uofg Apr 18, 2021
5a698e5
updating chart
praveen-uofg Apr 18, 2021
5cdabc8
updating chart
praveen-uofg Apr 18, 2021
42f4b0d
Merge pull request #47 from shreyExp/praveen/frontend
praveen-uofg Apr 18, 2021
7b6ce83
Updated nginx conf file
praveen-uofg Apr 18, 2021
6bf95e8
Update readme.md
praveen-uofg Apr 18, 2021
118d6ff
Updated readMe
praveen-uofg Apr 18, 2021
566a5b2
Update readme.md
praveen-uofg Apr 18, 2021
7b9c4fd
Update readme.md
praveen-uofg Apr 18, 2021
608514b
Merge pull request #49 from shreyExp/master
praveen-uofg Apr 18, 2021
a82f253
Create CNAME
shreyExp Apr 18, 2021
efdd9cc
modified doxyfile
praveen-uofg Apr 19, 2021
4484c2f
Merge branch 'praveen/documentation' of https://github.com/shreyExp/D…
praveen-uofg Apr 19, 2021
3762ca1
Create CNAME
shreyExp Apr 19, 2021
d495406
Create CNAME
shreyExp Apr 19, 2021
defc392
Update CNAME
shreyExp Apr 19, 2021
79ae762
the main process now knows how an audio ends naturally
shreyExp Apr 19, 2021
d6cea51
Include dir created
shreyExp Apr 19, 2021
86066b0
removed unwanted files
shreyExp Apr 19, 2021
5910ea2
.a file removed from repo not wanted
shreyExp Apr 19, 2021
0427d0d
Removed Makefile: not wanted.
shreyExp Apr 19, 2021
5525e7d
description in readme changed
shreyExp Apr 19, 2021
f3a5eaa
Changed About to reflect what are project can do
shreyExp Apr 19, 2021
df6e5b4
spelling error in readme
shreyExp Apr 19, 2021
abc4d19
Changed .gitignore
shreyExp Apr 19, 2021
b7cf697
Added docs
praveen-uofg Apr 19, 2021
4487066
Merge branch 'praveen/documentation' into praveen/documentation
praveen-uofg Apr 19, 2021
156a62c
Comments added
shreyExp Apr 19, 2021
1c91dd3
Merge pull request #51 from shreyExp/master
praveen-uofg Apr 19, 2021
92e3a49
Added comments in PulseSensor.h for doxygen
shreyExp Apr 19, 2021
bf4f146
Updated main.cpp
praveen-uofg Apr 19, 2021
947cdad
Updated liveReading
praveen-uofg Apr 19, 2021
38e31e6
Update liveReading.php
praveen-uofg Apr 19, 2021
3300c5b
Changed the usege portion
shreyExp Apr 19, 2021
ce0846b
Description of the proj in index.html changed
shreyExp Apr 19, 2021
dbd8492
Added docs
praveen-uofg Apr 19, 2021
857166d
Merge branch 'praveen/documentation' of https://github.com/shreyExp/D…
praveen-uofg Apr 19, 2021
a2e248c
Merge branch 'master' into praveen/documentation
praveen-uofg Apr 19, 2021
02c0d1d
Merge pull request #53 from shreyExp/praveen/documentation
praveen-uofg Apr 19, 2021
173d02b
Added docs
praveen-uofg Apr 19, 2021
cc73a17
Merge branch 'praveen/documentation' of https://github.com/shreyExp/D…
praveen-uofg Apr 19, 2021
e665113
Update readme.md
praveen-uofg Apr 19, 2021
630a9e8
Merge pull request #54 from shreyExp/praveen/documentation
praveen-uofg Apr 19, 2021
f7ceb23
Update CNAME
shreyExp Apr 19, 2021
a628924
Merge branch 'master' into shreyansh/commentsForDoxy
praveen-uofg Apr 19, 2021
edf613c
Added docs
praveen-uofg Apr 19, 2021
9e429f8
Merge pull request #52 from shreyExp/praveen/frontend
praveen-uofg Apr 19, 2021
6b895fe
Merge pull request #55 from shreyExp/master
praveen-uofg Apr 19, 2021
252123d
Added docs
praveen-uofg Apr 19, 2021
cbff9e1
Added docs
praveen-uofg Apr 19, 2021
21691e9
Added docs
praveen-uofg Apr 19, 2021
da559b7
Update readme.md
amberdehariya Apr 19, 2021
405d18f
Added docs
praveen-uofg Apr 19, 2021
c411174
Update readme.md
amberdehariya Apr 19, 2021
34531d2
Update readme.md
amberdehariya Apr 19, 2021
89f89a0
Update readme.md
amberdehariya Apr 19, 2021
7f899ec
Added docs
praveen-uofg Apr 19, 2021
aaef9e7
Deleted
praveen-uofg Apr 19, 2021
6335895
Added docs
praveen-uofg Apr 19, 2021
1a001a4
Changed prerequisites
shreyExp Apr 19, 2021
dc52b9b
proper dirs
shreyExp Apr 19, 2021
dbcc111
changed name of main to drmhk in readme
shreyExp Apr 19, 2021
3a638c3
Removing unnecesary files
shreyExp Apr 19, 2021
136cb54
Merge pull request #56 from shreyExp/shreyansh/ProperDirs
praveen-uofg Apr 19, 2021
c21d281
remove main from gitignore
shreyExp Apr 19, 2021
8f46c07
Removed unwanted files
shreyExp Apr 19, 2021
9225b94
Prerequisites removed from readme content
shreyExp Apr 19, 2021
315d63e
Update ReadMe
Mhiluf Apr 19, 2021
b61c9c4
Added DAC in Hardware
shreyExp Apr 19, 2021
086aa37
Added Circuit Siagram
shreyExp Apr 19, 2021
384f389
Added Circuit Diagram
shreyExp Apr 19, 2021
14f117b
Merge pull request #57 from shreyExp/shreyansh/removingUnwanted
praveen-uofg Apr 19, 2021
d56a245
Readme: Link to wiki for hardware
shreyExp Apr 19, 2021
efbcecf
Merge pull request #58 from shreyExp/praveen/documentation
praveen-uofg Apr 19, 2021
a487162
Merge pull request #59 from shreyExp/master
praveen-uofg Apr 19, 2021
50df4a1
Added Analysis snapshot
shreyExp Apr 19, 2021
03c063b
Added docs
praveen-uofg Apr 19, 2021
0cc7454
Update readme.md
praveen-uofg Apr 19, 2021
d2a231a
Added Second Analysis file
shreyExp Apr 19, 2021
2c6c261
Rename readme.md to README.md
praveen-uofg Apr 19, 2021
a4e0b42
Update README.md
praveen-uofg Apr 19, 2021
494a78a
Added docs
praveen-uofg Apr 19, 2021
69bb341
Added docs
praveen-uofg Apr 19, 2021
a3d6236
Readme: Link given to Circuit Diagram
shreyExp Apr 19, 2021
568325e
Link given to circuit Diagram
shreyExp Apr 19, 2021
00bd03b
Update README.md
praveen-uofg Apr 19, 2021
85b6175
wait functionality improved
shreyExp Apr 19, 2021
5f678c5
Merge pull request #60 from shreyExp/shreyansh/waitTimeMod
praveen-uofg Apr 19, 2021
e5cff8b
Merge branch 'praveen/documentation'
praveen-uofg Apr 19, 2021
61ae222
Merge branch 'master' into praveen/documentation
praveen-uofg Apr 19, 2021
e16fde5
Added docs
praveen-uofg Apr 19, 2021
98e72fe
Readme: References Added
shreyExp Apr 19, 2021
f059061
Added docs
praveen-uofg Apr 19, 2021
149ebe1
Merge pull request #63 from shreyExp/praveen/documentation
praveen-uofg Apr 19, 2021
b3f814b
Merge pull request #64 from shreyExp/master
praveen-uofg Apr 19, 2021
79f78db
Added docs
praveen-uofg Apr 19, 2021
37f402f
Merge pull request #65 from shreyExp/praveen/documentation
praveen-uofg Apr 19, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
.project
.cproject
main
cmake_install.cmake
CMakeFiles/
tags
CMakeCache.txt
CTestTestfile.cmake
main_autogen/
pul
screenshot.png
libcpptimer.a
Makefile
drmhk
Makefile
36 changes: 36 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
cmake_minimum_required(VERSION 3.7.0)

project(pulse VERSION 1.0.0 LANGUAGES CXX)

if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
set(CMAKE_BUILD_TYPE "RelWithDebInfo")
endif()
add_compile_options(-Wall -Wconversion -Wextra -pedantic)
add_library(cpptimer STATIC src/CppTimer.cpp)
TARGET_LINK_LIBRARIES(cpptimer rt fcgi ${CMAKE_THREAD_LIBS_INIT} curl)
set_target_properties(cpptimer PROPERTIES POSITION_INDEPENDENT_CODE TRUE)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
set(THREADS_PREFER_PTHREAD_FLAG ON)

find_package(Qt5 COMPONENTS Widgets PrintSupport REQUIRED)
find_package(QCustomPlot)
find_library(wiringPi_LIB wiringPi)
find_package(Threads REQUIRED)
find_package( CURL )

add_executable(drmhk
src/CppTimer.cpp
include/mainwindow.cpp
main/main.cpp
)

target_link_libraries(drmhk
Qt5::Widgets Qt5::PrintSupport Threads::Threads cpptimer ${QCustomPlot_LIBRARIES} ${wiringPi_LIB} fcgi rt ${CMAKE_THREAD_LIBS_INIT} curl
)

1 change: 1 addition & 0 deletions CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docs.dreamhacker.co.uk
68 changes: 0 additions & 68 deletions CppTimer.cpp

This file was deleted.

41 changes: 41 additions & 0 deletions Doxyfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
PROJECT_NAME = "DreamHacker"
OUTPUT_DIRECTORY = ./docs/
BUILTIN_STL_SUPPORT = YES
EXTRACT_ALL = YES
EXCLUDE_PATTERNS = */build/* */CMakeFiles/*
RECURSIVE = YES
HIDE_UNDOC_RELATIONS = NO
HAVE_DOT = YES
GENERATE_TREEVIEW = YES
TOC_INCLUDE_HEADINGS = 5
UML_LOOK = YES
CALL_GRAPH = YES
CALLER_GRAPH = YES

# Show private member
EXTRACT_PRIVATE = YES


GENERATE_LATEX = NO
GENERATE_HTML = YES
HTML_OUTPUT = ./
HTML_COLORSTYLE_HUE = 220
HTML_COLORSTYLE_SAT = 100
HTML_COLORSTYLE_GAMMA = 80
HTML_TIMESTAMP = YES
HTML_DYNAMIC_SECTIONS = NO
HTML_INDEX_NUM_ENTRIES = 100

# Optimize for C/C++
OPTIMIZE_OUTPUT_FOR_C = YES

# Styling
INPUT = README.md STRUCTURE.md ./include/ ./src/ ./main/ ./drmhk_autogen/
USE_MDFILE_AS_MAINPAGE = README.md

SOURCE_BROWSER = YES
INLINE_SOURCES = YES
STRIP_CODE_COMMENTS = YES
REFERENCED_BY_RELATION = YES
REFERENCES_RELATION = YES
REFERENCES_LINK_SOURCE = YES
Loading