merged from V1

harvey637 · Feb 23, 2017 · cad234f · cad234f
1 parent 17de9cc
commit cad234f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/Device.h b/Device.h
@@ -329,6 +329,7 @@ class Device {
  *buf++ = 0;
  current++;
  pm.entries(current);
+ pm.clearAck();
  send(msg,to);
  }
 
@@ -359,6 +360,7 @@ class Device {
  memset(buf,0,sizeof(Peer));
  current++;
  pm.entries(current);
+ pm.clearAck();
  send(msg,to);
  }
 

diff --git a/Message.h b/Message.h
@@ -246,6 +246,10 @@ class Message {
  flag |= RPTEN;
  }
 
+ void clearAck () {
+ flag &= ~BIDI;
+ }
+
  bool isWakeMeUp () const {
  return (flag & WKMEUP) == WKMEUP;
  }

diff --git a/MultiChannelDevice.h b/MultiChannelDevice.h
@@ -16,6 +16,8 @@
 
 namespace as {
 
+void(* resetFunc) (void) = 0;
+
 template <class HalType,class ChannelType,int ChannelCount,class List0Type=List0>
 class MultiChannelDevice : public Device<HalType> {
 
@@ -107,9 +109,7 @@ class MultiChannelDevice : public Device<HalType> {
  void reset () {
  DPRINTLN(F("RESET"));
  firstinit();
- DeviceType::keystore().init();
- DeviceType::setMasterID(list0.masterid());
- DeviceType::led().set(StatusLed::welcome);
+ resetFunc();
  }
 
  void bootloader () {