Merge pull request #98 from aj-ptw/development

Development - Add enter boot loader mode
Esse commit está contido em:
AJ Keller
2016-12-21 17:55:54 -05:00
commit de GitHub
3 arquivos alterados com 19 adições e 13 exclusões
+16
Ver Arquivo
@@ -63,6 +63,8 @@ class OpenBCI_Ganglion {
final static String TCP_ACTION_STATUS = "status";
final static String TCP_ACTION_STOP = "stop";
final static String GANGLION_BOOTLOADER_MODE = ">";
final static byte BYTE_START = (byte)0xA0;
final static byte BYTE_END = (byte)0xC0;
@@ -661,4 +663,18 @@ class OpenBCI_Ganglion {
safeTCPWrite(TCP_CMD_IMPEDANCE + "," + TCP_ACTION_STOP + TCP_STOP);
checkingImpedance = false;
}
/**
* Puts the ganglion in bootloader mode.
*/
public void enterBootloaderMode() {
println("OpenBCI_Ganglion: Entering Bootloader Mode");
safeTCPWrite(TCP_CMD_COMMAND + "," + GANGLION_BOOTLOADER_MODE + TCP_STOP);
delay(500);
disconnectBLE();
haltSystem();
initSystemButton.setString("START SYSTEM");
controlPanel.open();
output("Ganglion now in bootloader mode! Enjoy!");
}
};
-1
Ver Arquivo
@@ -451,7 +451,6 @@ class OpenBCI_ADS1299 {
return 0;
}
public void syncWithHardware(int sdSetting){
switch (hardwareSyncStep) {
// case 1:
+3 -12
Ver Arquivo
@@ -77,18 +77,9 @@ void parseKey(char val) {
// drawTimeSeries = !drawTimeSeries;
break;
case '>':
wm.setVisible(!wm.isVisible());
// wmVisible = !wmVisible;
break;
case ':':
// if(isGanglion && eegDataSource == DATASOURCE_GANGLION){
// println("Start/stop impedance check...");
// if(ganglion.isCheckingImpedance()){
// ganglion.impedanceStop();
// } else {
// ganglion.impedanceStart();
// }
// }
if(eegDataSource == DATASOURCE_GANGLION){
ganglion.enterBootloaderMode();
}
break;
case '{':
if(colorScheme == COLOR_SCHEME_DEFAULT){