Diff: trms/trms.cpp

Revision:

1:868ff3346841

Parent:

0:e08a063f61c3

Child:

2:f82c6978c589

--- a/trms/trms.cpp	Wed Dec 10 12:53:53 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-#include "trms.h"
-
-#define DEBUG 1
-//Debug is disabled by default
-#if (defined(DEBUG))
-
-#define DBG(x, ...) std::printf("[trms : DBG]"x"\r\n", ##__VA_ARGS__);
-#define WARN(x, ...) std::printf("[trms : WARN]"x"\r\n", ##__VA_ARGS__);
-#define ERR(x, ...) std::printf("[trms : ERR]"x"\r\n", ##__VA_ARGS__);
-#define INFO(x, ...) std::printf("[trms : INFO]"x"\r\n", ##__VA_ARGS__);
-
-#else
-
-#define DBG(x, ...)
-#define WARN(x, ...)
-#define ERR(x, ...)
-#define INFO(x, ...)
-#endif
-
-trms::trms(int adc_Diff_number_chan) : AnalogIn_Diff(adc_Diff_number_chan), vtrms(NSAMPLE,0.0), vmoy(NSAMPLE,0.0)
-{
-    
-
-   test(9);
-   /*
-    _time_min=0;
-    F_timer_min=false;
-    _time_max=0;
-    F_timer_max=false;
-    _min=UAC_NON2;
-    _max=UAC_NON2;
-    gain=GAIN;
-    offset=0.0;
-    _flag=false;
-    DBG("Unon =%0.0fV",UAC_NON);
-    DBG("RAW Umax2 =%d",UAC_MAX2);
-    DBG("RAW Umin2 =%d",UAC_MIN2);
-    DBG("Gain =%f",gain);
-     */
-     
-    DBG("Freq UAC=%dHz",FREQ);
-    DBG("Sample =%d",NSAMPLE);
-    DBG("Sample =%dus",TSAMPLE);
-    
-    
-   
-}
-
-
-
-float trms::read_rms()
-{
-    return (sqrt((float)vtrms.GetAverage())*gain-offset);
-   
-}
-float trms::read_average()
-{
-    return ((float)vmoy.GetAverage()*gain-offset);
-   
-}
-/**
- * @brief Destructor.
- */
-trms::~trms()
-{
-    
-    flipperadc_Diff.detach();
-}
-
-void trms::start()
-{
-    flipperadc_Diff.attach_us<trms>(this,&trms::flipadc_Diff, TSAMPLE);
-}
-
-
-
-void trms::flipadc_Diff()
-{
-
-
-    int16_t  val_i16;
-    uint32_t  val2_ui32;
-    val_i16=read_raws16();
-    vmoy.Insert(val_i16);
-    vtrms.Insert(val_i16*val_i16);
-
-    //val2_ui32=vtrms.GetAverage();
-/*
-    //START
-    if(val2_ui32<UAC_MIN2 && F_timer_min ==false) {
-        DBG("Start timer min %d<%d",val2_ui32,UAC_MIN2);
-        timer_min.start();
-        F_timer_min = true;
-
-    }
-     if(val2_ui32>UAC_MAX2 && F_timer_max ==false) {
-           DBG("Start timer max %d>%d",val2_ui32,UAC_MAX2);
-           timer_max.start();
-           F_timer_max = true;
-
-       }
-    //STOP
-    if(val2_ui32>UAC_MIN2STOP && F_timer_min ==true) {
-        DBG("Stop timer min %d>%d",val2_ui32,UAC_MIN2STOP);
-        timer_min.stop();
-        F_timer_min = false;
-        _flag=true;
-        _flag_min=true;
-    }
-
-        if(val2_ui32<UAC_MAX2STOP && F_timer_max ==true) {
-            DBG("Stop timer max %d<%d",val2_ui32,UAC_MAX2STOP);
-            timer_max.stop();
-            F_timer_max = false;
-            _flag=true;
-            _flag_max=true;
-        }
-    if(timer_min.read_ms()>20 && F_timer_min ==true)  {
-        _time_min=timer_min.read_ms();
-        _min=MIN(val2_ui32,_min);
-        //DBG("RAW min2=%d",_min);
-    }
-    if(timer_max.read_ms()>20 && F_timer_max ==true) {
-        _time_max=timer_max.read_ms();
-        _max=MAX(val2_ui32,_max);
-        //DBG("RAW max2=%d",_max);
-    }
-*/
-}
-
-bool trms::flag (float *rms, uint32_t *time)
-{
-    bool val=_flag;
-/*
-    if(_flag==true) {
-        _flag=false;
-        if(_flag_min==true) {
-            *time=_time_min;
-            timer_min.reset();
-            *rms=(sqrt((float)_min)*gain-offset);
-            _min=UAC_NON2;
-            _flag_min=false;
-        }
-        if(_flag_max==true) {
-            *time=_time_max;
-            timer_max.reset();
-            *rms=(sqrt((float)_max)*gain-offset);
-            _max=UAC_NON2;
-            _flag_max=false;
-        }     
-        
-        DBG("Read rms:%f time:%d",*rms,*time);
-    }
-    */
-    return val;
-}
-
-
-void trms::set_gain(float _gain)
-{  
-    gain=_gain;
-}
-
-void trms::set_offset(float _offset)
-{  
-    offset=_offset;
-}
\ No newline at end of file