Skip to content
Snippets Groups Projects

Dev

Merged Anian Bühler requested to merge dev into master
2 files
+ 5
4
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 3
3
@@ -43,10 +43,10 @@ bool DidacticPSNet::handleNetwork(){
@@ -43,10 +43,10 @@ bool DidacticPSNet::handleNetwork(){
handleData();
handleData();
}
}
}
}
_waitingTime = millis()+ random(CSMA_MIN_DELAY_MS, CSMA_MAX_DELAY_MS);
_waitingTimeCSMA = millis()+ random(CSMA_MIN_DELAY_MS, CSMA_MAX_DELAY_MS);
}
}
//else if(_dataToSend){
//else if(_dataToSend){
if(_dataToSend && _waitingTime <= millis()){
if(_dataToSend && _waitingTimeSend <= millis() && _waitingTimeCSMA <= millis()){
//send data to network
//send data to network
//TODO: test added CSMA_CHECKDELAY + 2nd checkData()
//TODO: test added CSMA_CHECKDELAY + 2nd checkData()
delayMicroseconds(CSMA_CHECK_DELAY_US);
delayMicroseconds(CSMA_CHECK_DELAY_US);
@@ -57,7 +57,7 @@ bool DidacticPSNet::handleNetwork(){
@@ -57,7 +57,7 @@ bool DidacticPSNet::handleNetwork(){
else{
else{
_dataToSend = false;
_dataToSend = false;
//_waitingTime = millis()+ random(CSMA_MID_DELAY_MS, CSMA_MAX_DELAY_MS);
//_waitingTime = millis()+ random(CSMA_MID_DELAY_MS, CSMA_MAX_DELAY_MS);
_waitingTime = millis()+ _intervalTime;//random(CSMA_MID_DELAY_MS, CSMA_MAX_DELAY_MS);
_waitingTimeSend = millis() + _intervalTime;//random(CSMA_MID_DELAY_MS, CSMA_MAX_DELAY_MS);
}
}
}
}
}
}
Loading