More resilient communication, more different modes, fixed filter selection bug

firmware/noise_sampling/noise_sampling.ino

 #include <SPI.h>
 #include <algorithm> //std::min
 
+#define SPIRATE 84000000/32
+//#define SPIRATE 84000000/128
+
 #define nCS 46
 
 
@@ -19,7 +22,7 @@
 
 //REG_STATUS BITS
 //REG_ADC_CONTROL BITS
-#define POWER_MODE_FULLPOWER 0b0000000010000000
+#define POWER_MODE_FULLPOWER 0b0000000011000000
 #define CLK_SEL_INTERNALANDPIN 0b0000000000000001
 #define REF_EN 0b0000000100000000
 //REG_DATA BITS
@@ -28,11 +31,16 @@
 //REG_CONFIG_0 BITS
 #define CONFIG_SETTING 0b0000000111110000
 //REG_FILTER_0 BITS
-#define FILTER_SETTING 0b000000000000011111111111
+#define FILTER_SETTING_2047 0b000000000000011111111111
+#define FILTER_SETTING_120 0b000000000000000001111000
+#define FILTER_SETTING_15 0b000000000000000000001111
+#define FILTER_SETTING_8 0b000000000000000000001000
+#define FILTER_SETTING_4 0b000000000000000000000100
+#define FILTER_SETTING_1 0b000000000000000000000001
 
 
 void reset_comm(){
-  SPI.beginTransaction(SPISettings(84000000/128, MSBFIRST, SPI_MODE3));
+  SPI.beginTransaction(SPISettings(SPIRATE, MSBFIRST, SPI_MODE3));
   for(unsigned i = 0; i < 8; ++i){
     SPI.transfer(0xFF);
   }
@@ -50,7 +58,7 @@ void SPIwrite(T data, uint8_t reg){
     wrbuf[num_bytes-i] = data & 0xFF;
     data >>= 8;
   }
-  SPI.beginTransaction(SPISettings(84000000/128, MSBFIRST, SPI_MODE3));
+  SPI.beginTransaction(SPISettings(SPIRATE, MSBFIRST, SPI_MODE3));
   SPI.transfer(wrbuf, num_bytes+1);
   SPI.endTransaction();
 }
@@ -62,7 +70,7 @@ void SPIread(T& data, uint8_t reg){
   //set up write command
   rdbuf[0] = reg | REG_READ;
   uint8_t num_bytes = std::min(sizeof(data), 3u);
-  SPI.beginTransaction(SPISettings(84000000/128, MSBFIRST, SPI_MODE3));
+  SPI.beginTransaction(SPISettings(SPIRATE, MSBFIRST, SPI_MODE3));
   SPI.transfer(rdbuf, num_bytes+1);
   SPI.endTransaction();
   for(unsigned i = 1; i <= num_bytes; ++i){
@@ -79,8 +87,8 @@ void setup_adc(){
   data16 = CONFIG_SETTING;
   SPIwrite(data16, REG_CONFIG_0);
   //FILTER
-  data16 = FILTER_SETTING;
-  SPIwrite(data16, REG_FILTER_0);
+  uint32_t data32 = FILTER_SETTING_2047;
+  SPIwrite(data32, REG_FILTER_0);
   //CHANNEL
   data16 = CHANNEL_SETTING;
   SPIwrite(data16, REG_CHANNEL_0);
@@ -89,7 +97,7 @@ void setup_adc(){
 bool data_ready(){
   uint8_t status;
   SPIread(status, REG_STATUS);
-  return !(status>>8);
+  return !(status>>7);
 }
 
 uint32_t get_data(){
@@ -113,7 +121,9 @@ double temperature(double R){
 }
 
 void setup() {
-  Serial.begin(9600);
+  //Serial.begin(9600);
+  //Serial.begin(460800);
+  Serial.begin(128000);
   digitalWrite(nCS, HIGH);
   pinMode(nCS, OUTPUT);
   SPI.begin();
@@ -123,7 +133,6 @@ void setup() {
   digitalWrite(nCS, LOW);
   setup_adc();
   digitalWrite(nCS, HIGH);
-
 }
 
 void loop() {
@@ -136,12 +145,18 @@ void loop() {
   uint32_t adc_data;
   if(data_ready()){
     adc_data = get_data();
-    uint8_t buf[3];
+    uint8_t buf[6];
     buf[0] = uint8_t(adc_data & 0x000000FF);
     buf[1] = uint8_t((adc_data>>8) & 0x000000FF);
     buf[2] = uint8_t((adc_data>>16) & 0x000000FF);
-    Serial.write(buf, 3);
-    Serial.flush();
+    buf[3] = uint8_t(0x0a);
+    buf[4] = uint8_t(0x0a);
+    buf[5] = uint8_t(0x0a);
+    Serial.write(buf, 6);
+    //Serial.write('\n');
+    //Serial.write('\n');
+    //Serial.write('\n');
+    //Serial.flush();
     /*
     Serial.print("Data: \t");
     Serial.print(adc_data, HEX);