deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

updated for new radio version.

Browse source 
not fully tested yet
This commit is contained in:
fros4943 2006-10-02 15:19:28 +00:00
parent 2ae5b09f30
commit 779ecd27a4
1 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
tools/cooja/java/se/sics/cooja/radiomediums/StandardRadioMedium.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: StandardRadioMedium.java,v 1.1 2006/08/21 12:13:13 fros4943 Exp $ * $Id: StandardRadioMedium.java,v 1.2 2006/10/02 15:19:28 fros4943 Exp $
*/ */
package se.sics.cooja.radiomediums; package se.sics.cooja.radiomediums;
@ -218,15 +218,12 @@ public class StandardRadioMedium extends RadioMedium {
if (selectedMote != null && mote == selectedMote) if (selectedMote != null && mote == selectedMote)
return new Color[]{Color.CYAN}; return new Color[]{Color.CYAN};
if (moteRadio.getSendState() == Radio.SENT_SOMETHING) if (moteRadio.isTransmitting())
return new Color[]{Color.BLUE}; return new Color[]{Color.BLUE};
if (moteRadio.getListenState() == Radio.HEARS_PACKET) if (moteRadio.isReceiving())
return new Color[]{Color.GREEN}; return new Color[]{Color.GREEN};
if (moteRadio.getListenState() == Radio.HEARS_NOISE)
return new Color[]{Color.RED};
return new Color[]{Color.WHITE}; return new Color[]{Color.WHITE};
} }
@ -322,7 +319,7 @@ public class StandardRadioMedium extends RadioMedium {
private Observer radioDataObserver = new Observer() { private Observer radioDataObserver = new Observer() {
public void update(Observable radio, Object obj) { public void update(Observable radio, Object obj) {
if (((Radio) radio).getSendState() == Radio.SENT_SOMETHING) { if (((Radio) radio).getLastEvent() == Radio.RadioEvent.TRANSMISSION_FINISHED) {
if (!sendingPositions.contains((Position) obj)) { if (!sendingPositions.contains((Position) obj)) {
sendingPositions.add((Position) obj); sendingPositions.add((Position) obj);
sendingRadios.add((Radio) radio); sendingRadios.add((Radio) radio);
@ -342,7 +339,7 @@ public class StandardRadioMedium extends RadioMedium {
// Loop through all sending radios // Loop through all sending radios
for (int sendNr = 0; sendNr < numberSending; sendNr++) { for (int sendNr = 0; sendNr < numberSending; sendNr++) {
Radio sendingRadio = sendingRadios.get(sendNr); Radio sendingRadio = sendingRadios.get(sendNr);
byte[] dataToSend = sendingRadio.getLastPacketSent(); byte[] dataToSend = sendingRadio.getLastPacketTransmitted();
lastTickConnections[sendNr] = new RadioConnection(); lastTickConnections[sendNr] = new RadioConnection();
lastTickConnections[sendNr].setSource(sendingRadios.get(sendNr), lastTickConnections[sendNr].setSource(sendingRadios.get(sendNr),
@ -350,10 +347,8 @@ public class StandardRadioMedium extends RadioMedium {
// Set sending radio unable to receive any more data // Set sending radio unable to receive any more data
if (RECEIVE_MY_OWN_PACKETS) { if (RECEIVE_MY_OWN_PACKETS) {
sendingRadio.receivePacket(dataToSend); if (sendingRadio.isReceiving())
sendingRadio.advanceListenState(); sendingRadio.interferReception();
} else if (DETECT_MY_OWN_PACKETS) {
sendingRadio.setListenState(Radio.HEARS_NOISE);
} }
// Loop through all radios that are listening // Loop through all radios that are listening
@ -372,25 +367,18 @@ public class StandardRadioMedium extends RadioMedium {
dataToSend); dataToSend);
// If close enough to transmit ok.. // If close enough to transmit ok..
if (listeningRadio.getListenState() == Radio.HEARS_PACKET) { if (listeningRadio.isReceiving()) {
// .. but listening radio already received a packet // .. but listening radio already received a packet
listeningRadio.advanceListenState(); listeningRadio.interferReception();
} else if (listeningRadio.getListenState() == Radio.HEARS_NOISE) {
// .. but listening radio heard interference
listeningRadio.advanceListenState();
} else { } else {
// .. send packet // .. send packet
listeningRadio.receivePacket(dataToSend); listeningRadio.receivePacket(dataToSend, 0);
listeningRadio.setListenState(Radio.HEARS_PACKET);
} }
} else if (distance <= INTERFERENCE_RANGE) { } else if (distance <= INTERFERENCE_RANGE) {
// If close enough to sabotage other transmissions.. // If close enough to sabotage other transmissions..
if (listeningRadio.getListenState() == Radio.HEARS_PACKET) { if (listeningRadio.isReceiving()) {
// .. and listening radio already received a packet // .. and listening radio already received a packet
listeningRadio.advanceListenState(); listeningRadio.interferReception();
} else {
// .. and listening radio has done nothing sofar
listeningRadio.setListenState(Radio.HEARS_NOISE);
} }
} }
// else too far away // else too far away