Feature: Hardware PWM

.gitignore

@@ -130,5 +130,5 @@ vs/*.log
 
 tests/libDaisy_gtest
 tests/build/bin/
-examples/*/build/
+examples/**/build/
 

.vscode/launch.json

@@ -21,6 +21,37 @@
             "windows": {
                 "MIMode": "gdb",
             }
+        },
+        {
+            "name": "Debug",
+            "configFiles": [
+                "interface/stlink.cfg",
+                "target/stm32h7x.cfg"
+            ],
+            "cwd": "${workspaceFolder}",
+            "debuggerArgs": [
+                "-d",
+                "${workspaceRoot}"
+            ],
+            // Here's where you can put the path to the program you want to debug:
+            "executable": "${workspaceRoot}/examples/PWM/AddressableLED/build/addressable-led.elf",
+            "interface": "swd",
+            "openOCDLaunchCommands": [
+                "init",
+                "reset init",
+                "gdb_breakpoint_override hard"
+            ],
+            "preRestartCommands": [
+                "load",
+                "enable breakpoint",
+                "monitor reset"
+            ],
+            "request": "launch",
+            "runToMain": true,
+            "servertype": "openocd",
+            "showDevDebugOutput": true,
+            "svdFile": "${workspaceRoot}/.vscode/STM32H750x.svd",
+            "type": "cortex-debug"
         }
     ]
 }

Makefile

@@ -58,6 +58,7 @@ per/qspi \
 per/spi \
 per/spiMultislave \
 per/tim \
+per/tim_channel \
 per/uart \
 ui/UI \
 ui/AbstractMenu \
@@ -69,8 +70,8 @@ util/WaveTableLoader \
 ######################################
 # building variables
 ######################################
-DEBUG = 0
-OPT = -O3
+DEBUG = 1
+OPT = -O0
 
 #######################################
 # paths

examples/PWM/AddressableLED/Makefile

@@ -0,0 +1,17 @@
+# Project Name
+TARGET = addressable-led
+
+# Sources
+CPP_SOURCES = addressable-led.cpp
+
+DEBUG=1
+OPT=-O0
+
+C_DEFS += -DDEBUG_DEFAULT_INTERRUPT_HANDLERS
+
+# Library Locations
+LIBDAISY_DIR = ../../..
+
+# Core location, and generic Makefile.
+SYSTEM_FILES_DIR = $(LIBDAISY_DIR)/core
+include $(SYSTEM_FILES_DIR)/Makefile

examples/PWM/AddressableLED/addressable-led.cpp

@@ -0,0 +1,183 @@
+/** DMA PWM 
+ *  
+ *  In this example we will use the DMA to generate a PWM sequence
+ *  This can be common for things like Digital LEDs (WS8212), motor control, etc.
+ * 
+ *  For this we're going to use Daisy Seed pin D17 as TIM3 Channel 4 (unless it has issues because of the LED attached..)
+ * 
+ *  TODO: This won't work until this stuff is resolved:
+ *  * Hardcoding for TIM3Ch4 is in the libDaisy stuff. Needs to get updated so we can use TIM4 Ch1 for the devboard
+ *  * Some sort of stop/reset between transactions to prep LEDs for next signal
+ */
+#include "daisy_seed.h"
+
+using namespace daisy;
+
+/** Hardware object for communicating with Daisy */
+DaisySeed                       hw;
+const size_t                    kOutBufferSize = 512;
+uint32_t DMA_BUFFER_MEM_SECTION outbuffer[kOutBufferSize];
+
+// const size_t kTickPeriod = 36;
+// const int kOneTime  = kTickPeriod - 20;
+// const int kZeroTime = kTickPeriod - 8;
+const size_t kTickPeriod = 29;
+// const size_t kTickPeriod = 59;
+const int kOneTime  = 20;
+const int kZeroTime = 8;
+
+
+/** both the same for now*/
+// const int kZeroTime = 14;
+// const int kOneTime  = 21;
+// const int kZeroTime = 2 * (kTickPeriod / 3);
+// const int kOneTime  = kTickPeriod / 3;
+
+const int kNumLeds = 4;
+uint8_t   led_data[kNumLeds][3]; /**< RGB data */
+
+const size_t kOutDataSize = kNumLeds * 3 * 8;
+uint32_t DMA_BUFFER_MEM_SECTION
+    output_data[kNumLeds * 3
+                * 8]; /**< PWM lengths data, one "duration" per bit */
+
+/** buff expects that 8 elements are available for the one 8-bit color val*/
+static void populate_bits(uint8_t color_val, uint32_t* buff)
+{
+    for(int i = 0; i < 8; i++)
+    {
+        buff[i] = (color_val & (1 << (7 - i))) > 0 ? kOneTime : kZeroTime;
+    }
+}
+
+static void fill_led_data()
+{
+    /** TODO fix these to be accurate for necessary timing */
+    for(int i = 0; i < kNumLeds; i++)
+    {
+        /** Grab G, R, B for filling bytes */
+        uint8_t g          = led_data[i][1];
+        uint8_t r          = led_data[i][0];
+        uint8_t b          = led_data[i][2];
+        auto    data_index = i * 3 * 8;
+        populate_bits(g, &output_data[data_index]);
+        populate_bits(r, &output_data[data_index + 8]);
+        populate_bits(b, &output_data[data_index + 16]);
+    }
+}
+
+static void set_led(int index, uint8_t r, uint8_t g, uint8_t b)
+{
+    led_data[index][0] = r;
+    led_data[index][1] = g;
+    led_data[index][2] = b;
+}
+
+static void set_led_f(int index, float r, float g, float b)
+{
+    set_led(index, r * 255, g * 255, b * 255);
+}
+
+void EndOfLeds(void* context)
+{
+    TimChannel* pwm = (TimChannel*)context;
+    pwm->SetPwm(0);
+    // pwm->Stop();
+}
+
+int main(void)
+{
+    /** Initialize hardware */
+    hw.Init();
+
+    /** Initialize timer */
+    TimerHandle::Config tim_cfg;
+    TimerHandle         timer;
+    tim_cfg.periph = TimerHandle::Config::Peripheral::TIM_4;
+    tim_cfg.dir    = TimerHandle::Config::CounterDir::UP;
+    timer.Init(tim_cfg);
+
+    /** Generate period for timer 
+     *  This is a marvelously useful little tidbit that should be put into a TimerHandle function or something.
+     */
+    uint32_t prescaler         = 8;
+    uint32_t tickspeed         = (System::GetPClk2Freq() * 2) / prescaler;
+    uint32_t target_pulse_freq = 833333; /**< 1.2 microsecond symbol length */
+    uint32_t period            = (tickspeed / target_pulse_freq) - 1;
+    timer.SetPrescaler(prescaler - 1); /**< ps=0 is divide by 1 and so on.*/
+    timer.SetPeriod(period);
+
+    TimChannel::Config chn_cfg;
+    chn_cfg.tim      = &timer;
+    chn_cfg.chn      = TimChannel::Config::Channel::ONE;
+    chn_cfg.mode     = TimChannel::Config::Mode::PWM;
+    chn_cfg.polarity = TimChannel::Config::Polarity::LOW;
+    chn_cfg.pin      = seed::D13;
+    TimChannel pwm;
+    /** Fill Buffer */
+    for(size_t i = 0; i < kOutBufferSize; i++)
+    {
+        float t      = (float)i / (float)(kOutBufferSize - 1); /**< 0.0->1.0 */
+        float ts     = 0.5f + (cos(t * 6.28) * 0.5f);
+        outbuffer[i] = (uint32_t)(ts * period);
+    }
+    /** Initialize PWM */
+    pwm.Init(chn_cfg);
+    pwm.SetPwm(0);
+    pwm.Start();
+    timer.Start();
+
+    uint32_t now, tled;
+    now = tled = System::GetNow();
+
+    float gbright = 0;
+
+    while(1)
+    {
+        now = System::GetNow();
+        //if(now - tled > 33)
+        if(now - tled > 33)
+        {
+            tled = now;
+            // gbright += 0.0005f;
+            // if(gbright > 0.5f)
+            // {
+            //     gbright = 0.f;
+            // }
+            gbright += 0.01;
+            if(gbright > 0.5f)
+            {
+                gbright = 0.f;
+            }
+
+            // gbright = 0.03f;
+            // gbright = 1;
+
+            /* Lets set some LED stuff */
+            for(int i = 0; i < kNumLeds; i++)
+            {
+                // float bright = (float)(now & 1023) / 1023.f;
+                // float bright = (now & 1023) > 511 ? 0.33f : 0.f;
+                switch(i)
+                {
+                    case 0: set_led_f(i, gbright, 0.f, 0.f); break;
+                    case 1: set_led_f(i, 0.f, 0.f, gbright); break;
+                    case 2: set_led_f(i, 0.f, gbright, 0.f); break;
+                    default: set_led_f(i, gbright, gbright, gbright); break;
+                }
+                // switch(i)
+                // {
+                //     case 0: set_led(i, gbright, 0, 0); break;
+                //     case 1: set_led(i, 0, gbright, 0); break;
+                //     case 2: set_led(i, 0, 0, gbright); break;
+                //     default: set_led(i, gbright, gbright, gbright); break;
+                // }
+            }
+            fill_led_data();
+
+            /** And transmit */
+            pwm.Start();
+            pwm.StartDma(output_data, kOutDataSize, EndOfLeds, (void*)&pwm);
+        }
+    }
+}

examples/PWM/Basic-PWM/Makefile

@@ -0,0 +1,15 @@
+# Project Name
+TARGET = basic-pwm
+
+# Sources
+CPP_SOURCES = basic-pwm.cpp
+
+DEBUG=1
+OPT=-O0
+
+# Library Locations
+LIBDAISY_DIR = ../../..
+
+# Core location, and generic Makefile.
+SYSTEM_FILES_DIR = $(LIBDAISY_DIR)/core
+include $(SYSTEM_FILES_DIR)/Makefile

examples/PWM/Basic-PWM/basic-pwm.cpp

@@ -0,0 +1,55 @@
+/** Basic PWM 
+ *  
+ *  In this example, we will configure a single GPIO
+ *  to output PWM using the TIM hardware built into the daisy.
+ * 
+ *  For this we're going to use Daisy Seed pin D17 as TIM3 Channel 4
+ */
+#include "daisy_seed.h"
+
+using namespace daisy;
+
+/** Hardware object for communicating with Daisy */
+DaisySeed hw;
+
+int main(void)
+{
+    /** Initialize hardware */
+    hw.Init();
+
+    /** Configure frequency (12kHz) */
+    auto tim_target_freq = 12000;
+    auto tim_base_freq   = System::GetPClk2Freq();
+
+    TimerHandle::Config tim_cfg;
+    TimerHandle         timer;
+    tim_cfg.periph     = TimerHandle::Config::Peripheral::TIM_3;
+    tim_cfg.period     = tim_base_freq / tim_target_freq;
+    timer.Init(tim_cfg);
+
+    TimChannel::Config chn_cfg;
+    chn_cfg.tim  = &timer;
+    chn_cfg.chn  = TimChannel::Config::Channel::FOUR;
+    chn_cfg.mode = TimChannel::Config::Mode::PWM;
+    chn_cfg.pin  = seed::D17;
+    TimChannel pwm;
+    /** Initialize PWM */
+    pwm.Init(chn_cfg);
+    timer.Start();
+    pwm.Start();
+
+    /** Step through some brightness values */
+    int vals[32];
+    for(int i = 0; i < 32; i++)
+        vals[i] = i * (tim_cfg.period / 32);
+
+    while(1)
+    {
+        /* ~30Hz animation of our little 32-frame ramp wave. */
+        for(int i = 0; i < 32; i++)
+        {
+            pwm.SetPwm(vals[i]);
+            System::Delay(33);
+        }
+    }
+}

examples/PWM/DMA-PWM/Makefile

@@ -0,0 +1,17 @@
+# Project Name
+TARGET = dma-pwm
+
+# Sources
+CPP_SOURCES = dma-pwm.cpp
+
+DEBUG=1
+OPT=-O0
+
+C_DEFS += -DDEBUG_DEFAULT_INTERRUPT_HANDLERS
+
+# Library Locations
+LIBDAISY_DIR = ../../..
+
+# Core location, and generic Makefile.
+SYSTEM_FILES_DIR = $(LIBDAISY_DIR)/core
+include $(SYSTEM_FILES_DIR)/Makefile