From 43e94488a2d21ff478835c58df13226baac27560 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 05 一月 2024 18:10:00 +0800
Subject: [PATCH] 修复bug
---
ExternalDevices/WS2812.c | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/ExternalDevices/WS2812.c b/ExternalDevices/WS2812.c
index 55c2af2..4e9ceaf 100644
--- a/ExternalDevices/WS2812.c
+++ b/ExternalDevices/WS2812.c
@@ -25,9 +25,11 @@
__NOP();
__NOP();
__NOP();
+ __NOP();
// w28delay(0);
GPIOB->BRR = LED_GPIO;
// __NOP();
+ __NOP();
__NOP();
__NOP();
__NOP();
@@ -43,15 +45,15 @@
__NOP();
__NOP();
__NOP();
-// __NOP();
+ __NOP();
// __NOP();
//w28delay(0);
GPIOB->BRR = LED_GPIO;
- __NOP();
__NOP();
__NOP();
-// __NOP();
-// __NOP();
+ __NOP();
+ __NOP();
+ __NOP();
//w28delay(0);
}
@@ -94,17 +96,20 @@
// GPIOB->BSRR = 0X0080;
}
//uint32_t led1,led2,led3,led4,led5;
-void Set4LEDColor(uint32_t firstled,uint32_t secondled,uint32_t thirdled,uint32_t fourthled)
+void Set4LEDColor(uint32_t firstled,uint32_t fourthled,uint32_t thirdled,uint32_t secondled)
{
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_SET);
//__disable_irq();
RGB_Rst();
- RGB_Set(firstled);
- RGB_Set(secondled);
- RGB_Set(thirdled);
RGB_Set(fourthled);
+ RGB_Set(thirdled);
+ RGB_Set(secondled);
+ RGB_Set(firstled);
-
+// RGB_Set(firstled);
+// RGB_Set(secondled);
+// RGB_Set(thirdled);
+// RGB_Set(fourthled);
//__enable_irq();
@@ -113,7 +118,7 @@
}
-void RGB_Set_RED()
+void RGB_Set_RED(void)
{
RGB_Set_Down();
RGB_Set_Down();
@@ -146,7 +151,7 @@
RGB_Set_Down();
}
-void RGB_Set_GREEN()
+void RGB_Set_GREEN(void)
{
RGB_Set_Up();
RGB_Set_Up();
@@ -179,7 +184,7 @@
RGB_Set_Down();
}
-void RGB_Set_BLUE()
+void RGB_Set_BLUE(void)
{
RGB_Set_Down();
RGB_Set_Down();
@@ -245,7 +250,7 @@
RGB_Set_Up();
}
-void RGB_Set_LEDOFF()
+void RGB_Set_LEDOFF(void)
{
RGB_Set_Down();
RGB_Set_Down();
@@ -277,7 +282,8 @@
RGB_Set_Down();
RGB_Set_Down();
}
-void Set4LEDColor_Off()
+void Set4LEDColor_Off(void)
{
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_15, GPIO_PIN_RESET);
-}
\ No newline at end of file
+}
+
--
Gitblit v1.9.3