[WIP] Fix inconsistent stop scan - to be revisioned

polldo · polldo · commit 71198892443c · 2020-08-27T10:37:50.000+02:00
diff --git a/src/utility/GAP.cpp b/src/utility/GAP.cpp
@@ -167,7 +167,8 @@ void GAPClass::stopAdvertise()
 
 int GAPClass::scan(bool withDuplicates)
 {
-  HCI.leSetScanEnable(false, true);
+  //HCI.leSetScanEnable(false, true);
+  stopScan();
 
   // active scan, 10 ms scan interval (N * 0.625), 10 ms scan window (N * 0.625), public own address type, no filter
   if (HCI.leSetScanParameters(0x01, 0x0010, 0x0010, 0x00, 0x00) != 0) {
@@ -212,7 +213,8 @@ int GAPClass::scanForAddress(String address, bool withDuplicates)
 
 void GAPClass::stopScan()
 {
-  HCI.leSetScanEnable(false, false);
+  //HCI.leSetScanEnable(false, false);
+  HCI.leSetScanEnable(false, true);
 
   _scanning = false;
 

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,8 @@ void GAPClass::stopAdvertise()`
`167`	`167`
`168`	`168`	`int GAPClass::scan(bool withDuplicates)`
`169`	`169`	`{`
`170`		`- HCI.leSetScanEnable(false, true);`
	`170`	`+ //HCI.leSetScanEnable(false, true);`
	`171`	`+ stopScan();`
`171`	`172`
`172`	`173`	`// active scan, 10 ms scan interval (N * 0.625), 10 ms scan window (N * 0.625), public own address type, no filter`
`173`	`174`	`if (HCI.leSetScanParameters(0x01, 0x0010, 0x0010, 0x00, 0x00) != 0) {`
`@@ -212,7 +213,8 @@ int GAPClass::scanForAddress(String address, bool withDuplicates)`
`212`	`213`
`213`	`214`	`void GAPClass::stopScan()`
`214`	`215`	`{`
`215`		`- HCI.leSetScanEnable(false, false);`
	`216`	`+ //HCI.leSetScanEnable(false, false);`
	`217`	`+ HCI.leSetScanEnable(false, true);`
`216`	`218`
`217`	`219`	`_scanning = false;`
`218`	`220`