v1.1.0 to permit PWM output to 2 channels of slice

### Releases v1.1.0 1. Permit PWM output for both channels of PWM slice. Check [Request for Clarification on PWM Slices and A/B sides #5](#5) 2. Use float `instead` of `double` for frequency and duty-cycle 3. Add example [PWM_MultiChannel](https://github.com/khoih-prog/RP2040_PWM/tree/main/examples/PWM_MultiChannel) to demonstrate how to use both channels of PWM slice.
khoih-prog · Feb 25, 2022 · 83eeca6 · 83eeca6
1 parent f17be4d
commit 83eeca6
Show file tree

Hide file tree

Showing 8 changed files with 154 additions and 132 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -15,7 +15,7 @@ If you don't find anything, please [open a new issue](https://github.com/khoih-p
 Please ensure to specify the following:
 
 * Arduino IDE version (e.g. 1.8.19) or Platform.io version
-* `RP2040` Core Version (e.g. Arduino-mbed RP2040 v2.6.1 or arduino-pico core v1.9.13)
+* `RP2040` Core Version (e.g. Arduino-mbed RP2040 v2.7.2 or arduino-pico core v1.12.0)
 * `RP2040` Board type (e.g. NANO_RP2040_CONNECT, RASPBERRY_PI_PICO, ADAFRUIT_FEATHER_RP2040, GENERIC_RP2040, etc.)
 * Contextual information (e.g. what you were trying to achieve)
 * Simplest possible steps to reproduce
@@ -28,10 +28,10 @@ Please ensure to specify the following:
 
 ```
 Arduino IDE version: 1.8.19
-Arduino-mbed mbed_nano v2.6.1
+Arduino-mbed mbed_nano v2.7.2
 NANO_RP2040_CONNECT Module
 OS: Ubuntu 20.04 LTS
-Linux xy-Inspiron-3593 5.4.0-91-generic #102-Ubuntu SMP Fri Nov 5 16:31:28 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
+Linux xy-Inspiron-3593 5.4.0-100-generic #113-Ubuntu SMP Thu Feb 3 18:43:29 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux
 
 Context:
 I encountered a crash while using TimerInterrupt.
@@ -52,3 +52,4 @@ There are usually some outstanding feature requests in the [existing issues list
 ### Sending Pull Requests
 
 Pull Requests with changes and fixes are also welcome!
+
diff --git a/README.md b/README.md
@@ -6,7 +6,8 @@
 [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](#Contributing)
 [![GitHub issues](https://img.shields.io/github/issues/khoih-prog/RP2040_PWM.svg)](http://github.com/khoih-prog/RP2040_PWM/issues)
 
-<a href="https://www.buymeacoffee.com/khoihprog6" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 50px !important;width: 181px !important;" ></a>
+<a href="https://www.buymeacoffee.com/khoihprog6" title="Donate to my libraries using BuyMeACoffee"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Donate to my libraries using BuyMeACoffee" style="height: 50px !important;width: 181px !important;" ></a>
+<a href="https://www.buymeacoffee.com/khoihprog6" title="Donate to my libraries using BuyMeACoffee"><img src="https://img.shields.io/badge/buy%20me%20a%20coffee-donate-orange.svg?logo=buy-me-a-coffee&logoColor=FFDD00" style="height: 20px !important;width: 200px !important;" ></a>
 
 ---
 ---
@@ -34,12 +35,14 @@
   * [ 1. PWM_Multi](examples/PWM_Multi)
   * [ 2. PWM_DynamicFreq](examples/PWM_DynamicFreq)
   * [ 3. PWM_DynamicDutyCycle](examples/PWM_DynamicDutyCycle)
+  * [ 4. PWM_MultiChannel](examples/PWM_MultiChannel)
 * [Example PWM_Multi](#example-PWM_Multi)
 * [Debug Terminal Output Samples](#debug-terminal-output-samples)
   * [1. PWM_Multi on MBED RaspberryPi Pico](#1-PWM_Multi-on-MBED-RaspberryPi-Pico)
   * [2. PWM_Multi on RASPBERRY_PI_PICO](#2-PWM_Multi-on-RASPBERRY_PI_PICO)
   * [3. PWM_DynamicFreq on Nano RP2040 Connect](#3-PWM_DynamicFreq-on-Nano-RP2040-Connect)
   * [4. PWM_DynamicDutyCycle on RASPBERRY_PI_PICO](#4-PWM_DynamicDutyCycle-on-RASPBERRY_PI_PICO)
+  * [5. PWM_MultiChannel on RASPBERRY_PI_PICO](#5-PWM_MultiChannel-on-RASPBERRY_PI_PICO)
 * [Debug](#debug)
 * [Troubleshooting](#troubleshooting)
 * [Issues](#issues)
@@ -107,7 +110,7 @@ Functions using normal software-based PWMs, relying on loop() and calling millis
 
  1. [`Arduino IDE 1.8.19+` for Arduino](https://www.arduino.cc/en/Main/Software)
  2. [`ArduinoCore-mbed mbed_nano or mbed_rp2040 core 2.7.2`](https://github.com/arduino/ArduinoCore-mbed) for Arduino **NANO_RP2040_CONNECT, RASPBERRY_PI_PICO** boards. [![GitHub release](https://img.shields.io/github/release/arduino/ArduinoCore-mbed.svg)](https://github.com/arduino/ArduinoCore-mbed/releases/latest)
- 3. [`Earle Philhower's arduino-pico core v1.10.0+`](https://github.com/earlephilhower/arduino-pico) for RP2040-based boards such as **RASPBERRY_PI_PICO, ADAFRUIT_FEATHER_RP2040, ADAFRUIT_ITSYBITSY_RP2040, CYTRON_MAKER_NANO_RP2040, SPARKFUN_PROMICRO_RP2040, CHALLENGER_2040_WIFI_RP2040, ILABS_2040_RPICO32_RP2040, MELOPERO_SHAKE_RP2040, SOLDERPARTY_RP2040_STAMP, UPESY_RP2040_DEVKIT, WIZNET_5100S_EVB_PICO, GENERIC_RP2040**, etc. [![GitHub release](https://img.shields.io/github/release/earlephilhower/arduino-pico.svg)](https://github.com/earlephilhower/arduino-pico/releases/latest)
+ 3. [`Earle Philhower's arduino-pico core v1.12.0+`](https://github.com/earlephilhower/arduino-pico) for RP2040-based boards such as **RASPBERRY_PI_PICO, ADAFRUIT_FEATHER_RP2040, ADAFRUIT_ITSYBITSY_RP2040, CYTRON_MAKER_NANO_RP2040, SPARKFUN_PROMICRO_RP2040, CHALLENGER_2040_WIFI_RP2040, ILABS_2040_RPICO32_RP2040, MELOPERO_SHAKE_RP2040, SOLDERPARTY_RP2040_STAMP, UPESY_RP2040_DEVKIT, WIZNET_5100S_EVB_PICO, GENERIC_RP2040**, etc. [![GitHub release](https://img.shields.io/github/release/earlephilhower/arduino-pico.svg)](https://github.com/earlephilhower/arduino-pico/releases/latest)
 
 
 ---
@@ -133,7 +136,7 @@ Another way to install is to:
 
 1. Install [VS Code](https://code.visualstudio.com/)
 2. Install [PlatformIO](https://platformio.org/platformio-ide)
-3. Install [**RP2040_PWM** library](https://platformio.org/lib/show/12863/RP2040_PWM) by using [Library Manager](https://platformio.org/lib/show/12863/RP2040_PWM/installation). Search for **RP2040_PWM** in [Platform.io Author's Libraries](https://platformio.org/lib/search?query=author:%22Khoi%20Hoang%22)
+3. Install [**RP2040_PWM** library](https://registry.platformio.org/libraries/khoih-prog/RP2040_PWM) by using [Library Manager](https://registry.platformio.org/libraries/khoih-prog/RP2040_PWM/installation). Search for **RP2040_PWM** in [Platform.io Author's Libraries](https://platformio.org/lib/search?query=author:%22Khoi%20Hoang%22)
 4. Use included [platformio.ini](platformio/platformio.ini) file from examples to ensure that all dependent libraries will installed automatically. Please visit documentation for the other options and examples at [Project Configuration File](https://docs.platformio.org/page/projectconf.html)
 
 
@@ -181,7 +184,7 @@ Slices can be enabled or disabled simultaneously via a single, global control re
 All 30 GPIO pins on RP2040 can be used for PWM:
 
 - The 16 PWM channels (8 2-channel slices) appear on GPIO0 to GPIO15, in the order PWM0_A, PWM0_B, PWM1_A, etc.
-- This repeats for GPIO16 to GPIO29. GPIO16 is PWM0 A, GPIO17 is PWM0 B, so on up to PWM6 B on GPIO29
+- This repeats for GPIO16 to GPIO29. GPIO16 is PWM0 A, GPIO17 is PWM0 B, so on, up to PWM6 B on GPIO29
 - The same PWM output can be selected on two GPIO pins; the same signal will appear on each GPIO.
 - If a PWM B pin is used as an input, and is selected on multiple GPIO pins, then the PWM slice will see the logical OR of those two GPIO inputs
 
@@ -223,110 +226,17 @@ PWM_Instance->setPWM(PWM_Pins, new_frequency, new_dutyCycle, true);
 
  1. [PWM_Multi](examples/PWM_Multi)
  2. [PWM_DynamicFreq](examples/PWM_DynamicFreq)
- 3. [PWM_DynamicDutyCycle](examples/PWM_DynamicDutyCycle). **New**
+ 3. [PWM_DynamicDutyCycle](examples/PWM_DynamicDutyCycle).
+ 4. [PWM_MultiChannel](examples/PWM_MultiChannel). **New**
 
 ---
 ---
 
 ### Example [PWM_Multi](examples/PWM_Multi)
 
-```
-#define _PWM_LOGLEVEL_        4
-
-#if ( defined(ARDUINO_NANO_RP2040_CONNECT) || defined(ARDUINO_RASPBERRY_PI_PICO) || defined(ARDUINO_ADAFRUIT_FEATHER_RP2040) || \
-      defined(ARDUINO_GENERIC_RP2040) ) && defined(ARDUINO_ARCH_MBED)
-
-  #if(_PWM_LOGLEVEL_>3)
-    #warning USING_MBED_RP2040_PWM
-  #endif
-
-#elif ( defined(ARDUINO_ARCH_RP2040) || defined(ARDUINO_RASPBERRY_PI_PICO) || defined(ARDUINO_ADAFRUIT_FEATHER_RP2040) || \
-        defined(ARDUINO_GENERIC_RP2040) ) && !defined(ARDUINO_ARCH_MBED)
-
-  #if(_PWM_LOGLEVEL_>3)
-    #warning USING_RP2040_PWM
-  #endif
-#else
-  #error This code is intended to run on the RP2040 mbed_nano, mbed_rp2040 or arduino-pico platform! Please check your Tools->Board setting.
-#endif
-
-#include "RP2040_PWM.h"
-
-#define LED_ON        LOW
-#define LED_OFF       HIGH
-
-#define pin0    25    // PWM channel 4B
-//#define pin0    0   // PWM channel 0A
-#define pin1    2     // PWM channel 1A
-#define pin2    4     // PWM channel 2A
-#define pin3    6     // PWM channel 3A
-#define pin4    0     // PWM channel 0A
-#define pin5    10    // PWM channel 5A
-#define pin6    12    // PWM channel 6A
-#define pin7    14    // PWM channel 7A
-
-uint32_t PWM_Pins[]       = { pin0, pin1, pin2, pin3, pin4, pin5, pin6, pin7 };
-
-#define NUM_OF_PINS       ( sizeof(PWM_Pins) / sizeof(uint32_t) )
-
-uint32_t dutyCycle[NUM_OF_PINS]  = { 10, 50, 30, 40, 50, 60, 70, 80 };
-
-double freq[] = { 7.50, 8, 10, 1000, 2000, 3000, 8000, 9999 };
-
-
-RP2040_PWM* PWM_Instance[NUM_OF_PINS];
-
-char dashLine[] = "=============================================================";
-
-void setup()
-{
-  Serial.begin(115200);
-  while (!Serial);
-
-  delay(100);
-
-  Serial.print(F("\nStarting PWM_Multi on ")); Serial.println(BOARD_NAME);
-  Serial.println(RP2040_PWM_VERSION);
-
-  Serial.println(dashLine);
-  Serial.println("Index\tPin\tPWM_freq\tDutyCycle\tActual Freq");
-  Serial.println(dashLine); 
-
-  for (uint8_t index = 0; index < NUM_OF_PINS; index++)
-  {   
-    Serial.print(index);
-    Serial.print("\t"); Serial.print(PWM_Pins[index]);
-    Serial.print("\t"); Serial.print(freq[index]);
-    Serial.print("\t\t"); Serial.print(dutyCycle[index]);
+https://github.com/khoih-prog/RP2040_PWM/blob/f17be4db92f97adfb6846eaa7d479d3fed60bcb6/examples/PWM_Multi/PWM_Multi.ino#L14-L108
 
-    PWM_Instance[index] = new RP2040_PWM(PWM_Pins[index], freq[index], dutyCycle[index]);
 
-    if (PWM_Instance[index])
-    {
-      PWM_Instance[index]->setPWM();
-
-      uint32_t div = PWM_Instance[index]->get_DIV();
-      uint32_t top = PWM_Instance[index]->get_TOP();
-
-      Serial.print("\t\t"); Serial.println(PWM_Instance[index]->getActualFreq());
-      
-      PWM_LOGDEBUG5("TOP =", top, ", DIV =", div, ", CPU_freq =", PWM_Instance[index]->get_freq_CPU());
-    }
-    else
-    {
-      Serial.println();
-    }
-  }
-
-  Serial.println(dashLine);
-}
-
-void loop()
-{
-  //Long delay has no effect on the operation of hardware-based PWM channels
-  delay(1000000);
-}
-```
 ---
 ---
 
@@ -339,7 +249,7 @@ The following is the sample terminal output when running example [PWM_Multi](exa
 
 ```
 Starting PWM_Multi on RaspberryPi Pico
-RP2040_PWM v1.0.5
+RP2040_PWM v1.1.0
 =============================================================
 Index	Pin	PWM_freq	DutyCycle	Actual Freq
 =============================================================
@@ -362,7 +272,7 @@ The following is the sample terminal output when running example [**PWM_Multi**]
 
 ```
 Starting PWM_Multi on RASPBERRY_PI_PICO
-RP2040_PWM v1.0.5
+RP2040_PWM v1.1.0
 =============================================================
 Index	Pin	PWM_freq	DutyCycle	Actual Freq
 =============================================================
@@ -385,7 +295,7 @@ The following is the sample terminal output when running example [**PWM_DynamicF
 
 ```
 Starting PWM_DynamicFreq on Nano RP2040 Connect
-RP2040_PWM v1.0.5
+RP2040_PWM v1.1.0
 [PWM] _PWM_config.top = 12499 , _actualFrequency = 1000.00
 [PWM] PWM enabled, frequency = 1000.00
 =============================================================
@@ -430,7 +340,7 @@ The following is the sample terminal output when running example [**PWM_DynamicD
 
 ```
 Starting PWM_DynamicDutyCycle on RASPBERRY_PI_PICO
-RP2040_PWM v1.0.5
+RP2040_PWM v1.1.0
 [PWM] _PWM_config.top = 12499 , _actualFrequency = 1000.00
 [PWM] PWM enabled, frequency = 1000.00
 =============================================================
@@ -458,6 +368,24 @@ Actual PWM Frequency = 2000.00
 
 ```
 
+---
+
+### 5. PWM_MultiChannel on RASPBERRY_PI_PICO
+
+The following is the sample terminal output when running example [**PWM_MultiChannel**](examples/PWM_MultiChannel) on **RASPBERRY_PI_PICO**, running [`Earle Philhower's arduino-pico core`](https://github.com/earlephilhower/arduino-pico), to demonstrate the ability to output for both channels of a PWM slice
+
+
+```
+Starting PWM_MultiChannel on RASPBERRY_PI_PICO
+RP2040_PWM v1.1.0
+=============================================================
+Index	Pin	PWM_freq	DutyCycle	Actual Freq
+=============================================================
+0	10	1000.00		10.00		1000.00
+1	11	1000.00		50.00		1000.00
+=============================================================
+```
+
 ---
 ---
 
@@ -502,6 +430,10 @@ Submit issues to: [RP2040_PWM issues](https://github.com/khoih-prog/RP2040_PWM/i
 1. Basic hardware-based multi-channel PWMs for **RP2040-based boards** such as Nano_RP2040_Connect, RASPBERRY_PI_PICO, etc. using either RP2040 [**ArduinoCore-mbed mbed_nano or mbed_rp2040** core](https://github.com/arduino/ArduinoCore-mbed) or [**Earle Philhower's arduino-pico core**](https://github.com/earlephilhower/arduino-pico)
 2. Add Table of Contents
 3. Split `changelog.md`
+4. Permit PWM output for both channels of PWM slice.
+5. Use float `instead` of `double` for frequency and duty-cycle
+6. Add example [PWM_MultiChannel](https://github.com/khoih-prog/RP2040_PWM/tree/main/examples/PWM_MultiChannel) to demonstrate how to use both channels of PWM slice.
+
 
 ---
 ---
@@ -516,13 +448,14 @@ Many thanks for everyone for bug reporting, new feature suggesting, testing and
 
 2. Thanks to [Austin K. Litman](https://github.com/AKLitman) to report bugs in 
 - [Attempting to Alter the Duty Cycle w/o changing any other values #3](https://github.com/khoih-prog/RP2040_PWM/issues/3) leading to v1.0.5
+- [Request for Clarification on PWM Slices and A/B sides #5](https://github.com/khoih-prog/RP2040_PWM/issues/5) leading to v1.1.0
 
 
 
 <table>
   <tr>
     <td align="center"><a href="https://github.com/americodias"><img src="https://github.com/americodias.png" width="100px;" alt="americodias"/><br /><sub><b>⭐️ Américo Dias</b></sub></a><br /></td>
-    <td align="center"><a href="https://github.com/AKLitman"><img src="https://github.com/AKLitman.png" width="100px;" alt="AKLitman"/><br /><sub><b>Austin K. Litman</b></sub></a><br /></td>
+    <td align="center"><a href="https://github.com/AKLitman"><img src="https://github.com/AKLitman.png" width="100px;" alt="AKLitman"/><br /><sub><b>⭐️ Austin K. Litman</b></sub></a><br /></td>
   </tr>
 </table>
 

diff --git a/changelog.md b/changelog.md
@@ -12,6 +12,7 @@
 ## Table of Contents
 
 * [Changelog](#changelog)
+  * [Releases v1.1.0](#Releases-v110)
   * [Releases v1.0.5](#Releases-v105)
   * [Releases v1.0.4](#Releases-v104)
   * [Releases v1.0.3](#Releases-v103)
@@ -24,6 +25,13 @@
 
 ## Changelog
 
+### Releases v1.1.0
+
+1. Permit PWM output for both channels of PWM slice. Check [Request for Clarification on PWM Slices and A/B sides #5](https://github.com/khoih-prog/RP2040_PWM/issues/5)
+2. Use float `instead` of `double` for frequency and duty-cycle
+3. Add example [PWM_MultiChannel](https://github.com/khoih-prog/RP2040_PWM/tree/main/examples/PWM_MultiChannel) to demonstrate how to use both channels of PWM slice.
+
+
 ### Releases v1.0.5
 
 1. Permit changing dutyCycle and keep same frequency on-the-fly. Check [Attempting to Alter the Duty Cycle w/o changing any other values #3](https://github.com/khoih-prog/RP2040_PWM/issues/3)
@@ -56,11 +64,3 @@
 1. Initial coding to support **RP2040-based boards** such as Nano_RP2040_Connect, RASPBERRY_PI_PICO, etc. using either RP2040 [**ArduinoCore-mbed mbed_nano or mbed_rp2040** core](https://github.com/arduino/ArduinoCore-mbed) or [**Earle Philhower's arduino-pico core**](https://github.com/earlephilhower/arduino-pico)
 2. The purely hardware-based PWM channel can generate from very low (lowest is 7.5Hz) to very high PWM frequencies (in the **MHz** range, up to **62.5MHz**).
 
----
----
-
-## Copyright
-
-Copyright 2021- Khoi Hoang
-
-
diff --git a/keywords.txt b/keywords.txt
@@ -3,6 +3,7 @@
 #######################################
 
 RP2040_PWM	KEYWORD1
+PWM_slice KEYWORD1
 
 #######################################
 # Methods and Functions (KEYWORD2)
@@ -26,5 +27,16 @@ get_freq_CPU	KEYWORD2
 # Constants (LITERAL1)
 #######################################
 
+USING_MBED_RP2040_PWM LITERAL1
+USING_RP2040_PWM  LITERAL1
+
 RP2040_PWM_VERSION  LITERAL1
+RP2040_PWM_VERSION_MAJOR  LITERAL1
+RP2040_PWM_VERSION_MINOR  LITERAL1
+RP2040_PWM_VERSION_PATCH  LITERAL1
+RP2040_PWM_VERSION_INT  LITERAL1
+
+MAX_PWM_FREQUENCY LITERAL1
 MIN_PWM_FREQENCY  LITERAL1
+
+_PWM_LOGLEVEL_  LITERAL1
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "RP2040_PWM",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "keywords": "timing, device, control, timer, pwm, pwm-slice, hardware-based-pwm, high-frequency-pwm, hardware-pwm, mission-critical, accuracy, non-blocking, mbed, mbed-nano, mbed-rp2040, rpi-pico, rp2040, nano-rp2040-connect, duty-cycle, hardware",
   "description": "This library enables you to use Hardware-based PWM channels on RP2040-based boards, such as Nano_RP2040_Connect, RASPBERRY_PI_PICO, with either Arduino-mbed (mbed_nano or mbed_rp2040) or arduino-pico core to create and output PWM any GPIO pin. The most important feature is they're purely hardware-based PWM channels, supporting very high PWM frequencies. Therefore, their executions are not blocked by bad-behaving functions or tasks. This important feature is absolutely necessary for mission-critical tasks. These hardware-based PWMs, still work even if other software functions are blocking. Moreover, they are much more precise (certainly depending on clock frequency accuracy) than other software-based PWM using ISR, millis() or micros(). That's necessary if you need to control devices requiring high precision",
   "authors":

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=RP2040_PWM
-version=1.0.5
+version=1.1.0
 author=Khoi Hoang <khoih.prog@gmail.com>
 maintainer=Khoi Hoang <khoih.prog@gmail.com>
 sentence=his library enables you to use Hardware-based PWM channels on RP2040-based boards, such as Nano_RP2040_Connect, RASPBERRY_PI_PICO, with either Arduino-mbed (mbed_nano or mbed_rp2040) or arduino-pico core to create and output PWM to any GPIO pin. 

diff --git a/src/PWM_Generic_Debug.h b/src/PWM_Generic_Debug.h
@@ -12,7 +12,7 @@
   Therefore, their executions are not blocked by bad-behaving functions / tasks.
   This important feature is absolutely necessary for mission-critical tasks.
 
-  Version: 1.0.5
+  Version: 1.1.0
 
   Version Modified By   Date      Comments
   ------- -----------  ---------- -----------
@@ -22,6 +22,7 @@
   1.0.3   K.Hoang      05/10/2021 Not reprogram if same PWM frequency. Add PIO strict `lib_compat_mode`
   1.0.4   K Hoang      22/10/2021 Fix platform in library.json for PIO
   1.0.5   K Hoang      06/01/2022 Permit changing dutyCycle and keep same frequency on-the-fly
+  1.1.0   K Hoang      24/02/2022 Permit PWM output for both channels of PWM slice. Use float instead of double
  *****************************************************************************************************************************/
 
 #pragma once