Skip to content

RadioMediums: Keep interference status up to date #1313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kkrentz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RadioMediums: Keep interference status up to date #1313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions java/org/contikios/cooja/contikimote/interfaces/ContikiRadio.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion java/org/contikios/cooja/interfaces/Radio.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 12 additions & 2 deletions java/org/contikios/cooja/radiomediums/AbstractRadioMedium.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down