Merge pull request #1471 from nfi/fix-duplicate-branches

Fix duplicate branches
contiki-ng · Nov 20, 2024 · 4586a9a · 4586a9a
2 parents 2b9b0bf + a23f95e
commit 4586a9a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/java/org/contikios/mrm/MRM.java b/java/org/contikios/mrm/MRM.java
@@ -191,13 +191,9 @@ public Radio getToRadio() {
              * When this is implemented, also implement
              * RadioConnection.java:getReceptionStartTime()
              */
-
-            /* Was interfered: keep interfering */
-            newConnection.addInterfered(recv, recvSignalStrength);
-          } else {
-            /* Was interfered: keep interfering */
-            newConnection.addInterfered(recv, recvSignalStrength);
           }
+          /* Was interfered: keep interfering */
+          newConnection.addInterfered(recv, recvSignalStrength);
         } else if (recv.isTransmitting()) {
           newConnection.addInterfered(recv, recvSignalStrength);
         } else if (recv.isReceiving()) {

diff --git a/java/se/sics/mspsim/chip/CC1120.java b/java/se/sics/mspsim/chip/CC1120.java
@@ -383,10 +383,8 @@ public void execute(long t) {
                                 settling = (settling >> 3) & 0b11; /* bit 4:3 */
                                 if (settling == 0) {
                                         stateDelay = 0.20;
-                                } else if (settling == 1) {
-                                        stateDelay = 0.50;
                                 } else {
-                                        /* not implemented: assuming calibration */
+                                        /* Only settling = 1 is implemented. Assume calibration otherwise. */
                                         stateDelay = 0.50;
                                 }
                                 cpu.scheduleTimeEventMillis(goToRX, stateDelay);