Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ option(BUILD_TOOLS "Build tools" ON)
option(ENABLE_ESI_PARSER "Enable ESI XML parser" ON)
option(ENABLE_AF_XDP "Enable AF_XDP socket for improved performance (requires libxdp, libbpf, clang)" OFF)
option(ENABLE_CODE_COVERAGE "Enable code coverage (requires gcovr)" OFF)
option(BUILD_EEPROM_EDITOR "Build EEPROM editor GUI (requires imgui, glfw)" OFF)

if (NUTTX)
set(BUILD_MASTER_EXAMPLES OFF CACHE BOOL "" FORCE)
Expand All @@ -25,6 +26,7 @@ if (NUTTX)
set(ENABLE_ESI_PARSER OFF CACHE BOOL "" FORCE)
set(ENABLE_AF_XDP OFF CACHE BOOL "" FORCE)
set(ENABLE_CODE_COVERAGE OFF CACHE BOOL "" FORCE)
set(BUILD_EEPROM_EDITOR OFF CACHE BOOL "" FORCE)
endif()


Expand Down Expand Up @@ -77,5 +79,8 @@ if (BUILD_TOOLS)
add_subdirectory(tools)
endif()

if (BUILD_EEPROM_EDITOR)
add_subdirectory(tools/eeprom_editor)
endif()

add_subdirectory(py_bindings)
6 changes: 6 additions & 0 deletions conan/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ class KickCATDev(ConanFile):
"simulation": [True, False],
"tools": [True, False],
"master_examples": [True, False],
"eeprom_editor": [True, False],
}
default_options = {
"unit_tests": False,
"esi_parser": True,
"simulation": True,
"tools": True,
"master_examples": True,
"eeprom_editor": False,
}

generators = "CMakeDeps"
Expand All @@ -39,6 +41,10 @@ def requirements(self):
if self.options.tools or self.options.master_examples or self.options.simulation:
self.requires("argparse/3.2")

if self.options.eeprom_editor:
self.requires("imgui/1.92.6")
self.requires("portable-file-dialogs/0.1.0")

if self.settings.os == "Windows":
self.requires("npcap/1.70")

Expand Down
2 changes: 1 addition & 1 deletion lib/include/kickcat/protocol.h
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ namespace kickcat

uint16_t mailbox_protocol;

uint16_t reserved4[32];
uint16_t reserved4[33];
uint16_t size;
uint16_t version;
}__attribute__((__packed__));
Expand Down
4 changes: 4 additions & 0 deletions scripts/lib/build_options.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ declare -A OPT_DEFAULTS=(
[esi_parser]=ON
[simulation]=ON
[tools]=ON
[eeprom_editor]=OFF
[code_coverage]=OFF
[af_xdp]=OFF
)
Expand All @@ -20,6 +21,7 @@ declare -A OPT_DESCRIPTIONS=(
[esi_parser]="Enable ESI XML parser"
[simulation]="Build simulation"
[tools]="Build tools"
[eeprom_editor]="Build EEPROM editor GUI"
[code_coverage]="Enable code coverage"
[af_xdp]="Enable AF_XDP socket"
)
Expand All @@ -31,6 +33,7 @@ declare -A OPT_CMAKE_FLAGS=(
[esi_parser]="ENABLE_ESI_PARSER"
[simulation]="BUILD_SIMULATION"
[tools]="BUILD_TOOLS"
[eeprom_editor]="BUILD_EEPROM_EDITOR"
[code_coverage]="ENABLE_CODE_COVERAGE"
[af_xdp]="ENABLE_AF_XDP"
)
Expand All @@ -42,6 +45,7 @@ declare -A OPT_CONAN_FLAGS=(
[esi_parser]="esi_parser"
[simulation]="simulation"
[tools]="tools"
[eeprom_editor]="eeprom_editor"
)

# Load .buildconfig into the CONFIG associative array.
Expand Down
Loading
Loading