Merge branch 'PokemonAutomation:main' into main

Author: ZacharyPL

.github/workflows/cpp-ci-serial-programs-base.yml

@@ -95,7 +95,7 @@ jobs:
         echo https://github.com/${{github.repository}}/commit/${{github.sha}} > ${{env.UPLOAD_FOLDER}}/version.txt
 
     - name: Upload Build
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       if: inputs.upload-build
       with:
         name: Serial Programs (os=${{inputs.os}} - compiler=${{inputs.compiler}})

.gitignore

@@ -1,6 +1,7 @@
 SerialPrograms/bin/
 
 .vscode
+.qtcreator
 
 discord_social_sdk_win/
 discord_partner_sdk.dll
@@ -73,3 +74,4 @@ CLAUDE.md
 build_*/
 .cache/*
 Packages/*
+

Common/Cpp/StreamConnections/MockDevice.cpp

@@ -15,8 +15,8 @@ using std::cout;
 using std::endl;
 
 #if 1
-#define PABB2_DROP_HOST_TO_DEVICE   0.2
-#define PABB2_DROP_DEVICE_TO_HOST   0.2
+#define PABB2_DROP_HOST_TO_DEVICE   0.01
+#define PABB2_DROP_DEVICE_TO_HOST   0.01
 #else
 #define PABB2_DROP_HOST_TO_DEVICE   0
 #define PABB2_DROP_DEVICE_TO_HOST   0
@@ -98,6 +98,9 @@ size_t MockDevice::device_read_serial(void* data, size_t max_bytes){
     auto iter1 = iter0 + bytes;
     std::copy(iter0, iter1, (uint8_t*)data);
     m_host_to_device_line.erase(iter0, iter1);
+
+//    cout << "device_read_serial(): attempt = " << max_bytes << ", actual = " << bytes << endl;
+
     return bytes;
 }
 

Common/PABotBase2/PABotBase2_PacketParser.c

@@ -7,6 +7,8 @@
 #include "Common/CRC32/pabb_CRC32.h"
 #include "PABotBase2_PacketParser.h"
 
+//#include <stdio.h>
+
 
 const pabb2_PacketHeader* pabb2_PacketParser_pull_bytes(
     pabb2_PacketParser* self,
@@ -27,6 +29,7 @@ const pabb2_PacketHeader* pabb2_PacketParser_pull_bytes(
 
         //  Header is still incomplete.
         if (self->index < MIN_PACKET_SIZE){
+//            printf("Incomplete Header: %d\n", self->index);
             return NULL;
         }
 
@@ -43,20 +46,19 @@ const pabb2_PacketHeader* pabb2_PacketParser_pull_bytes(
 
             //  Magic byte never found.
             if (c == MIN_PACKET_SIZE){
-                self->index = 0;
                 break;
             }
 
             //  Magic byte found.
             if (buffer[c] == PABB2_CONNECTION_MAGIC_NUMBER){
                 //  Shift the buffer up so that the magic byte is at the start.
                 memmove(self->buffer, self->buffer + c, MIN_PACKET_SIZE - c);
-                goto EndLoop;
+                break;
             }
         }
-    }
 
-EndLoop:;
+        self->index -= c;
+    }
 
     //  At this point, we have a complete and valid header.
 
@@ -87,6 +89,7 @@ EndLoop:;
 
     //  Packet is incomplete.
     if (self->index < packet_bytes){
+//        printf("Incomplete Packet: %d\n", packet_bytes);
         return NULL;
     }
 

Common/PABotBase2/PABotBase2_PacketSender.c

@@ -299,7 +299,7 @@ bool pabb2_PacketSender_iterate_retransmits(pabb2_PacketSender* self){
         //  Not old enough.
         if ((uint8_t)(seqnum - packet->magic_number) < PABB2_ConnectionSender_RETRANSMIT_COUNTER){
 #if 0
-            printf("Not old enough.\n");
+            printf("Not old enough: seqnum = %d, packet = %d\n", seqnum, packet->magic_number);
             fflush(stdout);
 #endif
             head++;

Common/PABotBase2/PABotBase2_StreamCoalescer.c

@@ -7,8 +7,8 @@
 #include <string.h>
 #include "PABotBase2_StreamCoalescer.h"
 
-//#include <stdio.h>  //  REMOVE
-//#include "PABotBase2_ConnectionDebug.h" //  REMOVE
+//#include <stdio.h>
+//#include "PABotBase2_ConnectionDebug.h"
 
 void pabb2_StreamCoalescer_init(pabb2_StreamCoalescer* self){
 //    printf("pabb2_StreamCoalescer_init(%p)\n", self);

Common/PABotBase2/PABotbase2_ReliableStreamConnection.c

@@ -4,7 +4,7 @@
  *
  */
 
-#include <stdio.h>  //  REMOVE
+//#include <stdio.h>
 #include "PABotBase2_ConnectionDebug.h"
 #include "PABotbase2_ReliableStreamConnection.h"
 
@@ -44,26 +44,28 @@ void pabb2_ReliableStreamConnection_run_events(pabb2_ReliableStreamConnection* s
     case PABB2_PacketParser_RESULT_VALID:
         break;
     case PABB2_PacketParser_RESULT_INVALID:
-        printf("PABB2_PacketParser_RESULT_INVALID\n");
+//        printf("PABB2_PacketParser_RESULT_INVALID\n");
         pabb2_PacketSender_send_info(
             &self->reliable_sender,
             packet->seqnum,
             PABB2_CONNECTION_OPCODE_INVALID_LENGTH
         );
         return;
     case PABB2_PacketParser_RESULT_CHECKSUM_FAIL:
-        printf("PABB2_PacketParser_RESULT_CHECKSUM_FAIL\n");
+//        printf("PABB2_PacketParser_RESULT_CHECKSUM_FAIL\n");
         pabb2_PacketSender_send_info(
             &self->reliable_sender,
             packet->seqnum,
             PABB2_CONNECTION_OPCODE_INVALID_CHECKSUM_FAIL
         );
         return;
     default:
-        printf("Internal Error: Unrecognized packet state.\n");
+//        printf("Internal Error: Unrecognized packet state.\n");
         return;
     }
 
+//    printf("Device Received: %d\n", packet->opcode);
+
     //  Now handle the different opcodes.
     switch (packet->opcode){
     case PABB2_CONNECTION_OPCODE_ASK_RESET:
@@ -124,10 +126,10 @@ void pabb2_ReliableStreamConnection_run_events(pabb2_ReliableStreamConnection* s
                 pabb2_StreamCoalescer_bytes_available(&self->stream_coalescer)
             );
         }else{
-            printf("Device: Failed to push.\n");
+//            printf("Device: Failed to push.\n");
             pabb2_StreamCoalescer_print(&self->stream_coalescer, true);
         }
-        fflush(stdout);
+//        fflush(stdout);
         return;
     default:
         pabb2_PacketSender_send_info(

Common/Qt/NoWheelComboBox.h

@@ -1,4 +1,4 @@
-/*  ComboBox without mouse wheel scrolling.
+/*  ComboBox without mouse wheel scrolling. Also, the height has been set to be more compact.
  *
  *  From: https://github.com/PokemonAutomation/
  *
@@ -8,15 +8,39 @@
 #define PokemonAutomation_NoWheelComboBox_H
 
 #include <QComboBox>
+#include <QAbstractItemView>
+#include <QStyledItemDelegate>
 
 //#define PA_ENABLE_SIZE_CACHING
 
 namespace PokemonAutomation{
 
 
-class NoWheelComboBox : public QComboBox{
+class HeightDelegate : public QStyledItemDelegate {
 public:
-    using QComboBox::QComboBox;
+    using QStyledItemDelegate::QStyledItemDelegate;
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override {
+        QSize s = QStyledItemDelegate::sizeHint(option, index);
+        int vertical_padding = 2;
+        s.setHeight(option.fontMetrics.height() + vertical_padding);
+        return s;
+    }
+};
+
+
+class NoWheelCompactComboBox : public QComboBox{
+public:
+    explicit NoWheelCompactComboBox(QWidget* parent = nullptr) : QComboBox(parent) {
+        // Set the height for every line in the dropdown
+        this->view()->setItemDelegate(new HeightDelegate(this));
+
+        // this->setStyleSheet("QAbstractItemView::item { height: 100px; }");
+        
+        // Optional: Force a standard list view to ensure the stylesheet 
+        // is respected on all platforms (like Windows/macOS)
+        // #include <QListView>
+        // this->setView(new QListView()); 
+    }
 
     void update_size_cache(){
 #ifdef PA_ENABLE_SIZE_CACHING

Common/Qt/Options/EnumDropdownWidget.cpp

@@ -22,7 +22,7 @@ EnumDropdownCellWidget::~EnumDropdownCellWidget(){
     m_value.remove_listener(*this);
 }
 EnumDropdownCellWidget::EnumDropdownCellWidget(QWidget& parent, IntegerEnumDropdownCell& value)
-    : NoWheelComboBox(&parent)
+    : NoWheelCompactComboBox(&parent)
     , ConfigWidget(value, *this)
     , m_value(value)
 {

Common/Qt/Options/EnumDropdownWidget.h

@@ -15,7 +15,7 @@
 namespace PokemonAutomation{
 
 
-class EnumDropdownCellWidget : public NoWheelComboBox, public ConfigWidget{
+class EnumDropdownCellWidget : public NoWheelCompactComboBox, public ConfigWidget{
 public:
     using ParentOption = IntegerEnumDropdownCell;