Make scanNetworks return int16 (espressif#1496) (espressif#1514)

theproxy · me-no-dev · commit d06fa8ee70dd · 2018-06-19T11:32:12.000+03:00
diff --git a/libraries/WiFi/src/WiFiScan.cpp b/libraries/WiFi/src/WiFiScan.cpp
@@ -54,7 +54,7 @@ void* WiFiScanClass::_scanResult = 0;
 * @param show_hidden show hidden networks
 * @return Number of discovered networks
 */
-int8_t WiFiScanClass::scanNetworks(bool async, bool show_hidden, bool passive, uint32_t max_ms_per_chan)
+int16_t WiFiScanClass::scanNetworks(bool async, bool show_hidden, bool passive, uint32_t max_ms_per_chan)
{
 if(WiFiScanClass::_scanStarted){
 return WIFI_SCAN_RUNNING;
@@ -89,7 +89,7 @@ int8_t WiFiScanClass::scanNetworks(bool async, bool show_hidden, bool passive, u
 while(!(WiFiScanClass::_scanComplete)){
 delay(10);
 }
- return WiFiScanClass::_scanCount;
+ return (int16_t) WiFiScanClass::_scanCount;
 } else{
 return WIFI_SCAN_FAILED;
 }
diff --git a/libraries/WiFi/src/WiFiScan.h b/libraries/WiFi/src/WiFiScan.h
@@ -31,7 +31,7 @@ class WiFiScanClass
 
 public:
 
- int8_t scanNetworks(bool async = false, bool show_hidden = false, bool passive = false, uint32_t max_ms_per_chan = 300);
+ int16_t scanNetworks(bool async = false, bool show_hidden = false, bool passive = false, uint32_t max_ms_per_chan = 300);
 
 int8_t scanComplete();
 void scanDelete();

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ void* WiFiScanClass::_scanResult = 0;`
`54`	`54`	`* @param show_hidden show hidden networks`
`55`	`55`	`* @return Number of discovered networks`
`56`	`56`	`*/`
`57`		`-int8_tWiFiScanClass::scanNetworks(bool async, bool show_hidden, bool passive, uint32_t max_ms_per_chan)`
	`57`	`+int16_tWiFiScanClass::scanNetworks(bool async, bool show_hidden, bool passive, uint32_t max_ms_per_chan)`
`58`	`58`	`{`
`59`	`59`	`if(WiFiScanClass::_scanStarted){`
`60`	`60`	`return WIFI_SCAN_RUNNING;`
`@@ -89,7 +89,7 @@ int8_t WiFiScanClass::scanNetworks(bool async, bool show_hidden, bool passive, u`
`89`	`89`	`while(!(WiFiScanClass::_scanComplete)){`
`90`	`90`	`delay(10);`
`91`	`91`	`}`
`92`		`-return WiFiScanClass::_scanCount;`
	`92`	`+return(int16_t) WiFiScanClass::_scanCount;`
`93`	`93`	`} else{`
`94`	`94`	`return WIFI_SCAN_FAILED;`
`95`	`95`	`}`
-Original file line number
+Diff line change
 public:
 -int8_tscanNetworks(bool async = false, bool show_hidden = false, bool passive = false, uint32_t max_ms_per_chan = 300);
 +int16_tscanNetworks(bool async = false, bool show_hidden = false, bool passive = false, uint32_t max_ms_per_chan = 300);
 int8_tscanComplete();
 voidscanDelete();