wellton/OpenBCI_32bit_Library
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Fix numerous examples

Ver Código-Fonte
Esse commit está contido em:
AJ Keller
2017-07-05 16:09:17 -04:00
pai f9a3532319
commit 1d658784d7
13 arquivos alterados com 107 adições e 56 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
OpenBCI_32bit_Library.cpp
+17 -41
Ver Arquivo
@@ -385,7 +385,6 @@ boolean OpenBCI_32bit_Library::processChar(char character) {
settingSampleRate = true;
break;
#ifdef USE_WIFI
case OPENBCI_WIFI_ATTACH:
if (wifi.attach()) {
printSuccess();
@@ -421,7 +420,6 @@ boolean OpenBCI_32bit_Library::processChar(char character) {
printSerial("Wifi soft reset");
sendEOT();
break;
#endif
default:
return false;
}
@@ -471,14 +469,12 @@ void OpenBCI_32bit_Library::accelWriteAxisDataSerial(void) {
LIS3DH_writeAxisDataSerial();
}
#ifdef USE_WIFI
/**
* @description Reads from the accelerometer to get new X, Y, and Z data.
*/
void OpenBCI_32bit_Library::accelWriteAxisDataWifi(void) {
LIS3DH_writeAxisDataWifi();
}
#endif
/**
* @description: This is a function that is called once and confiures all pins on
@@ -602,9 +598,7 @@ void OpenBCI_32bit_Library::boardReset(void) {
Serial0.println("Firmware: v3.0.0");
sendEOT();
delay(5);
#ifdef USE_WIFI
wifi.reset();
#endif
}
/**
@@ -613,9 +607,7 @@ void OpenBCI_32bit_Library::boardReset(void) {
*/
void OpenBCI_32bit_Library::sendEOT(void) {
printSerial("$$$");
#ifdef USE_WIFI
wifi.sendStringLast();
#endif
}
void OpenBCI_32bit_Library::activateAllChannelsToTestCondition(byte testInputCode, byte amplitudeCode, byte freqCode)
@@ -689,13 +681,13 @@ void OpenBCI_32bit_Library::setBoardMode(uint8_t newBoardMode) {
pinMode(11, INPUT);
pinMode(12, INPUT);
pinMode(17, INPUT);
#ifdef USE_WIFI
// #if USE_WIFI
if (!wifi.present) pinMode(13, INPUT);
if (!wifi.present) pinMode(18, INPUT);
#else
pinMode(13, INPUT);
pinMode(18, INPUT);
#endif
// #else
// pinMode(13, INPUT);
// pinMode(18, INPUT);
// #endif
break;
case BOARD_MODE_DEBUG:
curAccelMode = ACCEL_MODE_ON;
@@ -977,10 +969,6 @@ void OpenBCI_32bit_Library::initialize(){
pinMode(DAISY_ADS, OUTPUT); digitalWrite(DAISY_ADS,HIGH);
pinMode(LIS3DH_SS,OUTPUT); digitalWrite(LIS3DH_SS,HIGH);
#ifdef USE_WIFI
wifi.begin();
#endif
spi.begin();
spi.setSpeed(4000000); // use 4MHz for ADS and LIS3DH
spi.setMode(DSPI_MODE0); // default to SD card mode!
@@ -1062,12 +1050,10 @@ void OpenBCI_32bit_Library::sendChannelData() {
* Adds stop byte `OPENBCI_EOP_STND_ACCEL`. See `OpenBCI_32bit_Library_Definitions.h`
*/
void OpenBCI_32bit_Library::sendChannelData(PACKET_TYPE packetType) {
#ifdef USE_WIFI
if (wifi.tx) {
sendChannelDataWifi(packetType, false);
if (daisyPresent) sendChannelDataWifi(packetType, true);
}
#endif
// Send over bluetooth
if (iSerial0.tx || iSerial1.tx) sendChannelDataSerial(packetType);
@@ -1116,7 +1102,6 @@ void OpenBCI_32bit_Library::sendChannelDataSerial(PACKET_TYPE packetType) {
writeSerial((uint8_t)(PCKT_END | packetType)); // 1 byte
}
#ifdef USE_WIFI
/**
* @description Writes channel data to wifi in the correct stream packet format.
* @param `packetType` {PACKET_TYPE} - The type of packet to send
@@ -1163,7 +1148,6 @@ void OpenBCI_32bit_Library::sendChannelDataWifi(PACKET_TYPE packetType, boolean
void OpenBCI_32bit_Library::sendRawAuxWifi(void) {
writeAuxDataWifi(); // 6 bytes
}
#endif
/**
* @description Writes channel data, `axisData` array, and 4 byte unsigned time
@@ -1213,7 +1197,6 @@ void OpenBCI_32bit_Library::sendTimeWithAccelSerial(void) {
* Else if `sendTimeSyncUpPacket` is `false` then:
* Adds stop byte `OPENBCI_EOP_ACCEL_TIME_SYNCED`
*/
#ifdef USE_WIFI
void OpenBCI_32bit_Library::sendTimeWithAccelWifi(void) {
// send two bytes of either accel data or blank
switch (sampleCounter % 10) {
@@ -1233,7 +1216,6 @@ void OpenBCI_32bit_Library::sendTimeWithAccelWifi(void) {
}
writeTimeCurrentWifi(lastSampleTime); // 4 bytes
}
#endif
/**
* Using publically available state variables to drive packet type settings
@@ -1275,7 +1257,6 @@ void OpenBCI_32bit_Library::writeAuxDataSerial(void){
}
}
#ifdef USE_WIFI
/**
* @description Writes channel data, `auxData[0]` 2 bytes, and 4 byte unsigned
* time stamp in ms to serial port in the correct stream packet format.
@@ -1292,7 +1273,6 @@ void OpenBCI_32bit_Library::writeAuxDataWifi(void){
wifi.storeByteBufTx((uint8_t)lowByte(auxData[i])); // axisData is array of type short (16bit)
}
}
#endif
void OpenBCI_32bit_Library::zeroAuxData(void) {
for(int i = 0; i < 3; i++){
@@ -1314,15 +1294,12 @@ void OpenBCI_32bit_Library::writeTimeCurrentSerial(uint32_t newTime) {
}
}
#ifdef USE_WIFI
void OpenBCI_32bit_Library::writeTimeCurrentWifi(uint32_t newTime) {
// serialize the number, placing the MSB in lower packets
for (int j = 3; j >= 0; j--) {
wifi.storeByts
eBufTx((uint8_t)(newTime >> (j*8)));
wifi.storeByteBufTx((uint8_t)(newTime >> (j*8)));
}
}
#endif
//SPI communication method
byte OpenBCI_32bit_Library::xfer(byte _data)
@@ -1596,15 +1573,14 @@ void OpenBCI_32bit_Library::streamSafeSetAllChannelsToDefault(void) {
*/
void OpenBCI_32bit_Library::streamStart(){ // needs daisy functionality
#ifdef USE_WIFI
if (wifi.tx) {
uint8_t gains[numChannels];
for (uint8_t i = 0; i < numChannels; i++) {
gains[i] = channelSettings[i][GAIN_SET];
}
// TODO: Remove this debug line
wifi.sendGains(numChannels, gains);
}
#endif
streaming = true;
startADS();
if (curBoardMode == BOARD_MODE_DEBUG) {
@@ -2711,7 +2687,7 @@ void OpenBCI_32bit_Library::ADS_writeChannelData() {
ADS_writeChannelDataNoAvgDaisy();
}
#ifdef USE_WIFI
// #ifdef USE_WIFI
void OpenBCI_32bit_Library::ADS_writeChannelDataWifi(boolean daisy) {
if (daisy) {
// Send daisy
@@ -2725,7 +2701,7 @@ void OpenBCI_32bit_Library::ADS_writeChannelDataWifi(boolean daisy) {
}
}
}
#endif
// #endif
void OpenBCI_32bit_Library::ADS_writeChannelDataAvgDaisy() {
if (iSerial0.tx || (iSerial1.tx && iSerial1.baudRate <= OPENBCI_BAUD_RATE_MIN_NO_AVG)) {
if (daisyPresent) {
@@ -3032,7 +3008,7 @@ void OpenBCI_32bit_Library::LIS3DH_writeAxisDataForAxisSerial(uint8_t axis) {
writeSerial(lowByte(axisData[axis])); // axisData is array of type short (16bit)
}
#ifdef USE_WIFI
// #ifdef USE_WIFI
void OpenBCI_32bit_Library::LIS3DH_writeAxisDataWifi(void){
for(int i = 0; i < 3; i++){
wifi.storeByteBufTx(highByte(axisData[i])); // write 16 bit axis data MSB first
@@ -3044,7 +3020,7 @@ void OpenBCI_32bit_Library::LIS3DH_writeAxisDataForAxisWifi(uint8_t axis) {
wifi.storeByteBufTx(highByte(axisData[axis])); // write 16 bit axis data MSB first
wifi.storeByteBufTx(lowByte(axisData[axis])); // axisData is array of type short (16bit)
}
#endif
// #endif
void OpenBCI_32bit_Library::LIS3DH_zeroAxisData(void){
for(int i = 0; i < 3; i++){
@@ -3205,16 +3181,16 @@ void OpenBCI_32bit_Library::printSuccess() {
void OpenBCI_32bit_Library::printAll(const char *arr) {
printSerial(arr);
#ifdef USE_WIFI
wifiSendStringMulti(arr);
#endif
// #ifdef USE_WIFI
wifi.sendStringMulti(arr);
// #endif
}
void OpenBCI_32bit_Library::printlnAll(const char *arr) {
printlnSerial(arr);
#ifdef USE_WIFI
wifiSendStringLast(arr);
#endif
// #ifdef USE_WIFI
wifi.sendStringLast(arr);
// #endif
}
/**
OpenBCI_32bit_Library.h
+4 -2
Ver Arquivo
@@ -8,6 +8,8 @@ insert header here
#include <DSPI.h>
#include <Arduino.h>
#include <OpenBCI_Wifi_Master.h>
#include <OpenBCI_Wifi_Master_Definitions.h>
#include "OpenBCI_32bit_Library_Definitions.h"
void __USER_ISR ADS_DRDY_Service(void);
@@ -223,12 +225,12 @@ public:
// Class Objects
DSPI0 spi; // use DSPI library
#ifdef __OpenBCI_Wifi_Master__
// #ifdef __OpenBCI_Wifi_Master__
void accelWriteAxisDataWifi(void);
void ADS_writeChannelDataWifi(boolean daisy);
void writeAuxDataWifi(void);
void writeTimeCurrentWifi(uint32_t newTime);
#endif
// #endif
private:
changelog.md
+27
Ver Arquivo
@@ -47,6 +47,33 @@
* Removed public `timeSynced` and private `sendTimeSyncUpPacket`
* Setting internal test signal now, when not streaming, returns a success message, with EOT `$$$`
## Beta3
The overall goal was to clean the wifi code out of the library so it would not be needed when you are building a bare board.
### Bug Fixes
* Fixed the `BoardWithAnalogSensor.ino`, `BoardWithDigitalRead.ino` and `BoardWithCustomData.ino` examples.
### Breaking Changes
* Removed all wifi code and put into [new library](https://github.com/OpenBCI/OpenBCI_Wifi_Master_Library) that must be included! The new library is a called [OpenBCI_Wifi_Master_Library](https://github.com/OpenBCI/OpenBCI_Wifi_Master_Library). It is simply included when wifi is wanted.
* Removed `.loop()` function from library.
### Files
* Add `BoardWithWifi.ino` example that shows a bare board with just wifi. No SD or ACCEL for example.
## Beta2
### Breaking Changes
* Setting internal test signal now, when not streaming, returns a success message, with EOT $$$
## Beta1
* Initial Release
# v2.0.1
### Bug Fixes
examples/BoardNoAccelSDWifi/BoardNoAccelSDWifi.ino
-1
Ver Arquivo
@@ -10,7 +10,6 @@ void setup() {
}
void loop() {
board.loop();
if (board.streaming) {
if (board.channelDataAvailable) {
// Read from the ADS(s), store data, set channelDataAvailable flag to false
examples/BoardNoAccelSDWifiDebug/BoardNoAccelSDWifiDebug.ino
-1
Ver Arquivo
@@ -10,7 +10,6 @@ void setup() {
}
void loop() {
board.loop();
if (board.streaming) {
if (board.channelDataAvailable) {
// Read from the ADS(s), store data, set channelDataAvailable flag to false
examples/BoardWith2ButtonExternalTriggers/BoardWith2ButtonExternalTriggers.ino
-1
Ver Arquivo
@@ -37,7 +37,6 @@ void setup() {
}
void loop() {
board.loop();
if (board.streaming) {
if (board.channelDataAvailable) {
// Read from the ADS(s), store data, set channelDataAvailable flag to false
examples/BoardWithAccel/BoardWithAccel.ino
-1
Ver Arquivo
@@ -11,7 +11,6 @@ void setup() {
}
void loop() {
board.loop();
// The main dependency of this single threaded microcontroller is to
// stream data from the ADS.
if (board.streaming) {
examples/BoardWithAnalogSensor/BoardWithAnalogSensor.ino
+1 -2
Ver Arquivo
@@ -14,11 +14,10 @@ void setup() {
// Aux 1:2 D11 (A5)
// Aux 3:4 D12 (A6)
// Aux 5:6 D17 (A7)
board.setBoardMode(BOARD_MODE_ANALOG);
board.setBoardMode(board.BOARD_MODE_ANALOG);
}
void loop() {
board.loop();
// The main dependency of this single threaded microcontroller is to
// stream data from the ADS.
if (board.streaming) {
examples/BoardWithCustomData/BoardWithCustomData.ino
+1 -2
Ver Arquivo
@@ -17,7 +17,6 @@ void setup() {
}
void loop() {
board.loop();
// Downsample
if ((millis() - timer) > 10) {
// Save new time
@@ -49,7 +48,7 @@ void sendLEDStatus() {
Serial0.write(LEDState); // 1 byte
// Fill the rest with fake data
for (int i = 0; i < 30; i++) {
Serial0.write(0x00);
Serial0.write((uint8_t)0x00);
}
// Send a stop byte with an `B` or `1011` in the last nibble to indicate a
// different packet type.
examples/BoardWithDigitalRead/BoardWithDigitalRead.ino
+1 -2
Ver Arquivo
@@ -12,11 +12,10 @@ void setup() {
// Aux 1:2 D11
// Aux 3:4 D12
// Aux 5:6 D17
board.setBoardMode(BOARD_MODE_DIGITAL);
board.setBoardMode(board.BOARD_MODE_DIGITAL);
}
void loop() {
board.loop();
// The main dependency of this single threaded microcontroller is to
// stream data from the ADS.
if (board.streaming) {
examples/BoardWithPulseSensor/BoardWithPulseSensor.ino
-1
Ver Arquivo
@@ -46,7 +46,6 @@ void setup() {
}
void loop() {
board.loop();
// The main dependency of this single threaded microcontroller is to
// stream data from the ADS.
if (board.streaming) {
examples/BoardWithWifi/BoardWithWifi.ino
+50
Ver Arquivo
@@ -0,0 +1,50 @@
#include <DSPI.h>
#include <EEPROM.h>
#include <OpenBCI_Wifi_Master_Definitions.h>
#include <OpenBCI_Wifi_Master.h>
#include <OpenBCI_32bit_Library.h>
#include <OpenBCI_32bit_Library_Definitions.h>
void setup() {
// Bring up the OpenBCI Board
board.begin();
// Bring up wifi with rx/tx both true
wifi.begin(true, true);
}
void loop() {
if (board.streaming) {
if (board.channelDataAvailable) {
// Read from the ADS(s), store data, set channelDataAvailable flag to false
board.updateChannelData();
// Send the channel data
board.sendChannelData();
}
}
// Call to wifi loop
wifi.loop();
// Check serial 0 for new data
if (board.hasDataSerial0()) {
// Read one char from the serial 0 port
char newChar = board.getCharSerial0();
// Send to the sd library for processing
sdProcessChar(newChar);
// Send to the board library
board.processChar(newChar);
}
if (wifi.hasData()) {
// Read one char from the wifi shield
char newChar = wifi.getChar();
// Send to the sd library for processing
sdProcessChar(newChar);
// Send to the board library
board.processChar(newChar);
}
}
examples/DefaultBoard/DefaultBoard.ino
+6 -2
Ver Arquivo
@@ -1,4 +1,3 @@
#define USE_WIFI
#include <DSPI.h>
#include <OBCI32_SD.h>
#include <EEPROM.h>
@@ -15,10 +14,11 @@ boolean SDfileOpen = false; // Set true by SD_Card_Stuff.ino on successful file
void setup() {
// Bring up the OpenBCI Board
board.begin();
// Bring up wifi
wifi.begin(true, true);
}
void loop() {
wifi.loop();
if (board.streaming) {
if (board.channelDataAvailable) {
// Read from the ADS(s), store data, set channelDataAvailable flag to false
@@ -47,6 +47,10 @@ void loop() {
board.sendChannelData();
}
}
// Call to wifi loop
wifi.loop();
// Check serial 0 for new data
if (board.hasDataSerial0()) {
// Read one char from the serial 0 port