Merge pull request #28 from sq8vps/dev

duplicate protection bug
sq8vps · Aug 31, 2023 · e550e10 · e550e10
2 parents 995990e + d7738a0
commit e550e10
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 1.3.2 (2023-08-31)
+## New features
+* none
+## Bug fixes
+* Duplicate protection was not working properly
+## Other
+* none
+## Known bugs
+* none
 # 1.3.1 (2023-08-30)
 ## New features
 * none

diff --git a/F103C8T6_DIGI_USB.xml b/F103C8T6_DIGI_USB.xml
@@ -12,7 +12,7 @@
 <targetDefinitions>
  <board id="f103c8t6_digi_usb">
  <name>F103C8T6_DIGI_USB</name>
- <dbgIF>JTAG</dbgIF>
+ <dbgIF>SWD</dbgIF>
  <dbgDEV>ST-Link</dbgDEV>
  <mcuId>stm32f103c8tx</mcuId>
  </board>

diff --git a/Src/common.c b/Src/common.c
@@ -32,7 +32,7 @@ struct _GeneralConfig GeneralConfig =
  .kissMonitor = 0,
 };
 
-const char versionString[] = "VP-Digi v. 1.3.1\r\nThe open-source standalone APRS digipeater controller and KISS TNC\r\n";
+const char versionString[] = "VP-Digi v. 1.3.2\r\nThe open-source standalone APRS digipeater controller and KISS TNC\r\n";
 
 static uint64_t pow10i(uint16_t exp)
 {

diff --git a/Src/digipeater.c b/Src/digipeater.c
@@ -324,7 +324,7 @@ void DigiDigipeat(uint8_t *frame, uint16_t len)
 
  //calculate frame "hash"
  uint32_t hash = Crc32(CRC32_INIT, frame, 14); //use destination and source address, skip path
- hash = Crc32(hash, &frame[t + 1], len - t); //continue through all remaining data
+ hash = Crc32(hash, &frame[t + 1], len - t - 1); //continue through all remaining data
 
  if(DigiConfig.viscous) //viscous-delay enabled on any slot
  {
@@ -463,7 +463,7 @@ void DigiStoreDeDupe(uint8_t *buf, uint16_t size)
  deDupeCount %= DEDUPE_SIZE;
 
  deDupe[deDupeCount].hash = hash;
- deDupe[deDupeCount].timeLimit = SysTickGet() + (DigiConfig.dupeTime * 10 / SYSTICK_INTERVAL);
+ deDupe[deDupeCount].timeLimit = SysTickGet() + (DigiConfig.dupeTime * 1000 / SYSTICK_INTERVAL);
 
  deDupeCount++;
 }