lazy config again changed

AskSinPP.h

@@ -36,6 +36,12 @@ class AskSin {
  RadioType radio;
  Activity activity;
 
+ static void pgm_read(uint8_t* dest,uint16_t adr,uint8_t size) {
+ for( int i=0; i<size; ++i, ++dest ) {
+ *dest = pgm_read_byte(adr + i);
+ }
+ }
+
 };
 
 }

Device.h

@@ -114,7 +114,7 @@ class Device {
  }
 
  void setModel (uint16_t address) {
- pgm_read(model,address,sizeof(model));
+ HalType::pgm_read(model,address,sizeof(model));
  }
 
  void setSubType (uint8_t st) {
@@ -140,7 +140,7 @@ class Device {
  }
 
  void setDeviceID (uint16_t address) {
- pgm_read((uint8_t*)&devid,address,sizeof(devid));
+ HalType::pgm_read((uint8_t*)&devid,address,sizeof(devid));
  }
 
  const HMID& getDeviceID () const {
@@ -153,7 +153,7 @@ class Device {
  }
 
  void setSerial (uint16_t address) {
- pgm_read((uint8_t*)serial,address,10);
+ HalType::pgm_read((uint8_t*)serial,address,10);
  }
 
  const char* getSerial () const {
@@ -243,8 +243,9 @@ class Device {
  #endif
  {
  result = response.isAck();
+ // we request wakeup
  // we got the fag to stay awake
- if( response.isKeepAwake() ) {
+ if( msg.isWakeMeUp() /*response.isKeepAwake()*/ ) {
  activity().stayAwake(millis2ticks(500));
  }
  }
@@ -421,12 +422,6 @@ class Device {
  return false;
  }
 
- void pgm_read(uint8_t* dest,uint16_t adr,uint8_t size) {
- for( int i=0; i<size; ++i, ++dest ) {
- *dest = pgm_read_byte(adr + i);
- }
- }
-
 #ifdef USE_AES
  void sendAckAes (Message& msg,const uint8_t* data) {
  msg.ackAes().init(data);

MultiChannelDevice.h

@@ -155,7 +155,7 @@ class MultiChannelDevice : public Device<HalType> {
  uint8_t mcomm = msg.command();
  uint8_t msubc = msg.subcommand();
  if( mtype == AS_MESSAGE_CONFIG ) {
- DeviceType::activity().stayAwake(seconds2ticks(2));
+ DeviceType::activity().stayAwake(millis2ticks(500));
  // PAIR_SERIAL
  if( msubc == AS_CONFIG_PAIR_SERIAL && memcmp(msg.data(),DeviceType::getSerial(),10)==0 ) {
  DeviceType::led().set(StatusLed::pairing);