From 88f78274783e9a867de00b0a3b0225a5cf081d41 Mon Sep 17 00:00:00 2001 From: Nemanja Stojoski Date: Sun, 8 Oct 2023 13:36:59 +0200 Subject: [PATCH 1/2] Fix testing phrase CRC calculation --- ground_station/src/telemetry/telemetry.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground_station/src/telemetry/telemetry.cpp b/ground_station/src/telemetry/telemetry.cpp index 7e3f14bb..05dbeeff 100644 --- a/ground_station/src/telemetry/telemetry.cpp +++ b/ground_station/src/telemetry/telemetry.cpp @@ -68,7 +68,7 @@ void Telemetry::initLink() { } if (testingPhrase[0] != 0) { - testingCrc = crc32(testingPhrase, strlen((const char*)linkPhrase)); + testingCrc = crc32(testingPhrase, strlen((const char*)testingPhrase)); } } From f3690e589aec9a1859d561b387668b126b99b98f Mon Sep 17 00:00:00 2001 From: Nemanja Stojoski Date: Sun, 8 Oct 2023 13:46:43 +0200 Subject: [PATCH 2/2] Update GS & FC versions --- flight_computer/platformio.ini | 2 +- ground_station/platformio.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flight_computer/platformio.ini b/flight_computer/platformio.ini index e0a19dbf..c7b5fd84 100644 --- a/flight_computer/platformio.ini +++ b/flight_computer/platformio.ini @@ -35,7 +35,7 @@ check_src_filters = build_unflags=-fno-rtti build_flags = - -D FIRMWARE_VERSION='"3.0.0-RC2"' + -D FIRMWARE_VERSION='"3.0.0"' -D ARM_MATH_CM4 -D ARM_MATH_MATRIX_CHECK -D ARM_MATH_ROUNDING diff --git a/ground_station/platformio.ini b/ground_station/platformio.ini index f703f6ed..dbdec98b 100644 --- a/ground_station/platformio.ini +++ b/ground_station/platformio.ini @@ -65,7 +65,7 @@ lib_deps = build_flags = -DCFG_TUSB_CONFIG_FILE='"sdkconfig.h"' ; Use default TinyUSB configuration - -DFIRMWARE_VERSION='"1.0.0"' ; Enter Firmware Version here + -DFIRMWARE_VERSION='"1.0.1"' ; Enter Firmware Version here -DUSB_MANUFACTURER='"CATS"' ; USB Manufacturer string -DUSB_PRODUCT='"CATS Groundstation"' ; USB Product String -D USB_SERIAL="0" ; Enter Device Serial Number here