Update interference status after channel hops and finished receptions

contiki-ng · Jan 14, 2024 · 7241e57 · 7241e57
1 parent fdb7091
commit 7241e57
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/java/org/contikios/cooja/contikimote/interfaces/ContikiRadio.java b/java/org/contikios/cooja/contikimote/interfaces/ContikiRadio.java
@@ -323,8 +323,9 @@ public void doActionsAfterTick() {
     var currentChannel = getChannel();
     if (currentChannel != oldRadioChannel) {
       oldRadioChannel = currentChannel;
-      lastEvent = RadioEvent.UNKNOWN;
-      radioEventTriggers.trigger(RadioEvent.UNKNOWN, this);
+      isInterfered = false;
+      lastEvent = RadioEvent.CHANNEL_HOP;
+      radioEventTriggers.trigger(RadioEvent.CHANNEL_HOP, this);
     }
 
     /* Ongoing transmission */

diff --git a/java/org/contikios/cooja/interfaces/Radio.java b/java/org/contikios/cooja/interfaces/Radio.java
@@ -58,7 +58,7 @@ public abstract class Radio implements MoteInterface {
    * Events that radios should notify observers about.
    */
   public enum RadioEvent {
-    UNKNOWN, HW_OFF, HW_ON,
+    UNKNOWN, HW_OFF, HW_ON, CHANNEL_HOP,
     RECEPTION_STARTED, RECEPTION_FINISHED, RECEPTION_INTERFERED,
     TRANSMISSION_STARTED, TRANSMISSION_FINISHED,
     PACKET_TRANSMITTED, CUSTOM_DATA_TRANSMITTED

diff --git a/java/org/contikios/cooja/radiomediums/AbstractRadioMedium.java b/java/org/contikios/cooja/radiomediums/AbstractRadioMedium.java
@@ -108,9 +108,19 @@ public AbstractRadioMedium(Simulation simulation) {
       switch (event) {
         case RECEPTION_STARTED:
         case RECEPTION_INTERFERED:
-        case RECEPTION_FINISHED:
           break;
-
+        case RECEPTION_FINISHED:
+        case CHANNEL_HOP: {
+          /* in such cases the radio reverts to "not interfered */
+          for (RadioConnection conn : getActiveConnections()) {
+            if (conn.isInterfered(radio)
+                && (conn.getSource().getChannel() == radio.getChannel())) {
+              /* continue interfering due to transmission on radio's channel */
+              radio.interfereAnyReception();
+            }
+          }
+        }
+        break;
         case UNKNOWN:
         case HW_ON: {
           updateSignalStrengths();