From 1b56c2e7f7accd8ee6e45c53a2822986964b1a69 Mon Sep 17 00:00:00 2001 From: Michael Miller Date: Thu, 18 Feb 2021 14:36:17 -0800 Subject: [PATCH] builds (#440) --- keywords.txt | 14 +++++++++++ src/internal/NeoNrf52xMethod.h | 44 ++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/keywords.txt b/keywords.txt index 5e73beb..1e281f9 100644 --- a/keywords.txt +++ b/keywords.txt @@ -44,6 +44,7 @@ NeoWs2811Method KEYWORD1 NeoSk6812Method KEYWORD1 NeoTm1814Method KEYWORD1 NeoTm1829Method KEYWORD1 +NeoTx1812Method KEYWORD1 NeoLc8812Method KEYWORD1 NeoApa106Method KEYWORD1 Neo800KbpsInvertedMethod KEYWORD1 @@ -55,6 +56,7 @@ NeoWs2811InvertedMethod KEYWORD1 NeoSk6812InvertedMethod KEYWORD1 NeoTm1814InvertedMethod KEYWORD1 NeoTm1829InvertedMethod KEYWORD1 +NeoTx1812InvertedMethod KEYWORD1 NeoLc8812InvertedMethod KEYWORD1 NeoApa106InvertedMethod KEYWORD1 NeoEsp8266DmaWs2812xMethod KEYWORD1 @@ -388,6 +390,8 @@ NeoEsp32BitBang400KbpsInvertedMethod KEYWORD1 NeoNrf52xPwmNWs2812xMethod KEYWORD1 NeoNrf52xPwmNSk6812Method KEYWORD1 NeoNrf52xPwmNTm1814Method KEYWORD1 +NeoNrf52xPwmNTm1829Method KEYWORD1 +NeoNrf52xPwmNTx1812Method KEYWORD1 NeoNrf52xPwmN800KbpsMethod KEYWORD1 NeoNrf52xPwmN400KbpsMethod KEYWORD1 NeoNrf52xPwmNApa106Method KEYWORD1 @@ -395,6 +399,7 @@ NeoNrf52xPwm0Ws2812xMethod KEYWORD1 NeoNrf52xPwm0Sk6812Method KEYWORD1 NeoNrf52xPwm0Tm1814Method KEYWORD1 NeoNrf52xPwm0Tm1829Method KEYWORD1 +NeoNrf52xPwm0Tx1812Method KEYWORD1 NeoNrf52xPwm0800KbpsMethod KEYWORD1 NeoNrf52xPwm0400KbpsMethod KEYWORD1 NeoNrf52xPwm0Apa106Method KEYWORD1 @@ -402,6 +407,7 @@ NeoNrf52xPwm1Ws2812xMethod KEYWORD1 NeoNrf52xPwm1Sk6812Method KEYWORD1 NeoNrf52xPwm1Tm1814Method KEYWORD1 NeoNrf52xPwm1Tm1829Method KEYWORD1 +NeoNrf52xPwm1Tx1812Method KEYWORD1 NeoNrf52xPwm1800KbpsMethod KEYWORD1 NeoNrf52xPwm1400KbpsMethod KEYWORD1 NeoNrf52xPwm1Apa106Method KEYWORD1 @@ -409,6 +415,7 @@ NeoNrf52xPwm2Ws2812xMethod KEYWORD1 NeoNrf52xPwm2Sk6812Method KEYWORD1 NeoNrf52xPwm2Tm1814Method KEYWORD1 NeoNrf52xPwm2Tm1829Method KEYWORD1 +NeoNrf52xPwm2Tx1812Method KEYWORD1 NeoNrf52xPwm2800KbpsMethod KEYWORD1 NeoNrf52xPwm2400KbpsMethod KEYWORD1 NeoNrf52xPwm2Apa106Method KEYWORD1 @@ -416,12 +423,15 @@ NeoNrf52xPwm3Ws2812xMethod KEYWORD1 NeoNrf52xPwm3Sk6812Method KEYWORD1 NeoNrf52xPwm3Tm1814Method KEYWORD1 NeoNrf52xPwm3Tm1829Method KEYWORD1 +NeoNrf52xPwm3Tx1812Method KEYWORD1 NeoNrf52xPwm3800KbpsMethod KEYWORD1 NeoNrf52xPwm3400KbpsMethod KEYWORD1 NeoNrf52xPwm3Apa106Method KEYWORD1 NeoNrf52xPwmNWs2812xInvertedMethod KEYWORD1 NeoNrf52xPwmNSk6812InvertedMethod KEYWORD1 NeoNrf52xPwmNTm1814InvertedMethod KEYWORD1 +NeoNrf52xPwmNTm1829InvertedMethod KEYWORD1 +NeoNrf52xPwmNTx1812InvertedMethod KEYWORD1 NeoNrf52xPwmN800KbpsInvertedMethod KEYWORD1 NeoNrf52xPwmN400KbpsInvertedMethod KEYWORD1 NeoNrf52xPwmNApa106InvertedMethod KEYWORD1 @@ -429,6 +439,7 @@ NeoNrf52xPwm0Ws2812xInvertedMethod KEYWORD1 NeoNrf52xPwm0Sk6812InvertedMethod KEYWORD1 NeoNrf52xPwm0Tm1814InvertedMethod KEYWORD1 NeoNrf52xPwm0Tm1829InvertedMethod KEYWORD1 +NeoNrf52xPwm0Tx1812InvertedMethod KEYWORD1 NeoNrf52xPwm0800KbpsInvertedMethod KEYWORD1 NeoNrf52xPwm0400KbpsInvertedMethod KEYWORD1 NeoNrf52xPwm0Apa106InvertedMethod KEYWORD1 @@ -436,6 +447,7 @@ NeoNrf52xPwm1Ws2812xInvertedMethod KEYWORD1 NeoNrf52xPwm1Sk6812InvertedMethod KEYWORD1 NeoNrf52xPwm1Tm1814InvertedMethod KEYWORD1 NeoNrf52xPwm1Tm1829InvertedMethod KEYWORD1 +NeoNrf52xPwm1Tx1812InvertedMethod KEYWORD1 NeoNrf52xPwm1800KbpsInvertedMethod KEYWORD1 NeoNrf52xPwm1400KbpsInvertedMethod KEYWORD1 NeoNrf52xPwm1Apa106InvertedMethod KEYWORD1 @@ -443,6 +455,7 @@ NeoNrf52xPwm2Ws2812xInvertedMethod KEYWORD1 NeoNrf52xPwm2Sk6812InvertedMethod KEYWORD1 NeoNrf52xPwm2Tm1814InvertedMethod KEYWORD1 NeoNrf52xPwm2Tm1829InvertedMethod KEYWORD1 +NeoNrf52xPwm2Tx1812InvertedMethod KEYWORD1 NeoNrf52xPwm2800KbpsInvertedMethod KEYWORD1 NeoNrf52xPwm2400KbpsInvertedMethod KEYWORD1 NeoNrf52xPwm2Apa106InvertedMethod KEYWORD1 @@ -450,6 +463,7 @@ NeoNrf52xPwm3Ws2812xInvertedMethod KEYWORD1 NeoNrf52xPwm3Sk6812InvertedMethod KEYWORD1 NeoNrf52xPwm3Tm1814InvertedMethod KEYWORD1 NeoNrf52xPwm3Tm1829InvertedMethod KEYWORD1 +NeoNrf52xPwm3Tx1812InvertedMethod KEYWORD1 NeoNrf52xPwm3800KbpsInvertedMethod KEYWORD1 NeoNrf52xPwm3400KbpsInvertedMethod KEYWORD1 NeoNrf52xPwm3Apa106InvertedMethod KEYWORD1 diff --git a/src/internal/NeoNrf52xMethod.h b/src/internal/NeoNrf52xMethod.h index 970bd8f..05f82b5 100644 --- a/src/internal/NeoNrf52xMethod.h +++ b/src/internal/NeoNrf52xMethod.h @@ -125,6 +125,17 @@ public: const static PinStatus IdleLevel = LOW; }; +class NeoNrf52xPwmSpeedTx1812 +{ +public: + const static uint32_t CountTop = 14UL; // ~0.875us (target is 0.9us) + const static nrf_pwm_values_common_t Bit0 = 5 | 0x8000; // ~0.3125us (target is 0.3) + const static nrf_pwm_values_common_t Bit1 = 10 | 0x8000; // ~0.625us (target is 0.6) + const static nrf_pwm_values_common_t BitReset = 0x8000; // LOW + const static uint32_t CountReset = 228; // 200us / 0.875us pulse width + const static PinStatus IdleLevel = LOW; +}; + class NeoNrf52xPwmInvertedSpeedWs2811 { public: @@ -213,9 +224,22 @@ public: const static PinStatus IdleLevel = HIGH; }; +class NeoNrf52xPwmInvertedSpeedTx1812 +{ +public: + const static uint32_t CountTop = 14UL; // ~0.875us (target is 0.9us) + const static nrf_pwm_values_common_t Bit0 = 5; // ~0.3125us (target is 0.3) + const static nrf_pwm_values_common_t Bit1 = 10; // ~0.625us (target is 0.6) + const static nrf_pwm_values_common_t BitReset = 0x0000; // HIGH + const static uint32_t CountReset = 228; // 200us / 0.875us pulse width + const static PinStatus IdleLevel = HIGH; +}; + class NeoNrf52xPwm0 { public: + NeoNrf52xPwm0() {}; + inline static NRF_PWM_Type* Pwm() { return NRF_PWM0; @@ -225,6 +249,8 @@ public: class NeoNrf52xPwm1 { public: + NeoNrf52xPwm1() {}; + inline static NRF_PWM_Type* Pwm() { return NRF_PWM1; @@ -234,6 +260,8 @@ public: class NeoNrf52xPwm2 { public: + NeoNrf52xPwm2() {}; + inline static NRF_PWM_Type* Pwm() { return NRF_PWM2; @@ -244,6 +272,8 @@ public: class NeoNrf52xPwm3 { public: + NeoNrf52xPwm3() {}; + inline static NRF_PWM_Type* Pwm() { return NRF_PWM3; @@ -468,6 +498,8 @@ typedef NeoNrf52xMethodBase NeoNrf52xPwm typedef NeoNrf52xMethodBase NeoNrf52xPwmNWs2812xMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwmNSk6812Method; typedef NeoNrf52xMethodBase NeoNrf52xPwmNTm1814Method; +typedef NeoNrf52xMethodBase NeoNrf52xPwmNTm1829Method; +typedef NeoNrf52xMethodBase NeoNrf52xPwmNTx1812Method; typedef NeoNrf52xMethodBase NeoNrf52xPwmNApa106Method; typedef NeoNrf52xMethodBase NeoNrf52xPwmN800KbpsMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwmN400KbpsMethod; @@ -477,6 +509,7 @@ typedef NeoNrf52xMethodBase NeoNrf52xPw typedef NeoNrf52xMethodBase NeoNrf52xPwm0Sk6812Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm0Tm1814Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm0Tm1829Method; +typedef NeoNrf52xMethodBase NeoNrf52xPwm0Tx1812Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm0Apa106Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm0800KbpsMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm0400KbpsMethod; @@ -486,6 +519,7 @@ typedef NeoNrf52xMethodBase NeoNrf52xPw typedef NeoNrf52xMethodBase NeoNrf52xPwm1Sk6812Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm1Tm1814Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm1Tm1829Method; +typedef NeoNrf52xMethodBase NeoNrf52xPwm1Tx1812Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm1Apa106Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm1800KbpsMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm1400KbpsMethod; @@ -495,6 +529,7 @@ typedef NeoNrf52xMethodBase NeoNrf52xPw typedef NeoNrf52xMethodBase NeoNrf52xPwm2Sk6812Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm2Tm1814Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm2Tm1829Method; +typedef NeoNrf52xMethodBase NeoNrf52xPwm2Tx1812Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm2Apa106Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm2800KbpsMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm2400KbpsMethod; @@ -505,6 +540,7 @@ typedef NeoNrf52xMethodBase NeoNrf52xPw typedef NeoNrf52xMethodBase NeoNrf52xPwm3Sk6812Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm3Tm1814Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm3Tm1829Method; +typedef NeoNrf52xMethodBase NeoNrf52xPwm3Tx1812Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm3Apa106Method; typedef NeoNrf52xMethodBase NeoNrf52xPwm3800KbpsMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm3400KbpsMethod; @@ -515,6 +551,8 @@ typedef NeoNrf52xMethodBase NeoN typedef NeoNrf52xMethodBase NeoNrf52xPwmNWs2812xInvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwmNSk6812InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwmNTm1814InvertedMethod; +typedef NeoNrf52xMethodBase NeoNrf52xPwmNTm1829InvertedMethod; +typedef NeoNrf52xMethodBase NeoNrf52xPwmNTx1812InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwmNApa106InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwmN800KbpsInvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwmN400KbpsInvertedMethod; @@ -524,6 +562,7 @@ typedef NeoNrf52xMethodBase Neo typedef NeoNrf52xMethodBase NeoNrf52xPwm0Sk6812InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm0Tm1814InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm0Tm1829InvertedMethod; +typedef NeoNrf52xMethodBase NeoNrf52xPwm0Tx1812InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm0Apa106InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm0800KbpsInvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm0400KbpsInvertedMethod; @@ -533,6 +572,7 @@ typedef NeoNrf52xMethodBase Neo typedef NeoNrf52xMethodBase NeoNrf52xPwm1Sk6812InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm1Tm1814InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm1Tm1829InvertedMethod; +typedef NeoNrf52xMethodBase NeoNrf52xPwm1Tx1812InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm1Apa106InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm1800KbpsInvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm1400KbpsInvertedMethod; @@ -542,6 +582,7 @@ typedef NeoNrf52xMethodBase Neo typedef NeoNrf52xMethodBase NeoNrf52xPwm2Sk6812InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm2Tm1814InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm2Tm1829InvertedMethod; +typedef NeoNrf52xMethodBase NeoNrf52xPwm2Tx1812InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm2Apa106InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm2800KbpsInvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm2400KbpsInvertedMethod; @@ -552,6 +593,7 @@ typedef NeoNrf52xMethodBase Neo typedef NeoNrf52xMethodBase NeoNrf52xPwm3Sk6812InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm3Tm1814InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm3Tm1829InvertedMethod; +typedef NeoNrf52xMethodBase NeoNrf52xPwm3Tx1812InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm3Apa106InvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm3800KbpsInvertedMethod; typedef NeoNrf52xMethodBase NeoNrf52xPwm3400KbpsInvertedMethod; @@ -565,6 +607,7 @@ typedef NeoNrf52xPwm2Ws2812xMethod NeoWs2811Method; typedef NeoNrf52xPwm2Sk6812Method NeoSk6812Method; typedef NeoNrf52xPwm2Tm1814Method NeoTm1814Method; typedef NeoNrf52xPwm2Tm1829Method NeoTm1829Method; +typedef NeoNrf52xPwm2Tx1812Method NeoTx1812Method; typedef NeoNrf52xPwm2Sk6812Method NeoLc8812Method; typedef NeoNrf52xPwm2Apa106Method NeoApa106Method; @@ -578,6 +621,7 @@ typedef NeoNrf52xPwm2800KbpsInvertedMethod NeoWs2812InvertedMethod; typedef NeoNrf52xPwm2Sk6812InvertedMethod NeoSk6812InvertedMethod; typedef NeoNrf52xPwm2Tm1814InvertedMethod NeoTm1814InvertedMethod; typedef NeoNrf52xPwm2Tm1829InvertedMethod NeoTm1829InvertedMethod; +typedef NeoNrf52xPwm2Tx1812InvertedMethod NeoTx1812InvertedMethod; typedef NeoNrf52xPwm2Sk6812InvertedMethod NeoLc8812InvertedMethod; typedef NeoNrf52xPwm2Apa106InvertedMethod NeoApa106InvertedMethod;