[WIP] Fix inconsistent stop scan - to be revisioned

polldo · giulcioffi · commit d6ae09d8c9cc · 2020-10-30T10:28:41.000+01:00
diff --git a/src/utility/GAP.cpp b/src/utility/GAP.cpp
@@ -84,7 +84,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) {
@@ -129,7 +130,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
`@@ -84,7 +84,8 @@ void GAPClass::stopAdvertise()`
`84`	`84`
`85`	`85`	`int GAPClass::scan(bool withDuplicates)`
`86`	`86`	`{`
`87`		`- HCI.leSetScanEnable(false, true);`
	`87`	`+ //HCI.leSetScanEnable(false, true);`
	`88`	`+ stopScan();`
`88`	`89`
`89`	`90`	`// active scan, 10 ms scan interval (N * 0.625), 10 ms scan window (N * 0.625), public own address type, no filter`
`90`	`91`	`if (HCI.leSetScanParameters(0x01, 0x0010, 0x0010, 0x00, 0x00) != 0) {`
`@@ -129,7 +130,8 @@ int GAPClass::scanForAddress(String address, bool withDuplicates)`
`129`	`130`
`130`	`131`	`void GAPClass::stopScan()`
`131`	`132`	`{`
`132`		`- HCI.leSetScanEnable(false, false);`
	`133`	`+ //HCI.leSetScanEnable(false, false);`
	`134`	`+ HCI.leSetScanEnable(false, true);`
`133`	`135`
`134`	`136`	`_scanning = false;`
`135`	`137`