Code

New graph adds#5

Code

Open

laurarodgers wants to merge 100 commits intomasterubcspin/EEGTouch:masterfrom new_graph_addsubcspin/EEGTouch:new_graph_addsCopy head branch name to clipboard

Commits

Commits on Jun 8, 2018

• Fixed bugs, code now works

  Show description for 0f87c30
  laurarodgers

  authored
  0f87c30

  Copy full SHA for 0f87c30

• Fixed buffer issue

  Show description for 1529e87
  laurarodgers

  authored
  1529e87

  Copy full SHA for 1529e87

• AA update

  Show description for 4b14908
  laurarodgers

  authored
  4b14908

  Copy full SHA for 4b14908

Commits on Jun 13, 2018

• logging enabled

  

  bucci

  committed
  ef9a28a

  Copy full SHA for ef9a28a

• logging pt

  

  bucci

  committed
  b93a85c

  Copy full SHA for b93a85c

• added video sync

  

  bucci

  committed
  b9c57c3

  Copy full SHA for b9c57c3

• gitignore update

  

  bucci

  committed
  ab528b5

  Copy full SHA for ab528b5

• editing video playback

  

  bucci

  committed
  a479d20

  Copy full SHA for a479d20

• video logging complete

  

  bucci

  committed
  3fd7705

  Copy full SHA for 3fd7705

• logs are now csvs

  

  bucci

  committed
  30debba

  Copy full SHA for 30debba

• added video callback and joystick pre-vis logging

  

  bucci

  committed
  c1d31ea

  Copy full SHA for c1d31ea

• sensor now logging...again

  

  bucci

  committed
  6cd6836

  Copy full SHA for 6cd6836

• working bar graph

  

  bucci

  committed
  6ad9794

  Copy full SHA for 6ad9794

Commits on Jun 14, 2018

• added vis

  

  bucci

  committed
  a7bd592

  Copy full SHA for a7bd592

• readme update

  

  bucci

  committed
  5382563

  Copy full SHA for 5382563

• readme update

  

  bucci

  committed
  bd0217f

  Copy full SHA for bd0217f

• readme update

  

  bucci

  committed
  6e71eb5

  Copy full SHA for 6e71eb5

• reorder csv

  

  bucci

  committed
  712a906

  Copy full SHA for 712a906

• vis 2

  

  bucci

  committed
  eef815d

  Copy full SHA for eef815d

• vis 2

  

  bucci

  committed
  79a5a17

  Copy full SHA for 79a5a17

Commits on Jun 21, 2018

• removed separate joystick update stream, set index joystick vals to update on A5 emit, commented out area chart, visualized with bare div. also set appendfile to be synchronous so the server doesn'…

  Show description for 01c045c
  laurarodgers

  committed
  01c045c

  Copy full SHA for 01c045c

• put the gauge beside the thing

  laurarodgers

  committed
  12986e1

  Copy full SHA for 12986e1

• some layout changes

  laurarodgers

  committed
  fe88b07

  Copy full SHA for fe88b07

• alternate visualization so they don't have to move their eyes. less skeuo but i like it more. yes, the styles are a mess and I will clean them up.

  laurarodgers

  committed
  fd44fc9

  Copy full SHA for fd44fc9

Commits on Jun 22, 2018

• Merge pull request #1 from ubcspin/L_update_621

  Show description for 4fa99b3
  laurarodgers

  authored
  4fa99b3

  Copy full SHA for 4fa99b3

• has code to shift color

  laurarodgers

  authored
  f25a3e9

  Copy full SHA for f25a3e9

• added test movie

  laurarodgers

  authored
  3ec234d

  Copy full SHA for 3ec234d

• changed video name

  laurarodgers

  authored
  26c0a33

  Copy full SHA for 26c0a33

• changed video file name

  laurarodgers

  authored
  7ff9300

  Copy full SHA for 7ff9300

• now there is a bar on the side

  laurarodgers

  authored
  8bdb854

  Copy full SHA for 8bdb854

Commits on Jun 26, 2018

• Put the bar in the centre

  laurarodgers

  authored
  c71bcdc

  Copy full SHA for c71bcdc

Commits on Jun 28, 2018

• Merge pull request #2 from ubcspin/centred_bar

  Show description for 19b9374
  laurarodgers

  authored
  19b9374

  Copy full SHA for 19b9374

• Cleaned and updated, see extended

  Show description for 0d9dcac
  laurarodgers

  authored
  0d9dcac

  Copy full SHA for 0d9dcac

• Created css file with all necessary non-dynamic styles

  Show description for 1cc6fce
  laurarodgers

  authored
  1cc6fce

  Copy full SHA for 1cc6fce

• Cleaned up api

  Show description for 9edeb37
  laurarodgers

  authored
  9edeb37

  Copy full SHA for 9edeb37

• Deleted unused jsx

  Show description for fa8eade
  laurarodgers

  authored
  fa8eade

  Copy full SHA for fa8eade

• removed unused

  Show description for acbb3ff
  laurarodgers

  authored
  acbb3ff

  Copy full SHA for acbb3ff

• removed unused

  Show description for a75a23d
  laurarodgers

  authored
  a75a23d

  Copy full SHA for a75a23d

• removed broken css ref, changed msg

  Show description for be1a54a
  laurarodgers

  authored
  be1a54a

  Copy full SHA for be1a54a

• cleaned up and edited

  Show description for 2b38459
  laurarodgers

  authored
  2b38459

  Copy full SHA for 2b38459

• new name for video

  Show description for 3a9c5ca
  laurarodgers

  authored
  3a9c5ca

  Copy full SHA for 3a9c5ca

• Add files via upload

  laurarodgers

  authored
  641cc95

  Copy full SHA for 641cc95

• removed unused

  laurarodgers

  authored
  2d09c48

  Copy full SHA for 2d09c48

• removed incorrect

  laurarodgers

  authored
  74a7d66

  Copy full SHA for 74a7d66

• removed unused

  laurarodgers

  authored
  f50f62d

  Copy full SHA for f50f62d

• removed unused

  laurarodgers

  authored
  c2219fc

  Copy full SHA for c2219fc

• Merge pull request #3 from ubcspin/clean_updated

  Show description for 7b82ed0
  laurarodgers

  authored
  7b82ed0

  Copy full SHA for 7b82ed0

Commits on Jun 30, 2018

• Added code to send sync signal to arduino

  laurarodgers

  authored
  c5ceecf

  Copy full SHA for c5ceecf

• added sync button sending signal to arduino

  laurarodgers

  authored
  d6b7eae

  Copy full SHA for d6b7eae

• added sync button style

  laurarodgers

  authored
  536c8b1

  Copy full SHA for 536c8b1

Commits on Jul 3, 2018

• stabilized joystick viz

  laurarodgers

  authored
  d7ea96f

  Copy full SHA for d7ea96f

• cosmetic change to sync button

  laurarodgers

  authored
  9dbfbe8

  Copy full SHA for 9dbfbe8

Commits on Jul 9, 2018

• improved button

  laurarodgers

  authored
  f1bb8a6

  Copy full SHA for f1bb8a6

• improved button

  laurarodgers

  authored
  4953490

  Copy full SHA for 4953490

• correct signal for reverse logic, no delay

  laurarodgers

  authored
  1f183ee

  Copy full SHA for 1f183ee

• commented

  laurarodgers

  authored
  b5e138b

  Copy full SHA for b5e138b

• Merge pull request #4 from ubcspin/smoothing_and_sync

  Show description for c632568
  laurarodgers

  authored
  c632568

  Copy full SHA for c632568

Commits on Jul 11, 2018

• added video time select

  laurarodgers

  authored
  6dc41a6

  Copy full SHA for 6dc41a6

• added video time selector

  Show description for 2eefb71
  laurarodgers

  authored
  2eefb71

  Copy full SHA for 2eefb71

• Update styles.css

  laurarodgers

  authored
  ff01221

  Copy full SHA for ff01221

Commits on Jul 12, 2018

• better smoothing

  Show description for b3de3c5
  laurarodgers

  authored
  b3de3c5

  Copy full SHA for b3de3c5

• turned off debug

  laurarodgers

  authored
  7c033d3

  Copy full SHA for 7c033d3

• Added delay for digital write

  laurarodgers

  authored
  b553c6f

  Copy full SHA for b553c6f

Commits on Aug 14, 2018

• added preflight checklist

  laurarodgers

  committed
  b0d8aa1

  Copy full SHA for b0d8aa1

Commits on Sep 1, 2018

• added matlab scripts

  laurarodgers

  committed
  e480e62

  Copy full SHA for e480e62

Commits on Sep 25, 2018

• updated matlab things

  laurarodgers

  committed
  916a350

  Copy full SHA for 916a350

Commits on Oct 5, 2018

• all scripts updated, now they're better

  laurarodgers

  committed
  3e84d7e

  Copy full SHA for 3e84d7e

• added adding path

  laurarodgers

  committed
  720181b

  Copy full SHA for 720181b

• now clears vars

  laurarodgers

  committed
  60f5d4b

  Copy full SHA for 60f5d4b

• Create readme

  laurarodgers

  authored
  0d58acf

  Copy full SHA for 0d58acf

• Updated readme

  laurarodgers

  authored
  5d2e780

  Copy full SHA for 5d2e780

• fixed mac issue on video excerpt

  laurarodgers

  committed
  da10b8f

  Copy full SHA for da10b8f

• Merge branch 'master' of https://github.com/ubcspin/EEGTouch

  Show description for 6a25e44
  laurarodgers

  committed
  6a25e44

  Copy full SHA for 6a25e44

• file change

  laurarodgers

  committed
  06342e6

  Copy full SHA for 06342e6

• fixed plot

  laurarodgers

  committed
  8b06da0

  Copy full SHA for 8b06da0

Commits on Oct 6, 2018

• plot fsr and feeltrace is now way better

  laurarodgers

  committed
  a87be86

  Copy full SHA for a87be86

• fixed axis problem

  laurarodgers

  committed
  f278e8c

  Copy full SHA for f278e8c

• now smooths feeltrace so it's less uggo

  laurarodgers

  committed
  1bdb38f

  Copy full SHA for 1bdb38f

• now prettier

  laurarodgers

  committed
  cc4224a

  Copy full SHA for cc4224a

Commits on Oct 12, 2018

• Update matlab/fsr_gameplay_align.m

  Show description for 4a03d36
  lauracang

  committed
  4a03d36

  Copy full SHA for 4a03d36

Commits on Oct 20, 2018

• fixed eeg plot script, added fsr plot script

  laurarodgers

  committed
  d19c74e

  Copy full SHA for d19c74e

Commits on Oct 26, 2018

• overlay plot

  laurarodgers

  committed
  4600e48

  Copy full SHA for 4600e48

• fix empty feeltrace_data bug & save file after scripts

  lauracang

  committed
  d3f9206

  Copy full SHA for d3f9206

Commits on Oct 31, 2018

• made graphing script tryagain better

  laurarodgers

  committed
  1b7b2cf

  Copy full SHA for 1b7b2cf

Commits on Nov 2, 2018

• fixed align invu and FINAL ver graph

  laurarodgers

  committed
  0d1a987

  Copy full SHA for 0d1a987

• fixed again align_interview

  laurarodgers

  committed
  c5d0da3

  Copy full SHA for c5d0da3

• saving final pre-invuticks

  laurarodgers

  committed
  6903563

  Copy full SHA for 6903563

Commits on Nov 3, 2018

• FINAL FINAL plot, also fixed for empty invu timestamps)

  laurarodgers

  committed
  fe11118

  Copy full SHA for fe11118

• fixed interview empty stamps

  laurarodgers

  committed
  25b997a

  Copy full SHA for 25b997a

Commits on Nov 7, 2018

• fixed invu bug

  laurarodgers

  committed
  66e93f2

  Copy full SHA for 66e93f2

Commits on Jan 21, 2019

• update

  laurarodgers

  committed
  cdb8daa

  Copy full SHA for cdb8daa

Commits on Jan 23, 2019

• many refactors

  laurarodgers

  committed
  979c5e7

  Copy full SHA for 979c5e7

Commits on Jan 24, 2019

• refactor near completion

  laurarodgers

  committed
  89d8a34

  Copy full SHA for 89d8a34

Commits on Jan 26, 2019

• fixed many problems

  laurarodgers

  committed
  18b6471

  Copy full SHA for 18b6471

• Merge branch 'master' into new_graph_adds

  laurarodgers

  authored
  7ae9c93

  Copy full SHA for 7ae9c93

• slight changes

  laurarodgers

  committed
  0559170

  Copy full SHA for 0559170

• redo*

  laurarodgers

  committed
  0302b3e

  Copy full SHA for 0302b3e

• a

  laurarodgers

  committed
  fd8db7b

  Copy full SHA for fd8db7b

• align interview

  laurarodgers

  committed
  d29cfa4

  Copy full SHA for d29cfa4

• align interview

  laurarodgers

  committed
  d094fd3

  Copy full SHA for d094fd3