Code

Merge to finalize JSON out with UI#42

Code

Open

Mhiluf wants to merge 189 commits intopraveen/json-pipelineshreyExp/DreamHacker:praveen/json-pipelinefrom mastershreyExp/DreamHacker:masterCopy head branch name to clipboard

+46,852-1,910

Commits

Commits on Apr 16, 2021

• Merge pull request #1 from praveen1992/praveen/json-pipeline

  Show description for 17ffe1a
  praveen-uofg

  authored
  17ffe1a

• .gitignore html/ folder (contains gh-pages branch)

  

  [email protected]

  committed
  c3ae865

• doxygen test run

  praveen-uofg

  committed
  20956ce

• doxygen test run

  praveen-uofg

  committed
  94bd52b

• doxygen test run

  praveen-uofg

  committed
  98ed8ea

• Set theme jekyll-theme-cayman

  praveen-uofg

  committed
  0a51774

Commits on Apr 17, 2021

• Merge pull request #33 from shreyExp/praveen/json-pipeline

  Show description for 64ef7e4
  praveen-uofg

  authored
  64ef7e4

• Audio Stopping in the appropriate time

  shreyExp

  committed
  f3535ff

• CMakeLists.txt corrected

  shreyExp

  committed
  efc1db4

• Working Audio

  shreyExp

  committed
  3be51f6

• Removed unwanted file

  shreyExp

  committed
  c5b68b5

• Removing unwanted pvt vars from SensorTimer

  shreyExp

  committed
  a1fd487

• Changed readme

  shreyExp

  committed
  ebdab13

• Changed Readme

  shreyExp

  committed
  c0cba28

• Adding Logo File

  shreyExp

  authored
  369fa4d

• Adding logo to readme

  shreyExp

  committed
  d2cb667

• Merge branch 'shreyansh/AudioCppTimer' of https://github.com/shreyExp/DreamHacker into shreyansh/AudioCppTimer

  shreyExp

  committed
  a455a0c

• Image added to readme

  shreyExp

  committed
  fe67c43

• Image added to readme

  shreyExp

  committed
  ebba3c0

• Image added to readme

  shreyExp

  committed
  216fca6

• Added SIGINT handler to end the program gracefully

  shreyExp

  committed
  63736bc

• readme modified

  shreyExp

  committed
  ff42983

• Fixed conflicts

  

  [email protected]

  committed
  582dfcf

• Merge branch 'shreyansh/AudioCppTimer'

  

  [email protected]

  committed
  d1089c5

• Merge pull request #2 from shreyExp/master

  Show description for e4df673
  praveen-uofg

  authored
  e4df673

• added docs

  praveen-uofg

  committed
  b7ebe26

• added docs

  praveen-uofg

  committed
  215e1ac

• Create License File

  Show description for c4844fc
  praveen-uofg

  authored
  c4844fc

• Merge pull request #35 from shreyExp/add-license-1

  Show description for a3bfa14
  praveen-uofg

  authored
  a3bfa14

• Update readme.md

  praveen-uofg

  authored
  f87fb10

• Update readme.md

  praveen-uofg

  authored
  b777488

• Updated read Me

  praveen-uofg

  authored
  280c0fa

• Merge pull request #3 from shreyExp/master

  Show description for b44cf01
  praveen-uofg

  authored
  b44cf01

• Updated readme

  praveen-uofg

  authored
  ec6757c

• Updated

  praveen-uofg

  authored
  6e02d3f

• Updated readMe

  praveen-uofg

  authored
  c53a54c

• Updated readMe

  praveen-uofg

  authored
  a0514cf

• Updated Read Me

  praveen-uofg

  authored
  a0e45ae

• Merge pull request #36 from praveen1992/master

  Show description for ff9feea
  praveen-uofg

  authored
  ff9feea

• Set theme jekyll-theme-cayman

  praveen-uofg

  committed
  08ff66f

• Updated readme

  praveen-uofg

  authored
  404dc1d

• added file

  praveen-uofg

  authored
  d347f6b

• created server folder and files

  praveen-uofg

  authored
  b13b2de

• Update readme

  praveen-uofg

  authored
  078c4fc

• Updated ReadMe

  praveen-uofg

  authored
  253757b

• Updated ReadMe

  praveen-uofg

  authored
  e2efaa9

• nothing

  shreyExp

  committed
  a599cf2

• Put sensor call back in private

  shreyExp

  committed
  be4fde9

Commits on Apr 18, 2021

• Set theme jekyll-theme-cayman

  shreyExp

  committed
  d8ada5d

• Updated Index.md

  praveen-uofg

  authored
  325da9d

• added docs

  praveen-uofg

  committed
  d5ff262

• Updated ReadMe

  praveen-uofg

  authored
  168e179

• added docs

  praveen-uofg

  committed
  6b76dc0

• Merge branch 'praveen/documentation' of https://github.com/shreyExp/DreamHacker into praveen/documentation

  praveen-uofg

  committed
  137024a

• added docs

  praveen-uofg

  committed
  94ded88

• added docs

  praveen-uofg

  committed
  2bfbbcf

• added docs

  praveen-uofg

  committed
  5b09e81

• added docs

  praveen-uofg

  committed
  f3abaa7

• Updated readMe

  praveen-uofg

  authored
  151f963

• Fixed Audio Issue

  shreyExp

  committed
  9f61d8e

• Merge pull request #39 from shreyExp/shreyansh/FixAudio

  Show description for b059193
  praveen-uofg

  authored
  b059193

• Merge pull request #37 from shreyExp/praveen/documentation

  Show description for a567f2f
  praveen-uofg

  authored
  a567f2f

• Printing format changed.

  shreyExp

  committed
  6b67bec

• Added prameters to be passed to the main function

  shreyExp

  committed
  c9eb5af

• Readme modified to install mpg123 program

  shreyExp

  authored
  064c488

• modes added for extensive testing

  shreyExp

  committed
  096b320

• Merge pull request #40 from shreyExp/shreyansh/addModalArguments

  Show description for c6716fa
  praveen-uofg

  authored
  c6716fa

• frontend updates

  Show description for 80b2065
  Mhiluf

  committed
  80b2065

• Folder name changed from audio to Audio:

  shreyExp

  committed
  de15244

• audio dir changed to Audio

  shreyExp

  committed
  5be3e05

• countdown added

  shreyExp

  committed
  eab3759

• resolving conflicts

  praveen-uofg

  committed
  ed23e26

• Merge branch 'praveen/json-pipeline' into praveen/frontend

  praveen-uofg

  committed
  ffc5b47

• test case added

  shreyExp

  committed
  dba544b

• Addition of Audio Files

  Mhiluf

  committed
  367d079

• Addition of New Logo

  Show description for ea6d782
  Mhiluf

  committed
  ea6d782

• Rename of logo

  Mhiluf

  committed
  b4567cc

• Update readme.md

  Show description for 5ffe615
  Mhiluf

  authored
  5ffe615

• New Logo Image

  Mhiluf

  committed
  ca34625

• Merge branch 'master' of https://github.com/shreyExp/DreamHacker

  Mhiluf

  committed
  a9a9fca

• Final Logo Update

  Show description for 86da577
  Mhiluf

  committed
  86da577

• Update readme

  Show description for 1073ddd
  Mhiluf

  authored
  1073ddd

• Merge branch 'praveen/frontend' into michael

  praveen-uofg

  committed
  9253a98

• Merge branch 'michael' into praveen/frontend

  praveen-uofg

  committed
  70bc950

• Integrating live data

  praveen-uofg

  committed
  8a17016

• Updating path variables and data

  praveen-uofg

  committed
  f19a719

• Resolving conflicts

  praveen-uofg

  committed
  111dd9d

• Create Dream Hacker SQL Script

  Mhiluf

  committed
  f25022d

• Update Readme.md

  Show description for 06eaa51
  Mhiluf

  authored
  06eaa51

• Merge pull request #48 from shreyExp/sqlscript

  Show description for 1233b8c
  praveen-uofg

  authored
  1233b8c

• Added threshold to pipeline and updated callbacks

  praveen-uofg

  committed
  43ae571

• Adding chart

  praveen-uofg

  committed
  156e46f

• Adding chart

  praveen-uofg

  committed
  e954c61

• updating chart

  praveen-uofg

  committed
  5a698e5

• updating chart

  praveen-uofg

  committed
  5cdabc8

• Merge pull request #47 from shreyExp/praveen/frontend

  Show description for 42f4b0d
  praveen-uofg

  authored
  42f4b0d

• Updated nginx conf file

  praveen-uofg

  authored
  7b6ce83

• Update readme.md

  praveen-uofg

  authored
  6bf95e8

• Updated readMe

  praveen-uofg

  authored
  118d6ff

• Update readme.md

  praveen-uofg

  authored
  566a5b2

• Update readme.md

  praveen-uofg

  authored
  7b9c4fd

• Merge pull request #49 from shreyExp/master

  Show description for 608514b
  praveen-uofg

  authored
  608514b

• Create CNAME

  shreyExp

  committed
  a82f253

Commits on Apr 19, 2021

• modified doxyfile

  praveen-uofg

  committed
  efdd9cc

• Merge branch 'praveen/documentation' of https://github.com/shreyExp/DreamHacker into praveen/documentation

  praveen-uofg

  committed
  4484c2f

• Create CNAME

  shreyExp

  committed
  3762ca1

• Create CNAME

  shreyExp

  committed
  d495406

• Update CNAME

  shreyExp

  committed
  defc392

• the main process now knows how an audio ends naturally

  shreyExp

  committed
  79ae762

• Include dir created

  shreyExp

  committed
  d6cea51

• removed unwanted files

  shreyExp

  committed
  86066b0

• .a file removed from repo not wanted

  shreyExp

  committed
  5910ea2

• Removed Makefile: not wanted.

  shreyExp

  committed
  0427d0d

• description in readme changed

  Show description for 5525e7d
  shreyExp

  authored
  5525e7d

• Changed About to reflect what are project can do

  shreyExp

  authored
  f3a5eaa

• spelling error in readme

  shreyExp

  authored
  df6e5b4

• Changed .gitignore

  shreyExp

  committed
  abc4d19

• Added docs

  praveen-uofg

  committed
  b7cf697

• Merge branch 'praveen/documentation' into praveen/documentation

  praveen-uofg

  authored
  4487066

• Comments added

  shreyExp

  committed
  156a62c

• Merge pull request #51 from shreyExp/master

  Show description for 1c91dd3
  praveen-uofg

  authored
  1c91dd3

• Added comments in PulseSensor.h for doxygen

  shreyExp

  committed
  92e3a49

• Updated main.cpp

  praveen-uofg

  authored
  bf4f146

• Updated liveReading

  praveen-uofg

  authored
  947cdad

• Update liveReading.php

  praveen-uofg

  authored
  38e31e6

• Changed the usege portion

  shreyExp

  authored
  3300c5b

• Description of the proj in index.html changed

  shreyExp

  committed
  ce0846b

• Added docs

  praveen-uofg

  committed
  dbd8492

• Merge branch 'praveen/documentation' of https://github.com/shreyExp/DreamHacker into praveen/documentation

  praveen-uofg

  committed
  857166d

• Merge branch 'master' into praveen/documentation

  praveen-uofg

  authored
  a2e248c

• Merge pull request #53 from shreyExp/praveen/documentation

  Show description for 02c0d1d
  praveen-uofg

  authored
  02c0d1d

• Added docs

  praveen-uofg

  committed
  173d02b

• Merge branch 'praveen/documentation' of https://github.com/shreyExp/DreamHacker into praveen/documentation

  praveen-uofg

  committed
  cc73a17

• Update readme.md

  praveen-uofg

  authored
  e665113

• Merge pull request #54 from shreyExp/praveen/documentation

  Show description for 630a9e8
  praveen-uofg

  authored
  630a9e8

• Update CNAME

  shreyExp

  authored
  f7ceb23

• Merge branch 'master' into shreyansh/commentsForDoxy

  praveen-uofg

  committed
  a628924

• Added docs

  praveen-uofg

  committed
  edf613c

• Merge pull request #52 from shreyExp/praveen/frontend

  Show description for 9e429f8
  praveen-uofg

  authored
  9e429f8

• Merge pull request #55 from shreyExp/master

  Show description for 6b895fe
  praveen-uofg

  authored
  6b895fe

• Added docs

  praveen-uofg

  committed
  252123d

• Added docs

  praveen-uofg

  committed
  cbff9e1

• Added docs

  praveen-uofg

  committed
  21691e9

• Update readme.md

  amberdehariya

  authored
  da559b7

• Added docs

  praveen-uofg

  committed
  405d18f

• Update readme.md

  amberdehariya

  authored
  c411174

• Update readme.md

  amberdehariya

  authored
  34531d2

• Update readme.md

  amberdehariya

  authored
  89f89a0

• Added docs

  praveen-uofg

  committed
  7f899ec

• Deleted

  Show description for aaef9e7
  praveen-uofg

  committed
  aaef9e7

• Added docs

  praveen-uofg

  committed
  6335895

• Changed prerequisites

  shreyExp

  authored
  1a001a4

• proper dirs

  shreyExp

  committed
  dc52b9b

• changed name of main to drmhk in readme

  shreyExp

  authored
  dbcc111

• Removing unnecesary files

  shreyExp

  committed
  3a638c3

• Merge pull request #56 from shreyExp/shreyansh/ProperDirs

  Show description for 136cb54
  praveen-uofg

  authored
  136cb54

• remove main from gitignore

  shreyExp

  committed
  c21d281

• Removed unwanted files

  shreyExp

  committed
  8f46c07

• Prerequisites removed from readme content

  shreyExp

  authored
  9225b94

• Update ReadMe

  Show description for 315d63e
  Mhiluf

  authored
  315d63e

• Added DAC in Hardware

  shreyExp

  authored
  b61c9c4

• Added Circuit Siagram

  shreyExp

  authored
  086aa37

• Added Circuit Diagram

  shreyExp

  authored
  384f389

• Merge pull request #57 from shreyExp/shreyansh/removingUnwanted

  Show description for 14f117b
  praveen-uofg

  authored
  14f117b

• Readme: Link to wiki for hardware

  shreyExp

  authored
  d56a245

• Merge pull request #58 from shreyExp/praveen/documentation

  Show description for efbcecf
  praveen-uofg

  authored
  efbcecf

• Merge pull request #59 from shreyExp/master

  Show description for a487162
  praveen-uofg

  authored
  a487162

• Added Analysis snapshot

  shreyExp

  authored
  50df4a1

• Added docs

  praveen-uofg

  committed
  03c063b

• Update readme.md

  praveen-uofg

  authored
  0cc7454

• Added Second Analysis file

  shreyExp

  authored
  d2a231a

• Rename readme.md to README.md

  praveen-uofg

  authored
  2c6c261

• Update README.md

  praveen-uofg

  authored
  a4e0b42

• Added docs

  praveen-uofg

  committed
  494a78a

• Added docs

  praveen-uofg

  committed
  69bb341

• Readme: Link given to Circuit Diagram

  shreyExp

  authored
  a3d6236

• Link given to circuit Diagram

  shreyExp

  authored
  568325e

• Update README.md

  praveen-uofg

  authored
  00bd03b

• wait functionality improved

  shreyExp

  committed
  85b6175

• Merge pull request #60 from shreyExp/shreyansh/waitTimeMod

  Show description for 5f678c5
  praveen-uofg

  authored
  5f678c5

• Merge branch 'praveen/documentation'

  praveen-uofg

  committed
  e5cff8b

• Merge branch 'master' into praveen/documentation

  praveen-uofg

  committed
  61ae222

• Added docs

  praveen-uofg

  committed
  e16fde5

• Readme: References Added

  shreyExp

  authored
  98e72fe

• Added docs

  praveen-uofg

  committed
  f059061

• Merge pull request #63 from shreyExp/praveen/documentation

  Show description for 149ebe1
  praveen-uofg

  authored
  149ebe1

• Merge pull request #64 from shreyExp/master

  Show description for b3f814b
  praveen-uofg

  authored
  b3f814b

• Added docs

  praveen-uofg

  committed
  79f78db

• Merge pull request #65 from shreyExp/praveen/documentation

  Show description for 37f402f
  praveen-uofg

  authored
  37f402f