new configuration version and some bugs solved

r-map · Feb 25, 2022 · 2a12a11 · 2a12a11
1 parent a715b2f
commit 2a12a11
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/platformio/stima_v3/i2c-rain/src/i2c-rain-config.h b/platformio/stima_v3/i2c-rain/src/i2c-rain-config.h
@@ -44,7 +44,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \def MODULE_CONFIGURATION_VERSION
 \brief Module version of compatibile configuration. If you change it, you have to reconfigure.
 */
-#define MODULE_CONFIGURATION_VERSION                  (1)
+#define MODULE_CONFIGURATION_VERSION                  (2)
 
 /*!
 \def MODULE_TYPE

diff --git a/platformio/stima_v3/i2c-rain/src/i2c-rain.h b/platformio/stima_v3/i2c-rain/src/i2c-rain.h
@@ -221,6 +221,18 @@ bool is_start;
 */
 bool is_stop;
 
+/*!
+\var is_test
+\brief Execute stop command in test mode.
+*/
+bool is_test;
+
+/*!
+\var is_started
+\brief Start command is active and measure is active.
+*/
+bool is_started;
+
 /*!
 \var rain_tips_event_occurred_time_ms
 \brief System time (in millisecond) when rain tips occured.

diff --git a/platformio/stima_v3/i2c-rain/src/i2c-rain.ino b/platformio/stima_v3/i2c-rain/src/i2c-rain.ino
@@ -482,7 +482,7 @@ void tipping_bucket_task () {
 
       case TIPPING_BUCKET_READ:
          // increment rain tips if oneshot mode is on and oneshot start command It has been received
-         if (configuration.is_oneshot && is_start) {
+         if (configuration.is_oneshot && is_started) {
 	   // re-read pin status to filter spikes
 	   if (digitalRead(TIPPING_BUCKET_PIN) == LOW)  {
 	     rain.tips_count++;
@@ -584,20 +584,17 @@ void command_task() {
     LOGN(F("Execute [ %s ]"), "TEST READ");
     is_start = false;
     is_stop = true;
+    is_test = true;
     break;
 
   case I2C_RAIN_COMMAND_SAVE:
     LOGN(F("Execute [ %s ]"), "SAVE");
     save_configuration(CONFIGURATION_CURRENT);
     init_wire();
-    is_start = false;
-    is_stop = false;
     break;
 
   default:
     LOGE(F("Command UNKNOWN"));
-    is_start = false;
-    is_stop = false;
   }
 
   commands();
@@ -619,19 +616,25 @@ void commands() {
        readable_data_write_ptr->rain.tips_count = rain.tips_count;
        readable_data_write_ptr->rain.rain = rain.rain;
        exchange_buffers();
+       if (! is_test) is_started=false;
      }
 
      if (is_start) {
        reset_buffers();
+       is_started=true;
      }
 
    } else {
 
      LOGE(F("Continous mode not supported!"));
 
    }
-
+   
    interrupts();
+   is_start = false;
+   is_stop = false;
+   is_test = false;
+
    LOGN(F("Total tips : %d"), readable_data_read_ptr->rain.tips_count);
    LOGN(F("Total rain : %d"), readable_data_read_ptr->rain.rain);
 }