Database version changed to last stable, Fix:erase EEPROM

Author: jkandasa

pom.xml

@@ -60,7 +60,7 @@
     <version.org.jboss.resteasy>3.0.11.Final</version.org.jboss.resteasy>
     <version.javax.servlet>2.5</version.javax.servlet>
     <version.com.j256.ormlite>4.48</version.com.j256.ormlite>
-    <version.com.h2database>1.4.185</version.com.h2database>
+    <version.com.h2database>1.3.176</version.com.h2database>
     <version.com.xeiam>2.0.1-SNAPSHOT</version.com.xeiam>
     <version.commons-lang>2.2</version.commons-lang>
     <version.com.luckycatlabs>1.2</version.com.luckycatlabs>

src/main/java/org/mycontroller/standalone/db/alarm/ExecuteAlarm.java

@@ -129,7 +129,7 @@ public void runAlarm(Alarm alarm) throws Exception {
 
     private void alarmTriggerCall(Alarm alarm, boolean triggerAlarm) throws Exception {
         if (triggerAlarm) {
-            if (!alarm.getTriggered()) {
+            if (!alarm.getTriggered() || !alarm.getIgnoreDuplicate()) {
                 switch (AlarmUtils.TYPE.get(alarm.getType())) {
                     case SEND_PAYLOAD:
                         alarmSendPayLoad(alarm);

src/main/java/org/mycontroller/standalone/db/tables/Alarm.java

@@ -54,6 +54,9 @@ public Alarm() {
     @DatabaseField(canBeNull = true)
     private Long lastTrigger;
 
+    @DatabaseField(canBeNull = true, defaultValue = "true")
+    private Boolean ignoreDuplicate;
+
     @DatabaseField(canBeNull = true)
     private Long lastNotification;
 
@@ -309,4 +312,12 @@ public void setEvaluationCount(Integer evaluationCount) {
         this.evaluationCount = evaluationCount;
     }
 
+    public Boolean getIgnoreDuplicate() {
+        return ignoreDuplicate;
+    }
+
+    public void setIgnoreDuplicate(Boolean ignoreDuplicate) {
+        this.ignoreDuplicate = ignoreDuplicate;
+    }
+
 }

src/main/java/org/mycontroller/standalone/mysensors/ProcessRawMessage.java

@@ -388,7 +388,7 @@ private void processFirmwareConfigRequest(RawMessage rawMessage) {
             FirmwareConfigResponse firmwareConfigResponse = new FirmwareConfigResponse();
             firmwareConfigResponse.setByteBufferPosition(0);
 
-            if (bootLoaderCommand) {
+            if (bootLoaderCommand) {//If it is bootloader command
                 if (node.getEraseEEPROM() != null && node.getEraseEEPROM()) {
                     firmwareConfigResponse.loadEraseEepromCommand();
                     node.setEraseEEPROM(false); //Remove erase EEPROM flag and update in to database
@@ -398,7 +398,7 @@ private void processFirmwareConfigRequest(RawMessage rawMessage) {
                             firmwareConfigRequest);
                     return;
                 }
-            } else if (firmware == null) {
+            } else if (firmware == null) {//Non bootloader command
                 if (DaoUtils.getSettingsDao().get(Settings.ENABLE_NOT_AVAILABLE_TO_DEFAULT_FIRMWARE).getValue()
                         .equalsIgnoreCase("true")) {
                     _logger.debug("If requested firmware is not available, redirect to default firmware is set, Checking the default firmware");
@@ -410,12 +410,15 @@ private void processFirmwareConfigRequest(RawMessage rawMessage) {
                         _logger.warn("There is no default firmware set!");
                     }
                 }
+                //Selected, default: No firmware available for this request
+                if (firmware == null) {
+                    _logger.warn("Selected Firmware is not available, FirmwareConfigRequest:[{}]",
+                            firmwareConfigRequest);
+                    return;
+                }
             }
 
-            if (firmware == null) {
-                _logger.warn("Selected Firmware is not available, FirmwareConfigRequest:[{}]", firmwareConfigRequest);
-                return;
-            } else {
+            if (firmware != null) {
                 firmwareConfigResponse.setType(firmware.getType().getId());
                 firmwareConfigResponse.setVersion(firmware.getVersion().getId());
                 firmwareConfigResponse.setBlocks(firmware.getBlocks());

src/main/package/www/controllers/alarm.js

@@ -137,6 +137,7 @@ myControllerModule.controller('AMaddController', function ($scope, $modalInstanc
   $scope.alarm.sensor = {};
   $scope.alarm.sensor.node = {};
   $scope.alarm.sensor.id = sensor.id;
+  $scope.alarm.ignoreDuplicate = true;
   $scope.header = "Add Alarm for '"+sensor.nameWithNode+"'";
   $scope.alarmNotifications = TypesFactory.getAlarmTypes();
   $scope.sensorvalueTypes = TypesFactory.getSensorValueTypes();

src/main/package/www/partials/alarm/addModal.html

@@ -41,6 +41,13 @@ <h4>{{header}}</h4>
       </div>
     </div>
 
+    <div class="form-group">
+      <label class=" control-label col-sm-3 checkbox">Ignore Duplicate</label>
+      <div class="col-sm-6">          
+        <input type="checkbox" ng-model="alarm.ignoreDuplicate">
+      </div>
+    </div>
+    
     <legend></legend>
 
     <div class="form-group">

src/main/package/www/partials/alarm/updateModal.html

@@ -41,6 +41,13 @@ <h4>{{header}}</h4>
       </div>
     </div>
 
+    <div class="form-group">
+      <label class=" control-label col-sm-3 checkbox">Ignore Duplicate</label>
+      <div class="col-sm-6">          
+        <input type="checkbox" ng-model="alarm.ignoreDuplicate">
+      </div>
+    </div>
+    
     <legend></legend>
 
     <div class="form-group">