aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBen V. Brown <[email protected]>2019-12-31 23:23:56 +1100
committerGitHub <[email protected]>2019-12-31 23:23:56 +1100
commit86d60da935dae18e9877d124a4732a4375bd4e68 (patch)
treefad35057e70f613a36194768edd5e652bad05942
parent0402b7bd2f7bc29c8040837566005a8f3d9ca1bb (diff)
parente1a44185996605a845d2569ea77ce1c0cb1bf98a (diff)
downloadIronOS-86d60da935dae18e9877d124a4732a4375bd4e68.tar.gz
IronOS-86d60da935dae18e9877d124a4732a4375bd4e68.zip
Merge pull request #542 from Ralim/drop-inlinev2.07
Drop inline on QC as not required
-rw-r--r--workspace/TS100/Core/Src/hardware.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/workspace/TS100/Core/Src/hardware.cpp b/workspace/TS100/Core/Src/hardware.cpp
index 3dd306cb..5545f6ce 100644
--- a/workspace/TS100/Core/Src/hardware.cpp
+++ b/workspace/TS100/Core/Src/hardware.cpp
@@ -93,45 +93,45 @@ uint16_t getInputVoltageX10(uint16_t divisor, uint8_t sample) {
return sum * 4 / divisor;
}
#ifdef MODEL_TS80
-inline void DPlusZero_Six() {
+void DPlusZero_Six() {
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_RESET); // pull down D+
}
-inline void DNegZero_Six() {
+void DNegZero_Six() {
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_RESET);
}
-inline void DPlusThree_Three() {
+void DPlusThree_Three() {
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_3, GPIO_PIN_SET); // pull up D+
}
-inline void DNegThree_Three() {
+void DNegThree_Three() {
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_10, GPIO_PIN_SET);
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_8, GPIO_PIN_SET);
}
-inline void QC_Seek9V() {
+void QC_Seek9V() {
DNegZero_Six();
DPlusThree_Three();
}
-inline void QC_Seek12V() {
+void QC_Seek12V() {
DNegZero_Six();
DPlusZero_Six();
}
-inline void QC_Seek20V() {
+void QC_Seek20V() {
DNegThree_Three();
DPlusThree_Three();
}
-inline void QC_SeekContMode() {
+void QC_SeekContMode() {
DNegThree_Three();
DPlusZero_Six();
}
-inline void QC_SeekContPlus() {
+void QC_SeekContPlus() {
QC_SeekContMode();
vTaskDelay(3);
QC_Seek20V();
vTaskDelay(1);
QC_SeekContMode();
}
-inline void QC_SeekContNeg() {
+void QC_SeekContNeg() {
QC_SeekContMode();
vTaskDelay(3);
QC_Seek12V();