use transmitDevTryMax in send loop

do not process message with own HMID from radio
harvey637 · Jul 16, 2018 · ce6113e · ce6113e
1 parent 01c4fcf
commit ce6113e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/ChannelList.h b/ChannelList.h
@@ -232,6 +232,9 @@ class List0 : public ChannelList<List0Data> {
  setByte(2,0x00);
  setByte(3,0x00);
  }
+
+ uint8_t transmitDevTryMax () const { return 6; }
+
 };
 
 

diff --git a/Device.h b/Device.h
@@ -198,7 +198,9 @@ class Device {
 
  bool pollRadio () {
  uint8_t num = radio().read(msg);
- if( num >= 10 ) { // minimal msg is 10 byte
+ // minimal msg is 10 byte
+ // ignore own messages from radio
+ if( num >= 10 && isDeviceID(msg.from()) == false ) {
  return process(msg);
  }
  return false;
@@ -225,7 +227,7 @@ class Device {
 
  bool send(Message& msg) {
  bool result = false;
- uint8_t maxsend = 6;
+ uint8_t maxsend = list0.transmitDevTryMax();
  led().set(LedStates::send);
  while( result == false && maxsend > 0 ) {
  result = radio().write(msg,msg.burstRequired());

diff --git a/examples/HM-ES-TX-WM/HM-ES-TX-WM.ino b/examples/HM-ES-TX-WM/HM-ES-TX-WM.ino
@@ -111,6 +111,8 @@ public:
  uint8_t samplesPerCycle () const { return getByte(sizeof(List0Data) + 5); }
  bool samplesPerCycle (uint8_t value) const { return setByte(sizeof(List0Data) + 5,value); }
 
+ uint8_t transmitDevTryMax () const { return 6; }
+
  void defaults () {
  ((List0*)this)->defaults();
  }