diff --git a/firmware/apps/_samples/utils/.gitignore b/firmware/apps/_samples/utils/.gitignore new file mode 100644 index 0000000..a5309e6 --- /dev/null +++ b/firmware/apps/_samples/utils/.gitignore @@ -0,0 +1 @@ +build*/ diff --git a/firmware/apps/_samples/utils/CMakeLists.txt b/firmware/apps/_samples/utils/CMakeLists.txt new file mode 100644 index 0000000..19f6b90 --- /dev/null +++ b/firmware/apps/_samples/utils/CMakeLists.txt @@ -0,0 +1,10 @@ +cmake_minimum_required(VERSION 3.20.0) + +# Tell Zephyr to look into our libs folder for extra modules +list(APPEND ZEPHYR_EXTRA_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs) + +find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) + +project(_mcumgr) + +target_sources(app PRIVATE src/main.c) diff --git a/firmware/apps/_samples/utils/nrf52840dk_nrf52840.overlay b/firmware/apps/_samples/utils/nrf52840dk_nrf52840.overlay new file mode 100644 index 0000000..4d8fb85 --- /dev/null +++ b/firmware/apps/_samples/utils/nrf52840dk_nrf52840.overlay @@ -0,0 +1,44 @@ +// To get started, press Ctrl+Space (or Option+Esc) to bring up the completion menu and view the available nodes. + +// You can also use the buttons in the sidebar to perform actions on nodes. +// Actions currently available include: + +// * Enabling / disabling the node +// * Adding the bus to a bus +// * Removing the node +// * Connecting ADC channels + +// For more help, browse the DeviceTree documentation at https://docs.zephyrproject.org/latest/guides/dts/index.html +// You can also visit the nRF DeviceTree extension documentation at https://docs.nordicsemi.com/bundle/nrf-connect-vscode/page/guides/ncs_configure_app.html#devicetree-support-in-the-extension + +/ { + chosen { + nordic,pm-ext-flash = &mx25r64; + }; +}; + +&pinctrl { + i2s0_default: i2s0_default { + group1 { + psels = , /* SCK Pin */ + , /* WS/LRCK Pin */ + ; /* SD Pin (DIN am MAX) */ + }; + }; + + i2s0_sleep: i2s0_sleep { + group1 { + psels = , + , + ; + low-power-enable; + }; + }; +}; + +&i2s0 { + status = "okay"; + pinctrl-0 = <&i2s0_default>; + pinctrl-1 = <&i2s0_sleep>; + pinctrl-names = "default", "sleep"; +}; \ No newline at end of file diff --git a/firmware/apps/_samples/utils/pm_static.yml b/firmware/apps/_samples/utils/pm_static.yml new file mode 100644 index 0000000..1f22f30 --- /dev/null +++ b/firmware/apps/_samples/utils/pm_static.yml @@ -0,0 +1,4 @@ +littlefs_storage: + address: 0x0 + size: 0x800000 + region: external_flash diff --git a/firmware/apps/_samples/utils/prj.conf b/firmware/apps/_samples/utils/prj.conf new file mode 100644 index 0000000..8dd85ca --- /dev/null +++ b/firmware/apps/_samples/utils/prj.conf @@ -0,0 +1,14 @@ +CONFIG_LOG=y + +# UART-Grundlagen +CONFIG_SERIAL=y +CONFIG_UART_INTERRUPT_DRIVEN=y + +# Shell-Konfiguration +CONFIG_SHELL=y +CONFIG_SHELL_BACKEND_SERIAL=y + +# Lasertag-spezifische Konfiguration +CONFIG_LASERTAG_UTILS=y +CONFIG_LASERTAG_UTILS_LOG_LEVEL_DBG=y + diff --git a/firmware/apps/_samples/utils/src/main.c b/firmware/apps/_samples/utils/src/main.c new file mode 100644 index 0000000..df9777f --- /dev/null +++ b/firmware/apps/_samples/utils/src/main.c @@ -0,0 +1,24 @@ +#include +#include +#include + +LOG_MODULE_REGISTER(MMS, LOG_LEVEL_INF); + +int main(void) +{ + LOG_INF("Starting Utils test application..."); + lasertag_utils_init(); + + uint8_t data[] = {0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0xba, 0xbe}; + uint8_t crc = lastertag_crc8(data, sizeof(data)); + LOG_INF("CRC8: 0x%02X", crc); + if (crc != 0xbe) { + LOG_ERR("CRC8 check failed!!"); + } else { + LOG_INF("CRC8 check passed."); + } + LOG_INF(FORMAT_BLUE_BOLD("This should be in blue and bold if ANSI color codes are supported in the terminal.")); + LOG_INF("Here, only a part should be " FORMAT_RED("red") " and the rest normal."); + LOG_INF(FORMAT_RED_BOLD("this ") FORMAT_GREEN_BOLD("is ") FORMAT_BLUE_BOLD("colorful") FORMAT_YELLOW_BOLD(" as") FORMAT_BRIGHT_BOLD(" fuck") "!"); + return 0; +} diff --git a/firmware/apps/_samples/utils/tool/requirements.txt b/firmware/apps/_samples/utils/tool/requirements.txt new file mode 100644 index 0000000..a1e37cd --- /dev/null +++ b/firmware/apps/_samples/utils/tool/requirements.txt @@ -0,0 +1,2 @@ +pyserial +cbor2 diff --git a/firmware/apps/_samples/utils/tool/tool.py b/firmware/apps/_samples/utils/tool/tool.py new file mode 100644 index 0000000..9cd5273 --- /dev/null +++ b/firmware/apps/_samples/utils/tool/tool.py @@ -0,0 +1,120 @@ +import serial +import base64 +import cbor2 +import struct +import time +import argparse +import sys + +# Icons (NerdFont / Emoji) +ICON_DIR = "📁" +ICON_FILE = "📄" + +class nRF_FS_Client: + def __init__(self, port, baud): + try: + self.ser = serial.Serial(port, baud, timeout=0.2) + self.seq = 0 + self.ser.reset_input_buffer() + except serial.SerialException as e: + print(f"Fehler: Konnte {port} nicht öffnen ({e})") + sys.exit(1) + + def crc16(self, data): + crc = 0x0000 + for byte in data: + crc ^= (byte << 8) + for _ in range(8): + if crc & 0x8000: + crc = (crc << 1) ^ 0x1021 + else: + crc = crc << 1 + crc &= 0xFFFF + return crc + + def build_packet(self, group, cmd, payload): + self.seq = (self.seq + 1) % 256 + cbor_payload = cbor2.dumps(payload) + header = struct.pack(">BBHHBB", 0x00, 0x08, len(cbor_payload), group, self.seq, cmd) + full_body = header + cbor_payload + checksum = self.crc16(full_body) + full_msg = full_body + struct.pack(">H", checksum) + return struct.pack(">H", len(full_msg)) + full_msg + + def request(self, group, cmd, payload): + packet = self.build_packet(group, cmd, payload) + b64_data = base64.b64encode(packet).decode() + self.ser.write(f"\x06\t{b64_data}\n".encode()) + + full_response_b64 = "" + expected_len = -1 + start_time = time.time() + + while (time.time() - start_time) < 3.0: + line = self.ser.readline().strip() + if not line: + continue + + is_smp = line.startswith(b'\x06\t') or line.startswith(b'\x06\n') + is_cont_special = line.startswith(b'\x04\x14') and expected_len > 0 + + if is_smp or is_cont_special: + full_response_b64 += line[2:].decode() + try: + raw_data = base64.b64decode(full_response_b64) + if expected_len == -1 and len(raw_data) >= 2: + expected_len = struct.unpack(">H", raw_data[:2])[0] + + if expected_len != -1 and len(raw_data) >= expected_len + 2: + if raw_data[8] == self.seq: + return cbor2.loads(raw_data[10:-2]) + except: + continue + return None + + def list_recursive(self, path="/", prefix=""): + res = self.request(64, 0, {"path": path}) + if res is None or 'files' not in res: + return + + # Sortierung: Verzeichnisse zuerst, dann Namen + entries = sorted(res['files'], key=lambda x: (x.get('t', 'f') != 'd', x['n'])) + count = len(entries) + + for i, entry in enumerate(entries): + is_last = (i == count - 1) + name = entry['n'] + is_dir = entry.get('t', 'f').startswith('d') + + # Line-Art Auswahl + # connector = "└── " if is_last else "├── " + connector = "└─ " if is_last else "├─ " + + + print(f"{prefix}{connector}{ICON_DIR if is_dir else ICON_FILE} {name}") + + if is_dir: + # Prefix für die nächste Ebene erweitern + extension = " " if is_last else "│ " + sub_path = f"{path}/{name}".replace("//", "/") + self.list_recursive(sub_path, prefix + extension) + + def close(self): + if hasattr(self, 'ser') and self.ser.is_open: + self.ser.close() + +def main(): + parser = argparse.ArgumentParser(description="nRF52840 LittleFS Tree Tool") + parser.add_argument("port", help="Serieller Port (z.B. /dev/cu.usbmodem...)") + args = parser.parse_args() + + client = nRF_FS_Client(args.port, 115200) + print(f"--- Dateistruktur auf nRF ({args.port}) ---") + try: + # Initialer Aufruf + client.list_recursive("/") + finally: + client.close() + +if __name__ == "__main__": + main() \ No newline at end of file diff --git a/firmware/libs/lasertag_utils/include/lasertag_utils.h b/firmware/libs/lasertag_utils/include/lasertag_utils.h index 2ffc025..2607e69 100644 --- a/firmware/libs/lasertag_utils/include/lasertag_utils.h +++ b/firmware/libs/lasertag_utils/include/lasertag_utils.h @@ -46,6 +46,14 @@ int lasertag_init_watchdog(void); void lasertag_feed_watchdog(void); #endif /* LASERTAG_UTILS_H */ +/** + * @brief Calculate CRC8 checksum for the given data. + * @param data Pointer to the data buffer. + * @param len Length of the data buffer. + * @return Calculated CRC8 checksum. + */ +uint8_t lastertag_crc8 (const uint8_t *data, size_t len); + /** * ANSI Defines for bold text formatting in logs. */ diff --git a/firmware/libs/lasertag_utils/src/lasertag_utils.c b/firmware/libs/lasertag_utils/src/lasertag_utils.c index 21444b6..af3bac7 100644 --- a/firmware/libs/lasertag_utils/src/lasertag_utils.c +++ b/firmware/libs/lasertag_utils/src/lasertag_utils.c @@ -54,6 +54,7 @@ int lasertag_set_device_name(const char *name, size_t len) return settings_save_one("lasertag/name", device_name, len); } +/* --- Watchdog --- */ #ifdef CONFIG_WATCHDOG #include #include @@ -106,4 +107,36 @@ void lasertag_feed_watchdog(void) LOG_DBG("Watchdog '%s' fed successfully", wdt->name); } } -#endif /* CONFIG_WATCHDOG */ \ No newline at end of file +#endif /* CONFIG_WATCHDOG */ + + +/* --- Utility Functions --- */ + +/* CRC8 CCITT polynome lookup table (polynome: 0x07, initial: 0x00) */ +static const uint8_t crc8_table[256] = { + 0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15, 0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D, + 0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, 0x62, 0x65, 0x48, 0x4F, 0x46, 0x41, 0x54, 0x53, 0x5A, 0x5D, + 0xE0, 0xE7, 0xEE, 0xE9, 0xFC, 0xFB, 0xF2, 0xF5, 0xD8, 0xDF, 0xD6, 0xD1, 0xC4, 0xC3, 0xCA, 0xCD, + 0x90, 0x97, 0x9E, 0x99, 0x8C, 0x8B, 0x82, 0x85, 0xA8, 0xAF, 0xA6, 0xA1, 0xB4, 0xB3, 0xBA, 0xBD, + 0xC7, 0xC0, 0xC9, 0xCE, 0xDB, 0xDC, 0xD5, 0xD2, 0xFF, 0xF8, 0xF1, 0xF6, 0xE3, 0xE4, 0xED, 0xEA, + 0xB7, 0xB0, 0xB9, 0xBE, 0xAB, 0xAC, 0xA5, 0xA2, 0x8F, 0x88, 0x81, 0x86, 0x93, 0x94, 0x9D, 0x9A, + 0x27, 0x20, 0x29, 0x2E, 0x3B, 0x3C, 0x35, 0x32, 0x1F, 0x18, 0x11, 0x16, 0x03, 0x04, 0x0D, 0x0A, + 0x57, 0x50, 0x59, 0x5E, 0x4B, 0x4C, 0x45, 0x42, 0x6F, 0x68, 0x61, 0x66, 0x73, 0x74, 0x7D, 0x7A, + 0x89, 0x8E, 0x87, 0x80, 0x95, 0x92, 0x9B, 0x9C, 0xB1, 0xB6, 0xBF, 0xB8, 0xAD, 0xAA, 0xA3, 0xA4, + 0xF9, 0xFE, 0xF7, 0xF0, 0xE5, 0xE2, 0xEB, 0xEC, 0xC1, 0xC6, 0xCF, 0xC8, 0xDD, 0xDA, 0xD3, 0xD4, + 0x69, 0x6E, 0x67, 0x60, 0x75, 0x72, 0x7B, 0x7C, 0x51, 0x56, 0x5F, 0x58, 0x4D, 0x4A, 0x43, 0x44, + 0x19, 0x1E, 0x17, 0x10, 0x05, 0x02, 0x0B, 0x0C, 0x21, 0x26, 0x2F, 0x28, 0x3D, 0x3A, 0x33, 0x34, + 0x4E, 0x49, 0x40, 0x47, 0x52, 0x55, 0x5C, 0x5B, 0x76, 0x71, 0x78, 0x7F, 0x6A, 0x6D, 0x64, 0x63, + 0x3E, 0x39, 0x30, 0x37, 0x22, 0x25, 0x2C, 0x2B, 0x06, 0x01, 0x08, 0x0F, 0x1A, 0x1D, 0x14, 0x13, + 0xAE, 0xA9, 0xA0, 0xA7, 0xB2, 0xB5, 0xBC, 0xBB, 0x96, 0x91, 0x98, 0x9F, 0x8A, 0x8D, 0x84, 0x83, + 0xDE, 0xD9, 0xD0, 0xD7, 0xC2, 0xC5, 0xCC, 0xCB, 0xE6, 0xE1, 0xE8, 0xEF, 0xFA, 0xFD, 0xF4, 0xF3 +}; + +uint8_t lastertag_crc8(const uint8_t *data, size_t len) +{ + uint8_t crc = 0x00; + for (size_t i = 0; i < len; i++) { + crc = crc8_table[crc ^ data[i]]; + } + return crc; +} \ No newline at end of file