Skip to content

Commit

Permalink
Merge pull request #45 from aj-ptw/2.0.1
Browse files Browse the repository at this point in the history
2.0.1
  • Loading branch information
AJ Keller committed Jan 5, 2017
2 parents 01c62a5 + a0e0b72 commit 1b2cf7b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
12 changes: 5 additions & 7 deletions OpenBCI_32bit_Library.cpp
Expand Up @@ -499,15 +499,14 @@ boolean OpenBCI_32bit_Library::boardBeginDebug(int baudRate) {
void OpenBCI_32bit_Library::boardReset(void) {
initialize(); // initalizes accelerometer and on-board ADS and on-daisy ADS if present
delay(500);

Serial0.println("OpenBCI V3 8-16 channel");
configureLeadOffDetection(LOFF_MAG_6NA, LOFF_FREQ_31p2HZ);
Serial0.println("OpenBCI V3 8-16 channel");
Serial0.print("On Board ADS1299 Device ID: 0x"); Serial0.println(ADS_getDeviceID(ON_BOARD),HEX);
if(daisyPresent){ // library will set this in initialize() if daisy present and functional
Serial0.print("On Daisy ADS1299 Device ID: 0x"); Serial0.println(ADS_getDeviceID(ON_DAISY),HEX);
}
Serial0.print("LIS3DH Device ID: 0x"); Serial0.println(LIS3DH_getDeviceID(),HEX);
Serial0.println("Firmware: v2.0.0");
Serial0.println("Firmware: v2.0.1");
sendEOT();
}

Expand Down Expand Up @@ -797,6 +796,7 @@ void OpenBCI_32bit_Library::initializeVariables(void) {
timeOffset = 0;
timeSetCharArrived = 0;
streamPacketType = (char)OPENBCI_PACKET_TYPE_V3;
verbosity = false; // when verbosity is true, there will be Serial feedback
}

void OpenBCI_32bit_Library::printAllRegisters(){
Expand Down Expand Up @@ -1066,16 +1066,15 @@ void OpenBCI_32bit_Library::csHigh(int SS)
// *************************************************************************************
// <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ADS1299 FUNCTIONS >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


void OpenBCI_32bit_Library::initialize_ads(){
// recommended power up sequence requiers >Tpor (~32mS)
// recommended power up sequence requiers >Tpor (~32mS)
delay(50);
pinMode(ADS_RST,OUTPUT);
digitalWrite(ADS_RST,LOW); // reset pin connected to both ADS ICs
delayMicroseconds(4); // toggle reset pin
digitalWrite(ADS_RST,HIGH); // this will reset the Daisy if it is present
delayMicroseconds(20); // recommended to wait 18 Tclk before using device (~8uS);
// initalize the data ready chip select and reset pins:
// initalize the data ready chip select and reset pins:
pinMode(ADS_DRDY, INPUT); // we get DRDY asertion from the on-board ADS
delay(40);
resetADS(BOARD_ADS); // reset the on-board ADS registers, and stop DataContinuousMode
Expand Down Expand Up @@ -1116,7 +1115,6 @@ void OpenBCI_32bit_Library::initialize_ads(){
leadOffSettings[i][PCHAN] = OFF;
leadOffSettings[i][NCHAN] = OFF;
}
verbosity = false; // when verbosity is true, there will be Serial feedback
firstDataPacket = true;

streaming = false;
Expand Down
5 changes: 5 additions & 0 deletions changelog.md
@@ -1,3 +1,8 @@
# v2.0.1

### Bug Fixes
* Bug where softReset message could be scrambled on daisy board.

# v2.0.0-rc.6

### New Features
Expand Down

0 comments on commit 1b2cf7b

Please sign in to comment.