diff --git a/.cproject b/.cproject
index e0f1588..6133e0c 100644
--- a/.cproject
+++ b/.cproject
@@ -32,6 +32,9 @@
+
@@ -57,6 +60,7 @@
+
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index ff2d585..96f5bd0 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
@@ -16,7 +16,7 @@
-
+
diff --git a/App/Src/tasks/relay.cpp b/App/Src/tasks/relay.cpp
index f2c9550..bfdeaee 100644
--- a/App/Src/tasks/relay.cpp
+++ b/App/Src/tasks/relay.cpp
@@ -26,41 +26,41 @@ void RelayTask::func() {
switch (dev) {
case 1:
if (value == 1) {
- HAL_GPIO_WritePin(RELAY1_GROUP, RELAY1_GROUP_PIN, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(RELAY1_GROUP, RELAY1_PIN, GPIO_PIN_SET);
} else if (value == 0) {
- HAL_GPIO_WritePin(RELAY1_GROUP, RELAY1_GROUP_PIN, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(RELAY1_GROUP, RELAY1_PIN, GPIO_PIN_RESET);
}
break;
case 2:
if (value == 1) {
- HAL_GPIO_WritePin(RELAY2_GROUP, RELAY2_GROUP_PIN, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(RELAY2_GROUP, RELAY2_PIN, GPIO_PIN_SET);
} else if (value == 0) {
- HAL_GPIO_WritePin(RELAY2_GROUP, RELAY2_GROUP_PIN, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(RELAY2_GROUP, RELAY2_PIN, GPIO_PIN_RESET);
}
break;
case 3:
if (value == 1) {
- HAL_GPIO_WritePin(RELAY3_GROUP, RELAY3_GROUP_PIN, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(RELAY3_GROUP, RELAY3_PIN, GPIO_PIN_SET);
} else if (value == 0) {
- HAL_GPIO_WritePin(RELAY3_GROUP, RELAY3_GROUP_PIN, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(RELAY3_GROUP, RELAY3_PIN, GPIO_PIN_RESET);
}
break;
case 4:
if (value == 1) {
- HAL_GPIO_WritePin(RELAY4_GROUP, RELAY4_GROUP_PIN, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(RELAY4_GROUP, RELAY4_PIN, GPIO_PIN_SET);
} else if (value == 0) {
- HAL_GPIO_WritePin(RELAY4_GROUP, RELAY4_GROUP_PIN, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(RELAY4_GROUP, RELAY4_PIN, GPIO_PIN_RESET);
}
break;
case 5:
if (value == 1) {
- HAL_GPIO_WritePin(RELAY5_GROUP, RELAY5_GROUP_PIN, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(RELAY5_GROUP, RELAY5_PIN, GPIO_PIN_SET);
} else if (value == 0) {
- HAL_GPIO_WritePin(RELAY5_GROUP, RELAY5_GROUP_PIN, GPIO_PIN_RESET);
+ HAL_GPIO_WritePin(RELAY5_GROUP, RELAY5_PIN, GPIO_PIN_RESET);
}
break;
}
diff --git a/CAN-Demo Debug.launch b/CAN-Demo Debug.launch
index 9dae82a..e4e4ec8 100644
--- a/CAN-Demo Debug.launch
+++ b/CAN-Demo Debug.launch
@@ -40,7 +40,7 @@
-
+
diff --git a/Libs/TACOS b/Libs/TACOS
index 39024e4..8637be5 160000
--- a/Libs/TACOS
+++ b/Libs/TACOS
@@ -1 +1 @@
-Subproject commit 39024e4a8c53ed19f9313a1d52adff763d06ba75
+Subproject commit 8637be5bc9ee9d5dd9498b48653eab8fd17b133f