diff --git a/Firmware/F303_HITL/.settings/language.settings.xml b/Firmware/F303_HITL/.settings/language.settings.xml
index a645aca..fbe7013 100644
--- a/Firmware/F303_HITL/.settings/language.settings.xml
+++ b/Firmware/F303_HITL/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/coreutils/config/servo_board_config.h b/Firmware/coreutils/config/components.h
similarity index 67%
rename from Firmware/coreutils/config/servo_board_config.h
rename to Firmware/coreutils/config/components.h
index a83dd7f..40fa7e5 100644
--- a/Firmware/coreutils/config/servo_board_config.h
+++ b/Firmware/coreutils/config/components.h
@@ -1,13 +1,18 @@
/*
- * servo_config.h
+ * components.h
*
- * Created on: Jan 30, 2025
- * Author: brandonmarcus
+ * Created on: Mar 5, 2025
+ * Author: zande
*/
-/*
- * The ServoInfo provides information
- */
+#ifndef INC_COREUTILS_CONFIG_COMPONENTS_H_
+#define INC_COREUTILS_CONFIG_COMPONENTS_H_
+
+#include
+
+#include "servo_config.h"
+#include "thermo_config.h"
+#include "heater_config.h"
// Board ID is the ID based on the actual STM32.
// CAN_ID (32 bits, 29 are ID, 1 for IDE, 1 for RTR, 1 is 0)
@@ -45,45 +50,9 @@
// Instance field (5 bits - identifies specific component instance):
// - 0-31: Allows up to 32 instances of each component type per board
// - For example, a board could have up to 32 servos, 32 thermocouples, etc.
-
-
-
-#ifndef INC_COREUTILS_CONFIG_SERVO_BOARD_CONFIG_H_
-#define INC_COREUTILS_CONFIG_SERVO_BOARD_CONFIG_H_
-
-#include
-
-struct Servo;
-struct Thermocouple;
-struct Heater;
-
-typedef struct {
- uint32_t board_uid[3];
- uint32_t can_id;
- char* pnid;
- int closed_deg;
- int open_deg;
- uint16_t frequency;
-} ServoConfig;
-
-typedef struct {
- uint32_t board_uid[3];
- uint32_t can_id;
- char* pnid;
- uint16_t frequency;
-} ThermoConfig;
-
-typedef struct {
- uint32_t board_uid[3];
- uint32_t can_id;
- char* pnid;
- int off_temp;
- int on_temp;
- uint16_t frequency;
-} HeaterConfig;
-
// first 11 bits are always 0 for UID
// BoardID, CAN_ID, NAME, OPEN_ANGLE, CLOSED_ANGLE, UPDATE_FREQUENCY
+
ServoConfig servo_lookup_table[] = {
// {{0x0039002C, 0x48585314, 0x20373733}, 0x00010108, "FV-N02", 0, 45, -1},
{{0x0032002D, 0x48585314, 0x20373733}, 0x00010108, "FV-N03", 0, 135, -1}
@@ -101,6 +70,14 @@ HeaterConfig heater_lookup_table[] = {
{{0x0032002D, 0x48585314, 0x20373733}, 0x00010408, "H-03", 29, 27, 100}
};
+ServoConfig* GET_SERVO_CONFIG(uint32_t* uid) {
+ for (int i = 0; i < sizeof(servo_lookup_table) / sizeof(servo_lookup_table[0]); i++) {
+ if (memcmp(uid, servo_lookup_table[i].uid, sizeof(servo_lookup_table[i].uid)) == 0) {
+ return &servo_lookup_table[i]; // Return pointer to matching ServoConfig
+ }
+ }
+ return NULL; // Return NULL if no match is found
+}
ServoConfig* GET_SERVO_CONFIGS() {
return servo_lookup_table;
@@ -155,43 +132,4 @@ HeaterConfig* GET_HEATER_CONFIG(const uint32_t can_id) {
return NULL; // Return NULL if no match is found
}
-
-// instance-- is after because zero indexed
-uint32_t GET_SERVO_CAN_ID(const uint32_t* board_uid, uint8_t instance) {
- for (int i = 0; i < sizeof(servo_lookup_table) / sizeof(servo_lookup_table[0]); i++) {
- if (memcmp(board_uid, servo_lookup_table[i].board_uid, sizeof(servo_lookup_table[i].board_uid)) == 0) {
- if (instance == 0) {
- return servo_lookup_table[i].can_id;
- }
- instance--;
- }
- }
- return -1;
-}
-
-uint32_t GET_THERMO_CAN_ID(const uint32_t* board_uid, uint8_t instance) {
- for (int i = 0; i < sizeof(thermo_lookup_table) / sizeof(thermo_lookup_table[0]); i++) {
- if (memcmp(board_uid, thermo_lookup_table[i].board_uid, sizeof(thermo_lookup_table[i].board_uid)) == 0) {
- if (instance == 0) {
- return thermo_lookup_table[i].can_id;
- }
- instance--;
- }
- }
- return -1;
-}
-
-uint32_t GET_HEATER_CAN_ID(const uint32_t* board_uid, uint8_t instance) {
- for (int i = 0; i < sizeof(heater_lookup_table) / sizeof(heater_lookup_table[0]); i++) {
- if (memcmp(board_uid, heater_lookup_table[i].board_uid, sizeof(heater_lookup_table[i].board_uid)) == 0) {
- if (instance == 0) {
- return heater_lookup_table[i].can_id;
- }
- instance--;
- }
- }
- return -1;
-}
-
-
-#endif /* INC_COREUTILS_CONFIG_SERVO_BOARD_CONFIG_H_ */
+#endif /* INC_COREUTILS_CONFIG_COMPONENTS_H_ */
diff --git a/Firmware/coreutils/config/config.h b/Firmware/coreutils/config/config.h
index 44fee4b..ad9ed64 100644
--- a/Firmware/coreutils/config/config.h
+++ b/Firmware/coreutils/config/config.h
@@ -9,7 +9,7 @@
#define INC_CONFIG_H_
#include "sensor_board_config.h"
-#include "servo_board_config.h"
+#include "components.h"
#include "pad_config.h"
#include "flight_config.h"
diff --git a/Firmware/coreutils/config/heater_config.h b/Firmware/coreutils/config/heater_config.h
new file mode 100644
index 0000000..812861b
--- /dev/null
+++ b/Firmware/coreutils/config/heater_config.h
@@ -0,0 +1,23 @@
+/*
+ * heater_config.h
+ *
+ * Created on: Mar 5, 2025
+ * Author: zande
+ */
+
+#ifndef INC_COREUTILS_CONFIG_HEATER_CONFIG_H_
+#define INC_COREUTILS_CONFIG_HEATER_CONFIG_H_
+
+#include
+
+struct Heater;
+
+typedef struct {
+ uint32_t uid[3];
+ char* pnid;
+ int off_temp;
+ int on_temp;
+ uint16_t frequency;
+} HeaterConfig;
+
+#endif /* INC_COREUTILS_CONFIG_HEATER_CONFIG_H_ */
diff --git a/Firmware/coreutils/config/servo_config.h b/Firmware/coreutils/config/servo_config.h
new file mode 100644
index 0000000..aaa6b0d
--- /dev/null
+++ b/Firmware/coreutils/config/servo_config.h
@@ -0,0 +1,24 @@
+/*
+ * servo_config.h
+ *
+ * Created on: Mar 5, 2025
+ * Author: zande
+ */
+
+#ifndef INC_COREUTILS_CONFIG_SERVO_CONFIG_H_
+#define INC_COREUTILS_CONFIG_SERVO_CONFIG_H_
+
+#include
+
+struct Servo;
+typedef struct {
+ uint32_t uid[3];
+ char* pnid;
+ int closed_deg;
+ int open_deg;
+ uint16_t frequency;
+} ServoConfig;
+
+
+
+#endif /* INC_COREUTILS_CONFIG_SERVO_CONFIG_H_ */
diff --git a/Firmware/coreutils/config/thermo_config.h b/Firmware/coreutils/config/thermo_config.h
new file mode 100644
index 0000000..82f9413
--- /dev/null
+++ b/Firmware/coreutils/config/thermo_config.h
@@ -0,0 +1,21 @@
+/*
+ * thermo_config.h
+ *
+ * Created on: Mar 5, 2025
+ * Author: zande
+ */
+
+#ifndef INC_COREUTILS_CONFIG_THERMO_CONFIG_H_
+#define INC_COREUTILS_CONFIG_THERMO_CONFIG_H_
+
+#include
+
+struct Thermocouple;
+
+typedef struct {
+ uint32_t uid[3];
+ char* pnid;
+ uint16_t frequency;
+} ThermoConfig;
+
+#endif /* INC_COREUTILS_CONFIG_THERMO_CONFIG_H_ */
diff --git a/Firmware/new-member-projects/Alex_D/blink/.settings/language.settings.xml b/Firmware/new-member-projects/Alex_D/blink/.settings/language.settings.xml
index 1da50d8..21892d2 100644
--- a/Firmware/new-member-projects/Alex_D/blink/.settings/language.settings.xml
+++ b/Firmware/new-member-projects/Alex_D/blink/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/new-member-projects/Alex_D/blink/.settings/stm32cubeide.project.prefs b/Firmware/new-member-projects/Alex_D/blink/.settings/stm32cubeide.project.prefs
index c06adce..1b5059d 100644
--- a/Firmware/new-member-projects/Alex_D/blink/.settings/stm32cubeide.project.prefs
+++ b/Firmware/new-member-projects/Alex_D/blink/.settings/stm32cubeide.project.prefs
@@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=4EFB57242C66A2F320AB8CC1075F7759
66BE74F758C12D739921AEA421D593D3=0
-8DF89ED150041C4CBC7CB9A9CAA90856=02E468D49D9197516C55386B2F5F5AD4
-DC22A860405A8BF2F2C095E5B6529F12=02E468D49D9197516C55386B2F5F5AD4
+8DF89ED150041C4CBC7CB9A9CAA90856=E8737F6BA2D4416BB504CBFF6ED8C87B
+DC22A860405A8BF2F2C095E5B6529F12=B32CCF4515B1C1B76DEFC2D331E6E6E5
eclipse.preferences.version=1
diff --git a/Firmware/new-member-projects/Alex_D/receiver/.settings/language.settings.xml b/Firmware/new-member-projects/Alex_D/receiver/.settings/language.settings.xml
index c61eae8..1087103 100644
--- a/Firmware/new-member-projects/Alex_D/receiver/.settings/language.settings.xml
+++ b/Firmware/new-member-projects/Alex_D/receiver/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/new-member-projects/Alex_D/receiver/.settings/stm32cubeide.project.prefs b/Firmware/new-member-projects/Alex_D/receiver/.settings/stm32cubeide.project.prefs
index e35653b..502baeb 100644
--- a/Firmware/new-member-projects/Alex_D/receiver/.settings/stm32cubeide.project.prefs
+++ b/Firmware/new-member-projects/Alex_D/receiver/.settings/stm32cubeide.project.prefs
@@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=4EFB57242C66A2F320AB8CC1075F7759
66BE74F758C12D739921AEA421D593D3=1
-8DF89ED150041C4CBC7CB9A9CAA90856=02E468D49D9197516C55386B2F5F5AD4
-DC22A860405A8BF2F2C095E5B6529F12=02E468D49D9197516C55386B2F5F5AD4
+8DF89ED150041C4CBC7CB9A9CAA90856=E8737F6BA2D4416BB504CBFF6ED8C87B
+DC22A860405A8BF2F2C095E5B6529F12=491B207B673993633E9038E1847C4B18
eclipse.preferences.version=1
diff --git a/Firmware/new-member-projects/Alex_D/transmit/.settings/language.settings.xml b/Firmware/new-member-projects/Alex_D/transmit/.settings/language.settings.xml
index 559aa9e..6d492a9 100644
--- a/Firmware/new-member-projects/Alex_D/transmit/.settings/language.settings.xml
+++ b/Firmware/new-member-projects/Alex_D/transmit/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/new-member-projects/Alex_D/transmit/.settings/stm32cubeide.project.prefs b/Firmware/new-member-projects/Alex_D/transmit/.settings/stm32cubeide.project.prefs
index 9629d7c..d079067 100644
--- a/Firmware/new-member-projects/Alex_D/transmit/.settings/stm32cubeide.project.prefs
+++ b/Firmware/new-member-projects/Alex_D/transmit/.settings/stm32cubeide.project.prefs
@@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=4EFB57242C66A2F320AB8CC1075F7759
66BE74F758C12D739921AEA421D593D3=3
-8DF89ED150041C4CBC7CB9A9CAA90856=02E468D49D9197516C55386B2F5F5AD4
-DC22A860405A8BF2F2C095E5B6529F12=02E468D49D9197516C55386B2F5F5AD4
+8DF89ED150041C4CBC7CB9A9CAA90856=E8737F6BA2D4416BB504CBFF6ED8C87B
+DC22A860405A8BF2F2C095E5B6529F12=255D3BFE38ED43ED65B478BDFEDE4991
eclipse.preferences.version=1
diff --git a/Firmware/new-member-projects/Justin_F/f401re-blink/.settings/language.settings.xml b/Firmware/new-member-projects/Justin_F/f401re-blink/.settings/language.settings.xml
index 668f5dd..980d45f 100644
--- a/Firmware/new-member-projects/Justin_F/f401re-blink/.settings/language.settings.xml
+++ b/Firmware/new-member-projects/Justin_F/f401re-blink/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/new-member-projects/Justin_F/f401re-receiver/.settings/language.settings.xml b/Firmware/new-member-projects/Justin_F/f401re-receiver/.settings/language.settings.xml
index 0b57349..3855520 100644
--- a/Firmware/new-member-projects/Justin_F/f401re-receiver/.settings/language.settings.xml
+++ b/Firmware/new-member-projects/Justin_F/f401re-receiver/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/new-member-projects/Justin_F/f401re-receiver/.settings/stm32cubeide.project.prefs b/Firmware/new-member-projects/Justin_F/f401re-receiver/.settings/stm32cubeide.project.prefs
index c06adce..786a9f1 100644
--- a/Firmware/new-member-projects/Justin_F/f401re-receiver/.settings/stm32cubeide.project.prefs
+++ b/Firmware/new-member-projects/Justin_F/f401re-receiver/.settings/stm32cubeide.project.prefs
@@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=4EFB57242C66A2F320AB8CC1075F7759
66BE74F758C12D739921AEA421D593D3=0
-8DF89ED150041C4CBC7CB9A9CAA90856=02E468D49D9197516C55386B2F5F5AD4
-DC22A860405A8BF2F2C095E5B6529F12=02E468D49D9197516C55386B2F5F5AD4
+8DF89ED150041C4CBC7CB9A9CAA90856=E8737F6BA2D4416BB504CBFF6ED8C87B
+DC22A860405A8BF2F2C095E5B6529F12=562D395E1C0EB8DB5204A8AAF72461D6
eclipse.preferences.version=1
diff --git a/Firmware/new-member-projects/Justin_F/f401re-transmitter/.settings/language.settings.xml b/Firmware/new-member-projects/Justin_F/f401re-transmitter/.settings/language.settings.xml
index f26051b..eabf902 100644
--- a/Firmware/new-member-projects/Justin_F/f401re-transmitter/.settings/language.settings.xml
+++ b/Firmware/new-member-projects/Justin_F/f401re-transmitter/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/new-member-projects/Justin_F/f401re-transmitter/.settings/stm32cubeide.project.prefs b/Firmware/new-member-projects/Justin_F/f401re-transmitter/.settings/stm32cubeide.project.prefs
index c06adce..63be4fb 100644
--- a/Firmware/new-member-projects/Justin_F/f401re-transmitter/.settings/stm32cubeide.project.prefs
+++ b/Firmware/new-member-projects/Justin_F/f401re-transmitter/.settings/stm32cubeide.project.prefs
@@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=4EFB57242C66A2F320AB8CC1075F7759
66BE74F758C12D739921AEA421D593D3=0
-8DF89ED150041C4CBC7CB9A9CAA90856=02E468D49D9197516C55386B2F5F5AD4
-DC22A860405A8BF2F2C095E5B6529F12=02E468D49D9197516C55386B2F5F5AD4
+8DF89ED150041C4CBC7CB9A9CAA90856=E8737F6BA2D4416BB504CBFF6ED8C87B
+DC22A860405A8BF2F2C095E5B6529F12=1446DB80B377DF948005F3FB001B4C4A
eclipse.preferences.version=1
diff --git a/Firmware/new-member-projects/Neelesh_R/blink/.settings/language.settings.xml b/Firmware/new-member-projects/Neelesh_R/blink/.settings/language.settings.xml
index f4798c6..5946d48 100644
--- a/Firmware/new-member-projects/Neelesh_R/blink/.settings/language.settings.xml
+++ b/Firmware/new-member-projects/Neelesh_R/blink/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/new-member-projects/Neelesh_R/blink/.settings/stm32cubeide.project.prefs b/Firmware/new-member-projects/Neelesh_R/blink/.settings/stm32cubeide.project.prefs
index c06adce..f48edab 100644
--- a/Firmware/new-member-projects/Neelesh_R/blink/.settings/stm32cubeide.project.prefs
+++ b/Firmware/new-member-projects/Neelesh_R/blink/.settings/stm32cubeide.project.prefs
@@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=4EFB57242C66A2F320AB8CC1075F7759
66BE74F758C12D739921AEA421D593D3=0
-8DF89ED150041C4CBC7CB9A9CAA90856=02E468D49D9197516C55386B2F5F5AD4
-DC22A860405A8BF2F2C095E5B6529F12=02E468D49D9197516C55386B2F5F5AD4
+8DF89ED150041C4CBC7CB9A9CAA90856=E8737F6BA2D4416BB504CBFF6ED8C87B
+DC22A860405A8BF2F2C095E5B6529F12=C6B5DB2DD1903B2D020D006DFBC1399C
eclipse.preferences.version=1
diff --git a/Firmware/new-member-projects/Neelesh_R/receiver/.settings/language.settings.xml b/Firmware/new-member-projects/Neelesh_R/receiver/.settings/language.settings.xml
index 11095c7..ff19452 100644
--- a/Firmware/new-member-projects/Neelesh_R/receiver/.settings/language.settings.xml
+++ b/Firmware/new-member-projects/Neelesh_R/receiver/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/new-member-projects/Neelesh_R/receiver/.settings/stm32cubeide.project.prefs b/Firmware/new-member-projects/Neelesh_R/receiver/.settings/stm32cubeide.project.prefs
index e35653b..924ab68 100644
--- a/Firmware/new-member-projects/Neelesh_R/receiver/.settings/stm32cubeide.project.prefs
+++ b/Firmware/new-member-projects/Neelesh_R/receiver/.settings/stm32cubeide.project.prefs
@@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=4EFB57242C66A2F320AB8CC1075F7759
66BE74F758C12D739921AEA421D593D3=1
-8DF89ED150041C4CBC7CB9A9CAA90856=02E468D49D9197516C55386B2F5F5AD4
-DC22A860405A8BF2F2C095E5B6529F12=02E468D49D9197516C55386B2F5F5AD4
+8DF89ED150041C4CBC7CB9A9CAA90856=E8737F6BA2D4416BB504CBFF6ED8C87B
+DC22A860405A8BF2F2C095E5B6529F12=6389FEB0E9536BD5C40A0356C1CFE7C5
eclipse.preferences.version=1
diff --git a/Firmware/new-member-projects/Neelesh_R/transmitter/.settings/language.settings.xml b/Firmware/new-member-projects/Neelesh_R/transmitter/.settings/language.settings.xml
index 2b76e22..17222ad 100644
--- a/Firmware/new-member-projects/Neelesh_R/transmitter/.settings/language.settings.xml
+++ b/Firmware/new-member-projects/Neelesh_R/transmitter/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/new-member-projects/Neelesh_R/transmitter/.settings/stm32cubeide.project.prefs b/Firmware/new-member-projects/Neelesh_R/transmitter/.settings/stm32cubeide.project.prefs
index c06adce..7a2f2f9 100644
--- a/Firmware/new-member-projects/Neelesh_R/transmitter/.settings/stm32cubeide.project.prefs
+++ b/Firmware/new-member-projects/Neelesh_R/transmitter/.settings/stm32cubeide.project.prefs
@@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=4EFB57242C66A2F320AB8CC1075F7759
66BE74F758C12D739921AEA421D593D3=0
-8DF89ED150041C4CBC7CB9A9CAA90856=02E468D49D9197516C55386B2F5F5AD4
-DC22A860405A8BF2F2C095E5B6529F12=02E468D49D9197516C55386B2F5F5AD4
+8DF89ED150041C4CBC7CB9A9CAA90856=E8737F6BA2D4416BB504CBFF6ED8C87B
+DC22A860405A8BF2F2C095E5B6529F12=CC8583F6B4C847F4E1B5B5C8560CDC95
eclipse.preferences.version=1
diff --git a/Firmware/new-member-projects/NickyS/NickyNMP/blink/.settings/language.settings.xml b/Firmware/new-member-projects/NickyS/NickyNMP/blink/.settings/language.settings.xml
index 77e9fce..fb750d6 100644
--- a/Firmware/new-member-projects/NickyS/NickyNMP/blink/.settings/language.settings.xml
+++ b/Firmware/new-member-projects/NickyS/NickyNMP/blink/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/new-member-projects/NickyS/NickyNMP/blink/.settings/stm32cubeide.project.prefs b/Firmware/new-member-projects/NickyS/NickyNMP/blink/.settings/stm32cubeide.project.prefs
index c06adce..b7b2a82 100644
--- a/Firmware/new-member-projects/NickyS/NickyNMP/blink/.settings/stm32cubeide.project.prefs
+++ b/Firmware/new-member-projects/NickyS/NickyNMP/blink/.settings/stm32cubeide.project.prefs
@@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=4EFB57242C66A2F320AB8CC1075F7759
66BE74F758C12D739921AEA421D593D3=0
-8DF89ED150041C4CBC7CB9A9CAA90856=02E468D49D9197516C55386B2F5F5AD4
-DC22A860405A8BF2F2C095E5B6529F12=02E468D49D9197516C55386B2F5F5AD4
+8DF89ED150041C4CBC7CB9A9CAA90856=E8737F6BA2D4416BB504CBFF6ED8C87B
+DC22A860405A8BF2F2C095E5B6529F12=5126144FB937F32BFB3CCC73E0E5E84C
eclipse.preferences.version=1
diff --git a/Firmware/new-member-projects/NickyS/NickyNMP/receiver/.settings/language.settings.xml b/Firmware/new-member-projects/NickyS/NickyNMP/receiver/.settings/language.settings.xml
index bf48d5e..67bf607 100644
--- a/Firmware/new-member-projects/NickyS/NickyNMP/receiver/.settings/language.settings.xml
+++ b/Firmware/new-member-projects/NickyS/NickyNMP/receiver/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/new-member-projects/NickyS/NickyNMP/receiver/.settings/stm32cubeide.project.prefs b/Firmware/new-member-projects/NickyS/NickyNMP/receiver/.settings/stm32cubeide.project.prefs
index c06adce..98cb68e 100644
--- a/Firmware/new-member-projects/NickyS/NickyNMP/receiver/.settings/stm32cubeide.project.prefs
+++ b/Firmware/new-member-projects/NickyS/NickyNMP/receiver/.settings/stm32cubeide.project.prefs
@@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=4EFB57242C66A2F320AB8CC1075F7759
66BE74F758C12D739921AEA421D593D3=0
-8DF89ED150041C4CBC7CB9A9CAA90856=02E468D49D9197516C55386B2F5F5AD4
-DC22A860405A8BF2F2C095E5B6529F12=02E468D49D9197516C55386B2F5F5AD4
+8DF89ED150041C4CBC7CB9A9CAA90856=E8737F6BA2D4416BB504CBFF6ED8C87B
+DC22A860405A8BF2F2C095E5B6529F12=581D7011EDF79A6CBD40693678A69A6A
eclipse.preferences.version=1
diff --git a/Firmware/new-member-projects/NickyS/NickyNMP/transmitter/.settings/language.settings.xml b/Firmware/new-member-projects/NickyS/NickyNMP/transmitter/.settings/language.settings.xml
index a5a1a1f..4e7bcdb 100644
--- a/Firmware/new-member-projects/NickyS/NickyNMP/transmitter/.settings/language.settings.xml
+++ b/Firmware/new-member-projects/NickyS/NickyNMP/transmitter/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/Firmware/new-member-projects/NickyS/NickyNMP/transmitter/.settings/stm32cubeide.project.prefs b/Firmware/new-member-projects/NickyS/NickyNMP/transmitter/.settings/stm32cubeide.project.prefs
index e35653b..1293e1f 100644
--- a/Firmware/new-member-projects/NickyS/NickyNMP/transmitter/.settings/stm32cubeide.project.prefs
+++ b/Firmware/new-member-projects/NickyS/NickyNMP/transmitter/.settings/stm32cubeide.project.prefs
@@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=4EFB57242C66A2F320AB8CC1075F7759
66BE74F758C12D739921AEA421D593D3=1
-8DF89ED150041C4CBC7CB9A9CAA90856=02E468D49D9197516C55386B2F5F5AD4
-DC22A860405A8BF2F2C095E5B6529F12=02E468D49D9197516C55386B2F5F5AD4
+8DF89ED150041C4CBC7CB9A9CAA90856=E8737F6BA2D4416BB504CBFF6ED8C87B
+DC22A860405A8BF2F2C095E5B6529F12=A79F9C2A3A49489A96D0C60D51E5DFBD
eclipse.preferences.version=1