wellton/OpenBCI_GUI
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade
295 Commits 4 Branches 6 Tags
master
Gráfico de Commits

295 Commits

Este Branch
Este Branch
Todos os Branches
Autor SHA1 Mensagem Data
AJ Keller 703f4e572e Merge branch 'development' of https://github.com/OpenBCI/OpenBCI_GUI_v2.0 into development 2016-12-21 17:02:10 -05:00
Conor Russomanno ad4fbb63a1 Merge pull request #97 from conorrussomanno/development 
some stuff
 2016-12-21 16:58:07 -05:00
Conor Russomanno 11c6e95a24 some stuff 2016-12-21 16:57:25 -05:00
Conor Russomanno 22401fba0f Merge pull request #96 from conorrussomanno/development 
Development
 2016-12-21 16:15:03 -05:00
Conor Russomanno 91a6c94dab working out Gang Cat GUI connection 2016-12-21 16:14:28 -05:00
AJ Keller e040d7ce43 Merge branch 'development' of https://github.com/OpenBCI/OpenBCI_GUI_v2.0 into development 2016-12-21 13:59:31 -05:00
Conor Russomanno 4466d79350 new GIF 2016-12-21 00:33:51 -05:00
Conor Russomanno 7a98df8f2c Merge pull request #95 from conorrussomanno/development 
deleted extra libraries, embellished Ganglion Imp Check and finished …
 2016-12-19 23:50:10 -05:00
Conor Russomanno 3bad816475 deleted extra libraries, embellished Ganglion Imp Check and finished Cyton Channel Setting Controller 2016-12-19 23:49:10 -05:00
Colin Fausnaught 7138b90059 Added new EMG widget 2016-12-19 22:08:09 -05:00
Colin Fausnaught 8a69084f8e Merge branch 'development' of https://github.com/OpenBCI/OpenBCI_GUI_v2.0 2016-12-19 16:37:17 -05:00
AJ Keller d49081ed9e Merge branch 'development' of https://github.com/OpenBCI/OpenBCI_GUI_v2.0 into development 2016-12-19 14:13:34 -05:00
Conor Russomanno 70b8fbf349 Merge pull request #92 from conorrussomanno/development 
added GIF library
 2016-12-19 14:11:27 -05:00
Conor Russomanno 7ae4b94b12 added GIF library 2016-12-19 14:10:58 -05:00
AJ Keller d468840a57 Merge branch 'development' of https://github.com/OpenBCI/OpenBCI_GUI_v2.0 into development 2016-12-19 14:08:01 -05:00
AJ Keller 6787fded9a Working on patching connection issues 2016-12-19 14:05:27 -05:00
Conor Russomanno d36325206f Merge pull request #91 from conorrussomanno/development 
Development
 2016-12-19 13:59:46 -05:00
Conor Russomanno 9019d98cd6 new intro message and comtrol panel styling 2016-12-19 13:59:10 -05:00
Conor Russomanno a08bae384a deleting unecessary GIFs 2016-12-19 03:42:03 -05:00
Conor Russomanno 5e20751028 improved the control panel init stuff ... added a loading GIF ... other small stuff 2016-12-19 03:37:25 -05:00
Conor Russomanno bde65145a6 fixed broken playback and added responsiveness 2016-12-17 19:24:09 -05:00
Colin Fausnaught bcb0be39c3 Merge https://github.com/OpenBCI/OpenBCI_GUI_v2.0 2016-12-16 14:26:53 -05:00
AJ Keller 64a3f90957 saving 2016-12-16 12:27:58 -05:00
Conor Russomanno 5fbc4e470b Merge pull request #89 from conorrussomanno/development 
Development
 2016-12-16 11:23:54 -05:00
Conor Russomanno 9d5c5b11bf fixed x0 vs x etc and responsiveness of accelerometer widget 2016-12-16 01:58:16 -05:00
Conor Russomanno e20fc0c0cf adding x vs x0 etc. to widget 2016-12-15 17:03:46 -05:00
Conor Russomanno 31979de4cc Merge pull request #87 from conorrussomanno/development 
Development
 2016-12-14 17:23:49 -05:00
Conor Russomanno af1de58db2 doing some Accel ganglion stuff 2016-12-14 17:23:04 -05:00
Conor Russomanno 1233c7cc57 Merge branch 'development' of https://github.com/OpenBCI/OpenBCI_GUI_v2.0 into development 2016-12-14 16:43:11 -05:00
Conor Russomanno 5d10217f5d not sure what... 2016-12-14 16:42:40 -05:00
AJ Keller e69dec61cc Merge pull request #86 from aj-ptw/development 
Patch accel
 2016-12-14 16:41:34 -05:00
AJ Keller cf821a1636 Patch accel 2016-12-14 16:40:55 -05:00
AJ Keller 6071eb4d82 Merge pull request #85 from aj-ptw/development 
Fixes ganglion accelerometer
 2016-12-14 15:40:43 -05:00
AJ Keller 3a285f5efa Fixes ganglion accelerometer 2016-12-14 15:39:46 -05:00
AJ Keller cb3599d503 Merge pull request #84 from aj-ptw/development 
Development
 2016-12-14 15:06:26 -05:00
AJ Keller 353477744e Add critical component for Cyton V2 2016-12-14 15:04:50 -05:00
AJ Keller 5960fc362f Merge branch 'development' of https://github.com/OpenBCI/OpenBCI_GUI_v2.0 into development 2016-12-14 14:03:02 -05:00
AJ Keller 1347f65ca6 Working on comms failure hook 2016-12-14 14:02:01 -05:00
Conor Russomanno 263245eb63 Merge pull request #83 from conorrussomanno/development 
Development
 2016-12-14 14:00:28 -05:00
Conor Russomanno 72c7b792ba got impedance and uVrms working again in timeSeries for Cyton.. not sure how it translates to Ganglion 2016-12-13 23:32:56 -05:00
Conor Russomanno 60edb62d06 small stuff 2016-12-13 19:29:21 -05:00
Conor Russomanno f463cb347f Merge branch 'development' of https://github.com/OpenBCI/OpenBCI_GUI_v2.0 into development 2016-12-13 17:58:01 -05:00
Conor Russomanno 7514946034 lots of Ganglion impedance stuff 2016-12-13 17:57:11 -05:00
AJ Keller f80c7591b5 Merge pull request #82 from aj-ptw/development 
Add accel for ganglion
 2016-12-13 17:47:59 -05:00
AJ Keller dd9ae5a129 Add accel for ganglion 2016-12-13 17:47:34 -05:00
Conor Russomanno 00c5ce99ab created widget for ganglion impedance testing, removed imp check from timeSeries for everything but NORMAL mode w Cyton 2016-12-13 01:31:54 -05:00
Conor Russomanno 349f2f1563 deleted channel controller and added clickable on/off buttons... radio connection is still finicky for the on/off though.. 2016-12-12 09:54:45 -05:00
Conor Russomanno 1431fea30c fixed a small control panel button bug 2016-12-10 12:03:07 -05:00
Conor Russomanno fdbc7e04aa Merge pull request #81 from conorrussomanno/development 
deleted DRAFTS directory and made a bunch of changes to the styling o…
 2016-12-09 00:24:52 -05:00
Conor Russomanno 3204efd279 deleted DRAFTS directory and made a bunch of changes to the styling of the GUI 2016-12-09 00:23:45 -05:00