Merge pull request adafruit#586 from ogatatsu/cccd

hathach · web-flow · commit 9db92fb49120 · 2020-10-05T16:18:01.000+07:00
fixed a bug that saved cccd data to a different offset after the second time.
diff --git a/libraries/Bluefruit52Lib/src/utility/bonding.cpp b/libraries/Bluefruit52Lib/src/utility/bonding.cpp
@@ -238,6 +238,11 @@ static void bond_save_cccd_dfr (uint8_t role, uint16_t conn_hdl, ble_gap_addr_t
       do_write = false;
       BOND_LOG("CCCD matches file %s contents, no need to write", filename);
     }
+    else
+    {
+      // restore the position to the state before reading old_data for writing
+      file.seek(file.size() - (len + 1));
+    }
   }
 
   if (do_write)

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,11 @@ static void bond_save_cccd_dfr (uint8_t role, uint16_t conn_hdl, ble_gap_addr_t`
`238`	`238`	`do_write = false;`
`239`	`239`	`BOND_LOG("CCCD matches file %s contents, no need to write", filename);`
`240`	`240`	`}`
	`241`	`+ else`
	`242`	`+ {`
	`243`	`+ // restore the position to the state before reading old_data for writing`
	`244`	`+ file.seek(file.size() - (len + 1));`
	`245`	`+ }`
`241`	`246`	`}`
`242`	`247`
`243`	`248`	`if (do_write)`