[Lib] Change LedBar function name getNumberOfLed to getNumberOfLeds

This commit is contained in:
Phat Nguyen
2024-02-04 15:48:06 +07:00
parent 512420f5a2
commit b2762a3b6c
5 changed files with 26 additions and 27 deletions

View File

@ -846,10 +846,10 @@ static void setRGBledColor(char color) {
} }
/** Sensor LED indicator has only show status on last 2 LED on LED Bar */ /** Sensor LED indicator has only show status on last 2 LED on LED Bar */
int ledNum = ag.ledBar.getNumberOfLed() - 1; int ledNum = ag.ledBar.getNumberOfLeds() - 1;
ag.ledBar.setColor(r, g, b, ledNum); ag.ledBar.setColor(r, g, b, ledNum);
ledNum = ag.ledBar.getNumberOfLed() - 2; ledNum = ag.ledBar.getNumberOfLeds() - 2;
ag.ledBar.setColor(r, g, b, ledNum); ag.ledBar.setColor(r, g, b, ledNum);
} }
@ -969,7 +969,7 @@ static void singleLedAnimation(uint8_t r, uint8_t g, uint8_t b) {
ag.ledBar.setColor(r, g, b, ledCount); ag.ledBar.setColor(r, g, b, ledCount);
} else { } else {
ledCount++; ledCount++;
if (ledCount >= ag.ledBar.getNumberOfLed()) { if (ledCount >= ag.ledBar.getNumberOfLeds()) {
ledCount = 0; ledCount = 0;
} }
ag.ledBar.setColor(r, g, b, ledCount); ag.ledBar.setColor(r, g, b, ledCount);
@ -993,7 +993,7 @@ static void ledSmHandler(int sm) {
/** In WiFi Manager Mode */ /** In WiFi Manager Mode */
/** Turn LED OFF */ /** Turn LED OFF */
/** Turn midle LED Color */ /** Turn midle LED Color */
ag.ledBar.setColor(0, 0, 255, ag.ledBar.getNumberOfLed() / 2); ag.ledBar.setColor(0, 0, 255, ag.ledBar.getNumberOfLeds() / 2);
break; break;
} }
case APP_SM_WIFI_MAMAGER_PORTAL_ACTIVE: { case APP_SM_WIFI_MAMAGER_PORTAL_ACTIVE: {
@ -1166,8 +1166,8 @@ static void sensorLedColorHandler(void) {
setRGBledPMcolor(pm25); setRGBledPMcolor(pm25);
break; break;
default: default:
ag.ledBar.setColor(0, 0, 0, ag.ledBar.getNumberOfLed() - 1); ag.ledBar.setColor(0, 0, 0, ag.ledBar.getNumberOfLeds() - 1);
ag.ledBar.setColor(0, 0, 0, ag.ledBar.getNumberOfLed() - 2); ag.ledBar.setColor(0, 0, 0, ag.ledBar.getNumberOfLeds() - 2);
break; break;
} }
} }

View File

@ -11,8 +11,8 @@
/** /**
* @brief Define test board * @brief Define test board
*/ */
#define TEST_BOARD_OUTDOOR_MONITOR_V1_3 0 #define TEST_OPEN_AIR_OUTDOOR 0
#define TEST_BOARD_ONE_INDOOR_MONITOR_V9_0 1 #define TEST_ONE_INDOOR 1
/** /**
* @brief Define test sensor * @brief Define test sensor
*/ */
@ -21,21 +21,21 @@
#define TEST_SENSOR_SGP4x 0 #define TEST_SENSOR_SGP4x 0
#define TEST_SWITCH 0 #define TEST_SWITCH 0
#define TEST_OLED 0 #define TEST_OLED 0
#if TEST_BOARD_OUTDOOR_MONITOR_V1_3 #if TEST_OPEN_AIR_OUTDOOR
#define TEST_STATUS_LED 0 #define TEST_STATUS_LED 0
#define TEST_PMS5003T 1 #define TEST_PMS5003T 1
#endif #endif
#define TEST_WATCHDOG 1 #define TEST_WATCHDOG 1
#if TEST_BOARD_ONE_INDOOR_MONITOR_V9_0 #if TEST_ONE_INDOOR
#define TEST_LED_BAR 1 #define TEST_LED_BAR 1
#define TEST_SENSOR_PMS5003 0 #define TEST_SENSOR_PMS5003 0
#endif #endif
#if TEST_BOARD_OUTDOOR_MONITOR_V1_3 #if TEST_OPEN_AIR_OUTDOOR
AirGradient ag(BOARD_OUTDOOR_MONITOR_V1_3); AirGradient ag(OPEN_AIR_OUTDOOR);
#elif TEST_BOARD_ONE_INDOOR_MONITOR_V9_0 #elif TEST_ONE_INDOOR
AirGradient ag(BOARD_ONE_INDOOR_MONITOR_V9_0); AirGradient ag(ONE_INDOOR);
#else #else
#error "Must enable board test #error "Must enable board test
#endif #endif
@ -237,14 +237,14 @@ void loop() {
#if TEST_LED #if TEST_LED
static uint32_t ledTime; static uint32_t ledTime;
#if TEST_BOARD_OUTDOOR_MONITOR_V1_3 #if TEST_OPEN_AIR_OUTDOOR
// ms = (uint32_t)(millis() - ledTime); // ms = (uint32_t)(millis() - ledTime);
// if(ms >= 500) // if(ms >= 500)
// { // {
// ledTime = millis(); // ledTime = millis();
// led.ledToggle(); // led.ledToggle();
// } // }
#elif TEST_BOARD_ONE_INDOOR_MONITOR_V9_0 #elif TEST_ONE_INDOOR
static int ledIndex; static int ledIndex;
static int ledIndexOld; static int ledIndexOld;
@ -262,7 +262,7 @@ void loop() {
led.ledSetColor(255, 0, 0, ledIndex); led.ledSetColor(255, 0, 0, ledIndex);
ledIndexOld = ledIndex; ledIndexOld = ledIndex;
ledIndex++; ledIndex++;
if (ledIndex >= led.getNumberOfLed()) { if (ledIndex >= led.getNumberOfLeds()) {
ledIndex = 0; ledIndex = 0;
} }
} }
@ -293,7 +293,7 @@ void loop() {
static bool ledOn = false; static bool ledOn = false;
if (ledNum == 0) { if (ledNum == 0) {
ledNum = ag.ledBar.getNumberOfLed(); ledNum = ag.ledBar.getNumberOfLeds();
log_i("Get number of led: %d", ledNum); log_i("Get number of led: %d", ledNum);
if (ledNum) { if (ledNum) {
ag.ledBar.setBrighness(0xff); ag.ledBar.setBrighness(0xff);

View File

@ -4,8 +4,7 @@
/** /**
* @brief Define test board * @brief Define test board
*/ */
#define TEST_BOARD_DIY_BASIC_KIT 0 #define TEST_DIY_BASIC 1
#define TEST_BOARD_DIY_PRO_INDOOR_V4_2 1
/** /**
* @brief Define test sensor * @brief Define test sensor
@ -17,10 +16,10 @@
#define TEST_SWITCH 0 #define TEST_SWITCH 0
#define TEST_OLED 0 #define TEST_OLED 0
#if TEST_BOARD_DIY_BASIC_KIT #if TEST_DIY_BASIC
AirGradient ag(BOARD_DIY_BASIC_KIT); AirGradient ag(DIY_BASIC);
#elif TEST_BOARD_DIY_PRO_INDOOR_V4_2 #elif TEST_DIY_PRO_INDOOR_V4_2
AirGradient ag(BOARD_DIY_PRO_INDOOR_V4_2); AirGradient ag(DIY_PRO_INDOOR_V4_2);
#else #else
#error "Board test not defined" #error "Board test not defined"
#endif #endif

View File

@ -48,7 +48,7 @@ void LedBar::begin(void) {
* @param red Color Red (0 - 255) * @param red Color Red (0 - 255)
* @param green Color Green (0 - 255) * @param green Color Green (0 - 255)
* @param blue Color Blue (0 - 255) * @param blue Color Blue (0 - 255)
* @param ledNum Index of LED from 0 to getNumberOfLed() - 1 * @param ledNum Index of LED from 0 to getNumberOfLeds() - 1
*/ */
void LedBar::setColor(uint8_t red, uint8_t green, uint8_t blue, int ledNum) { void LedBar::setColor(uint8_t red, uint8_t green, uint8_t blue, int ledNum) {
if (this->ledNumInvalid(ledNum)) { if (this->ledNumInvalid(ledNum)) {
@ -75,7 +75,7 @@ void LedBar::setBrighness(uint8_t brightness) {
* *
* @return int Number of LED * @return int Number of LED
*/ */
int LedBar::getNumberOfLed(void) { int LedBar::getNumberOfLeds(void) {
if (this->isBegin() == false) { if (this->isBegin() == false) {
return 0; return 0;
} }

View File

@ -20,7 +20,7 @@ public:
void setColor(uint8_t red, uint8_t green, uint8_t blue, int ledNum); void setColor(uint8_t red, uint8_t green, uint8_t blue, int ledNum);
void setColor(uint8_t red, uint8_t green, uint8_t blue); void setColor(uint8_t red, uint8_t green, uint8_t blue);
void setBrighness(uint8_t brightness); void setBrighness(uint8_t brightness);
int getNumberOfLed(void); int getNumberOfLeds(void);
void show(void); void show(void);
void clear(void); void clear(void);