Skip to content

Commit

Permalink
Update OscilloscopeModule.cpp
Browse files Browse the repository at this point in the history
  • Loading branch information
mimansamaheshwari authored Mar 6, 2019
1 parent 47f0e10 commit 6841492
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/OscilloscopeModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
#include "Dabble.h"
#include "SPI.h"
#include "OscilloscopeModule.h"
#include "Ade7912_Adc.h"
//#include "Ade7912_Adc.h"

OscilloscopeModule::OscilloscopeModule():ModuleParent(OSCILLOSCOPE_ID)
{
initialize_ade791x();
//initialize_ade791x();
}

void OscilloscopeModule::send_channel_data()
{
int a=readv1();
/*int a=readv1();
int b=readvim();
#ifdef DEBUG
Serial.print("Ch1:");
Expand All @@ -32,11 +32,11 @@ void OscilloscopeModule::send_channel_data()
b=b >> 8;//shift value to teh right, result is 65472d for my DAC
ch_data2[0] = (b & 0xFF) ; //mask LSB, shift 8 bits to the right
Dabble.sendModuleFrame(OSCILLOSCOPE_ID,0,0x02,2,new FunctionArg(2,ch_data1),new FunctionArg(2,ch_data2));
}
*/}

void OscilloscopeModule::send_channel_data(int a,int b)
{
#ifdef DEBUG
/*#ifdef DEBUG
Serial.print("Ch1:");
Serial.println(a);
Serial.print("Ch1:");
Expand All @@ -56,6 +56,6 @@ void OscilloscopeModule::send_channel_data(int a,int b)
b=b >> 8;//shift value to teh right, result is 65472d for my DAC
ch_data2[0] = (b & 0xFF) ; //mask LSB, shift 8 bits to the right
// Dabble.sendModuleFrame(OSCILLOSCOPE_ID,0,0x02,2,new FunctionArg(4,ch_data));
// Dabble.sendModuleFrame(OSCILLOSCOPE_ID,0,0x02,2,new FunctionArg(4,ch_data));*/
}

0 comments on commit 6841492

Please sign in to comment.