From ed0154b320c65bfa8732c45f69b0f3b9afa52f1c Mon Sep 17 00:00:00 2001 From: biomurph Date: Thu, 5 Jan 2017 17:23:58 -0500 Subject: [PATCH 1/2] Clean up verbose output for readability moved a ADS configuration command out of the way of serial verbosity --- OpenBCI_32bit_Library.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OpenBCI_32bit_Library.cpp b/OpenBCI_32bit_Library.cpp index afd2f72..6b74afc 100644 --- a/OpenBCI_32bit_Library.cpp +++ b/OpenBCI_32bit_Library.cpp @@ -499,9 +499,8 @@ 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); @@ -1068,6 +1067,7 @@ void OpenBCI_32bit_Library::csHigh(int SS) void OpenBCI_32bit_Library::initialize_ads(){ + verbosity = false; // when verbosity is true, there will be Serial feedback // recommended power up sequence requiers >Tpor (~32mS) delay(50); pinMode(ADS_RST,OUTPUT); @@ -1116,7 +1116,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; From a0e0b7235f5539901193f474af69f67ed251a793 Mon Sep 17 00:00:00 2001 From: AJ Keller Date: Thu, 5 Jan 2017 18:42:50 -0500 Subject: [PATCH 2/2] Update firmware version number and move verbosity to initalizeVariables --- OpenBCI_32bit_Library.cpp | 9 ++++----- changelog.md | 5 +++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/OpenBCI_32bit_Library.cpp b/OpenBCI_32bit_Library.cpp index 6b74afc..a446db3 100644 --- a/OpenBCI_32bit_Library.cpp +++ b/OpenBCI_32bit_Library.cpp @@ -506,7 +506,7 @@ void OpenBCI_32bit_Library::boardReset(void) { 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(); } @@ -796,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(){ @@ -1065,17 +1066,15 @@ void OpenBCI_32bit_Library::csHigh(int SS) // ************************************************************************************* // <<<<<<<<<<<<<<<<<<<<<<<<<<<<<< ADS1299 FUNCTIONS >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - void OpenBCI_32bit_Library::initialize_ads(){ - verbosity = false; // when verbosity is true, there will be Serial feedback -// 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 diff --git a/changelog.md b/changelog.md index 077a31c..c5f5136 100644 --- a/changelog.md +++ b/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