Updating Logic to add a timer for every second

New timer to support new modules
sm0svx · Feb 2, 2018 · fdf94a6 · fdf94a6
1 parent 380e533
commit fdf94a6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/src/svxlink/svxlink/Logic.cpp b/src/svxlink/svxlink/Logic.cpp
@@ -645,6 +645,11 @@ bool Logic::initialize(void)
   timeoutNextMinute();
   every_minute_timer.start();
 
+  every_second_timer.setExpireOffset(100);
+  every_second_timer.expired.connect(mem_fun(*this, &Logic::everySecond));
+  timeoutNextSecond();
+  every_second_timer.start();
+
   dtmf_digit_handler = new DtmfDigitHandler;
   dtmf_digit_handler->commandComplete.connect(
       mem_fun(*this, &Logic::putCmdOnQueue));
@@ -1484,6 +1489,22 @@ void Logic::everyMinute(AtTimer *t)
   timeoutNextMinute();
 } /* Logic::everyMinute */
 
+void Logic::timeoutNextSecond(void)
+{
+  struct timeval tv;
+  gettimeofday(&tv, NULL);
+  struct tm *tm = localtime(&tv.tv_sec);
+  tm->tm_min += 0;
+  tm->tm_sec += 1;
+  every_second_timer.setTimeout(*tm);
+} /* Logic::timeoutNextSecond */
+
+
+void Logic::everySecond(AtTimer *t)
+{
+  processEvent("every_second");
+  timeoutNextSecond();
+} /* Logic::everySecond */
 
 void Logic::dtmfDigitDetectedP(char digit, int duration)
 {

diff --git a/src/svxlink/svxlink/Logic.h b/src/svxlink/svxlink/Logic.h
@@ -253,6 +253,7 @@ class Logic : public LogicBase
     Async::AudioSplitter	    *logic_con_in;
     CmdParser 	      	      	    cmd_parser;
     Async::AtTimer      	    every_minute_timer;
+    Async::AtTimer      	    every_second_timer;
     Async::AudioRecorder  	    *recorder;
     Async::AudioMixer	      	    *tx_audio_mixer;
     Async::AudioAmp   	      	    *fx_gain_ctrl;
@@ -291,7 +292,9 @@ class Logic : public LogicBase
     void putCmdOnQueue(void);
     void sendRgrSound(void);
     void timeoutNextMinute(void);
+	void timeoutNextSecond(void);
     void everyMinute(Async::AtTimer *t);
+	void everySecond(Async::AtTimer *t);
     void checkIfOnlineCmd(void);
     void dtmfDigitDetectedP(char digit, int duration);
     void cleanup(void);