jacob.eva/opencom_xl_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix weird behaviour with queue sizing

Browse Source
This commit is contained in:
jacob.eva 2024-08-21 17:54:38 +01:00
parent d7f2de07c0
commit 7f05a4fd9f
No known key found for this signature in database
GPG Key ID: 0B92E083BBCCAA1E
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RNode_Firmware_CE.ino
View File

@ -137,7 +137,7 @@ void setup() {
for (int i = 0; i < INTERFACE_COUNT; i++) { for (int i = 0; i < INTERFACE_COUNT; i++) {
fifo16_init(&packet_starts[i], packet_starts_buf, CONFIG_QUEUE_MAX_LENGTH); fifo16_init(&packet_starts[i], packet_starts_buf, CONFIG_QUEUE_MAX_LENGTH);
fifo16_init(&packet_lengths[i], packet_lengths_buf, CONFIG_QUEUE_MAX_LENGTH); fifo16_init(&packet_lengths[i], packet_lengths_buf, CONFIG_QUEUE_MAX_LENGTH);
packet_queue[i] = (uint8_t*)malloc(getQueueSize(i)); packet_queue[i] = (uint8_t*)malloc(getQueueSize(i)+1);
} }
// Create and configure interface objects // Create and configure interface objects
@ -585,9 +585,9 @@ void serialCallback(uint8_t sbyte) {
if (getInterfaceIndex(command) < INTERFACE_COUNT) { if (getInterfaceIndex(command) < INTERFACE_COUNT) {
uint8_t index = getInterfaceIndex(command); uint8_t index = getInterfaceIndex(command);
if (!fifo16_isfull(&packet_starts[index]) && queued_bytes[index] < (getQueueSize(index))) { if (!fifo16_isfull(&packet_starts[index]) && (queued_bytes[index] < (getQueueSize(index)))) {
uint16_t s = current_packet_start[index]; uint16_t s = current_packet_start[index];
int16_t e = queue_cursor[index]-1; if (e == -1) e = (getQueueSize(index))-1; uint16_t e = queue_cursor[index]-1; if (e == -1) e = (getQueueSize(index))-1;
uint16_t l; uint16_t l;
if (s != e) { if (s != e) {

2
Utilities.h
View File

@ -1100,7 +1100,7 @@ uint8_t getInterfaceCommandByte(uint8_t index) {
} }
} }
uint32_t getQueueSize(uint8_t index) { uint16_t getQueueSize(uint8_t index) {
switch (index) { switch (index) {
case 0: case 0:
return CONFIG_QUEUE_0_SIZE; return CONFIG_QUEUE_0_SIZE;