kopia lustrzana https://github.com/sq8vps/vp-digi
duplicate protection bug
rodzic
995990ef1e
commit
d7738a0a6f
|
@ -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)
|
# 1.3.1 (2023-08-30)
|
||||||
## New features
|
## New features
|
||||||
* none
|
* none
|
||||||
|
|
|
@ -12,7 +12,7 @@
|
||||||
<targetDefinitions>
|
<targetDefinitions>
|
||||||
<board id="f103c8t6_digi_usb">
|
<board id="f103c8t6_digi_usb">
|
||||||
<name>F103C8T6_DIGI_USB</name>
|
<name>F103C8T6_DIGI_USB</name>
|
||||||
<dbgIF>JTAG</dbgIF>
|
<dbgIF>SWD</dbgIF>
|
||||||
<dbgDEV>ST-Link</dbgDEV>
|
<dbgDEV>ST-Link</dbgDEV>
|
||||||
<mcuId>stm32f103c8tx</mcuId>
|
<mcuId>stm32f103c8tx</mcuId>
|
||||||
</board>
|
</board>
|
||||||
|
|
|
@ -32,7 +32,7 @@ struct _GeneralConfig GeneralConfig =
|
||||||
.kissMonitor = 0,
|
.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)
|
static uint64_t pow10i(uint16_t exp)
|
||||||
{
|
{
|
||||||
|
|
|
@ -324,7 +324,7 @@ void DigiDigipeat(uint8_t *frame, uint16_t len)
|
||||||
|
|
||||||
//calculate frame "hash"
|
//calculate frame "hash"
|
||||||
uint32_t hash = Crc32(CRC32_INIT, frame, 14); //use destination and source address, skip path
|
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
|
if(DigiConfig.viscous) //viscous-delay enabled on any slot
|
||||||
{
|
{
|
||||||
|
@ -463,7 +463,7 @@ void DigiStoreDeDupe(uint8_t *buf, uint16_t size)
|
||||||
deDupeCount %= DEDUPE_SIZE;
|
deDupeCount %= DEDUPE_SIZE;
|
||||||
|
|
||||||
deDupe[deDupeCount].hash = hash;
|
deDupe[deDupeCount].hash = hash;
|
||||||
deDupe[deDupeCount].timeLimit = SysTickGet() + (DigiConfig.dupeTime * 10 / SYSTICK_INTERVAL);
|
deDupe[deDupeCount].timeLimit = SysTickGet() + (DigiConfig.dupeTime * 1000 / SYSTICK_INTERVAL);
|
||||||
|
|
||||||
deDupeCount++;
|
deDupeCount++;
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue