From 6841492866c9447af42ecfaa013c2d65bffbec3c Mon Sep 17 00:00:00 2001 From: mimansamaheshwari Date: Wed, 6 Mar 2019 16:35:24 +0530 Subject: [PATCH] Update OscilloscopeModule.cpp --- src/OscilloscopeModule.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/OscilloscopeModule.cpp b/src/OscilloscopeModule.cpp index b71fd15..1fcac27 100644 --- a/src/OscilloscopeModule.cpp +++ b/src/OscilloscopeModule.cpp @@ -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:"); @@ -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:"); @@ -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));*/ }