DeepSleep value checking incorrect in "void CmndDeepSleep(void)"

[thomas-lentz]

BUG DESCRIPTION

Can't set deepsleep to the following values: 0, 10 to 39, >1000 (after correcting issue #175)

REQUESTED INFORMATION

• [x ] Read the Contributing Guide and Policy and the Code of Conduct
• [x ] Searched the problem in the forum (https://groups.google.com/d/forum/sonoffusers)
• [x ] Device used (i.e. Sonoff Basic) : LOLIN D1 mini Pro V2.0.0
• [x] Selfcompiled firmware version: Project sonoff Sonoff Version 6.6.0.3 stb-1.6(sonoff)-2_5_0
• [x] Development IDE - Compiler / Upload tools used : Arduino / Arduino
• [x] Provide the output of command status 0 :

  22:48:11 CMD: status 0
  22:48:11 RSL: stat/sonoff/STATUS = {"Status":{"Module":1,"FriendlyName":["Sonoff"],"Topic":"sonoff","ButtonTopic":"0","Power":0,"PowerOnState":3,"LedState":1,"LedMask":"FFFF","SaveData":1,"SaveState":1,"SwitchTopic":"0","SwitchMode":[0,0,0,0,0,0,0,0],"ButtonRetain":0,"SwitchRetain":0,"SensorRetain":0,"PowerRetain":0}}
  22:48:11 RSL: stat/sonoff/STATUS1 = {"StatusPRM":{"Baudrate":115200,"GroupTopic":"sonoffs","OtaUrl":"http://thehackbox.org/tasmota/release/sonoff.bin","RestartReason":"Deep-Sleep Wake","Uptime":"0T00:00:05","StartupUTC":"2019-08-17T21:48:06","Sleep":50,"CfgHolder":4617,"BootCount":10,"SaveCount":16,"SaveAddress":"FF4000"}}
  22:48:11 RSL: stat/sonoff/STATUS2 = {"StatusFWR":{"Version":"6.6.0.3 stb-1.6(sonoff)","BuildDateTime":"2019-08-17T23:40:09","Boot":31,"Core":"2_5_0","SDK":"3.0.0-dev(c0f7b44)"}}
  22:48:11 RSL: stat/sonoff/STATUS3 = {"StatusLOG":{"SerialLog":2,"WebLog":2,"SysLog":0,"LogHost":"","LogPort":514,"SSId":["????????",""],"TelePeriod":30,"Resolution":"558180C0","SetOption":["00008009","280500000100060000005A00000000000000","00000000"]}}
  22:48:11 RSL: stat/sonoff/STATUS4 = {"StatusMEM":{"ProgramSize":599,"Free":1448,"Heap":24760,"ProgramFlashSize":16384,"FlashSize":16384,"FlashChipId":"1840EF","FlashMode":2,"Features":["00000809","0FDAE396","001683A0","22B617CD","01001BC0"]}}
  22:48:11 RSL: stat/sonoff/STATUS5 = {"StatusNET":{"Hostname":"Sleeper","IPAddress":"192.168.24.56","Gateway":"192.168.24.1","Subnetmask":"255.255.255.0","DNSServer":"192.168.24.1","Mac":"80:7D:3A:47:59:E1","Webserver":2,"WifiConfig":4}}
  22:48:11 RSL: stat/sonoff/STATUS6 = {"StatusMQT":{"MqttHost":"","MqttPort":1883,"MqttClientMask":"DVES_%06X","MqttClient":"DVES_4759E1","MqttUser":"DVES_USER","MqttCount":0,"MAX_PACKET_SIZE":1000,"KEEPALIVE":30}}
  22:48:11 RSL: stat/sonoff/STATUS7 = {"StatusTIM":{"UTC":"Sat Aug 17 21:48:11 2019","Local":"Sat Aug 17 22:48:11 2019","StartDST":"Sun Mar 31 02:00:00 2019","EndDST":"Sun Oct 27 03:00:00 2019","Timezone":"+01:00","Sunrise":"05:45","Sunset":"20:03"}}
  22:48:11 RSL: stat/sonoff/STATUS10 = {"StatusSNS":{"Time":"2019-08-17T22:48:11","Epoch":1566078491}}
  22:48:11 RSL: stat/sonoff/STATUS11 = {"StatusSTS":{"Time":"2019-08-17T22:48:11","Epoch":1566078491,"Uptime":"0T00:00:05","UptimeSec":5,"Heap":24,"SleepMode":"Dynamic","Sleep":50,"LoadAvg":19,"MqttCount":0,"POWER":"OFF","Wifi":{"AP":1,"SSId":"????????","BSSId":"44:4E:6D:40:73:00","Channel":6,"RSSI":64,"LinkCount":1,"Downtime":"0T00:00:04","DeepSleep":120,"Heap":24696}}}

  TO REPRODUCE

  Just enter "deepsleep 0" or "deepsleep 10" at console or via mqtt

ADDITIONAL CONTEXT

The boundary check in "void CmndDeepSleep(void)" seems to be faulty (39<deepsleep<1001):

  if ((XdrvMailbox.payload > 39) && (XdrvMailbox.payload < 1001)) {
    Settings.deepsleep = XdrvMailbox.payload;
...

This fixes the problem:

//STB MOD

void CmndDeepSleep(void)
{
  if ((XdrvMailbox.payload == 0 ) || ((XdrvMailbox.payload >= 10) && (XdrvMailbox.payload <= 4294967295))) {
    Settings.deepsleep = XdrvMailbox.payload;
  }
  Response_P( PSTR("{\"" D_CMND_DEEPSLEEP "\":\"%d%s (%d%s)\"}"), Settings.deepsleep, (Settings.flag.value_units) ? " mS" : "", Settings.deepsleep, (Settings.flag.value_units) ? " mS" : "");
}
//end

It seems to be a copy&paste failure. The "faulty" boundary check seems to be copied from:

void CmndButtonDebounce(void)
{
  if ((XdrvMailbox.payload > 39) && (XdrvMailbox.payload < 1001)) {
    Settings.button_debounce = XdrvMailbox.payload;
  }
  Response_P(S_JSON_COMMAND_NVALUE, XdrvMailbox.command, Settings.button_debounce);
}

[stefanbode]

agree!