Bytesize and datastatus bugfix, added function members

firmware/drivers/ad7124_4/ad7124_4.cpp

@@ -12,13 +12,13 @@ Ad7124_4::Ad7124_4(unsigned nCS, const SPISettings* spisettings): ncs_(nCS), spi
 
 /*Selection Function Members*/
 //Pull nCS low
-void Ad7124_4::select()
+void Ad7124_4::select_()
 {
     digitalWrite(ncs_, LOW);
 }
 
 //Pull nCS high
-void Ad7124_4::deselect()
+void Ad7124_4::deselect_()
 {
     digitalWrite(ncs_, HIGH);
 }
@@ -29,15 +29,18 @@ template<class T>
 void Ad7124_4::write_register(uint8_t reg, T data){
     SPIwrite_(data, reg);
     //detect and track writes to ADC_CONTROL_DATA_STATUS bit
-    datastatus_ = ((reg == REG_ADC_CONTROL) && ((data & ADC_CONTROL_DATA_STATUS) != 0));
+    if(reg == REG_ADC_CONTROL){
+        datastatus_ = ((data & ADC_CONTROL_DATA_STATUS) != 0);
+    }
+    //datastatus_ = ((reg == REG_ADC_CONTROL) && ((data & ADC_CONTROL_DATA_STATUS) != 0));
 }
 
 uint32_t Ad7124_4::read_register(uint8_t reg, uint8_t num_bytes){
-    if(num_bytes == 8){
+    if(num_bytes == 1){
         SPIread_(buf8_, reg, num_bytes);
         return static_cast<uint8_t>(buf8_);
     }
-    else if(num_bytes == 16){
+    else if(num_bytes == 2){
         SPIread_(buf16_, reg, num_bytes);
         return static_cast<uint32_t>(buf16_);
     }
@@ -70,6 +73,10 @@ uint32_t Ad7124_4::get_error(){
     return buf32_ & 0x00FFFFFF_u32;
 }
 
+bool Ad7124_4::data_status(){
+    return datastatus_;
+}
+
 void Ad7124_4::reset(){
     SPI.beginTransaction(*spisettings_);
     for(unsigned i = 0; i < 8; ++i){
@@ -111,6 +118,10 @@ void Ad7124_4::SPIread_(T& data, uint8_t reg, uint8_t readlen)
     }
 }
 
+unsigned Ad7124_4::get_ncs_(){
+    return ncs_;
+}
+
 //explicit instantiations
 
 template void Ad7124_4::write_register<uint8_t>(uint8_t reg, uint8_t data);

firmware/drivers/ad7124_4/ad7124_4.hpp

@@ -3,6 +3,7 @@
 #include <ad7124_registers.hpp>
 #include <SPI.h>
 
+
 class Ad7124_4
 {
 public:
@@ -11,13 +12,6 @@ public:
     Ad7124_4(const Ad7124_4&)=delete;
     ~Ad7124_4()=default;
 
-/*Selection Function Members*/
-    //Pull nCS low
-    void select();
-
-    //Pull nCS high
-    void deselect();
-
 /*Communication Function Members*/
     //T must be either uint8_t, uint16_t or uint32_t
     template<class T>
@@ -28,12 +22,17 @@ public:
 /*Operation Function Members*/
     bool data_available();
     bool check_error();
+    bool data_status();
     
     uint32_t get_data();
     uint32_t get_error();
 
     void reset();
 
+
+/*Friends*/
+    friend class Spi_selecta;
+
 private:
 /*Private Function Members*/
     //T must be either uint8_t, uint16_t or uint32_t
@@ -45,6 +44,17 @@ private:
     template <class T>
     void SPIread_(T& data, uint8_t reg, uint8_t readlen);
 
+/*Selection Function Members*/
+    //Pull nCS low
+    void select_();
+
+    //Pull nCS high
+    void deselect_();
+
+    //Get nCS
+    unsigned get_ncs_();
+
+
 /*Private Data Members*/
     const unsigned ncs_;
     const SPISettings* spisettings_;