Skip to content
This repository has been archived by the owner on Jan 29, 2023. It is now read-only.

Commit

Permalink
v1.2.3 to fix DutyCycle bug, etc.
Browse files Browse the repository at this point in the history 
### Releases v1.2.3

1. Fix `DutyCycle` bug. Check [float precisison of DutyCycle only sometimes working #3](khoih-prog/SAMD_Slow_PWM#3)
2. Fix `New Period` display bug. Check [random dropouts #4](khoih-prog/SAMD_Slow_PWM#4)
3. Update examples
  • Loading branch information
@khoih-prog
khoih-prog authored Mar 4, 2022
1 parent 42d95b1 commit e52cd46
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 25 deletions.
12 changes: 9 additions & 3 deletions examples/ISR_8_PWMs_Array/ISR_8_PWMs_Array.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,23 @@
defined(ARDUINO_AVR_METRO) || defined(ARDUINO_AVR_PROTRINKET5) || defined(ARDUINO_AVR_PROTRINKET3) || defined(ARDUINO_AVR_PROTRINKET5FTDI) || \
defined(ARDUINO_AVR_PROTRINKET3FTDI) )
#define USE_TIMER_1 true
#warning Using Timer1
#else
#define USE_TIMER_3 true
#warning Using Timer3
#endif

// These define's must be placed at the beginning before #include "ESP32_PWM.h"
// These define's must be placed at the beginning before #include "AVR_Slow_PWM.h"
// _PWM_LOGLEVEL_ from 0 to 4
// Don't define _PWM_LOGLEVEL_ > 0. Only for special ISR debugging only. Can hang the system.
#define _PWM_LOGLEVEL_ 3

#if (_PWM_LOGLEVEL_ > 3)
#if USE_TIMER_1
#warning Using Timer1
#elif USE_TIMER_1
#warning Using Timer3
#endif
#endif

#define USING_MICROS_RESOLUTION true //false

// Default is true, uncomment to false
Expand Down
12 changes: 9 additions & 3 deletions examples/ISR_8_PWMs_Array_Complex/ISR_8_PWMs_Array_Complex.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,23 @@
defined(ARDUINO_AVR_METRO) || defined(ARDUINO_AVR_PROTRINKET5) || defined(ARDUINO_AVR_PROTRINKET3) || defined(ARDUINO_AVR_PROTRINKET5FTDI) || \
defined(ARDUINO_AVR_PROTRINKET3FTDI) )
#define USE_TIMER_1 true
#warning Using Timer1
#else
#define USE_TIMER_3 true
#warning Using Timer3
#endif

// These define's must be placed at the beginning before #include "ESP32_PWM.h"
// These define's must be placed at the beginning before #include "AVR_Slow_PWM.h"
// _PWM_LOGLEVEL_ from 0 to 4
// Don't define _PWM_LOGLEVEL_ > 0. Only for special ISR debugging only. Can hang the system.
#define _PWM_LOGLEVEL_ 3

#if (_PWM_LOGLEVEL_ > 3)
#if USE_TIMER_1
#warning Using Timer1
#elif USE_TIMER_1
#warning Using Timer3
#endif
#endif

#define USING_MICROS_RESOLUTION true //false

// Default is true, uncomment to false
Expand Down
12 changes: 9 additions & 3 deletions examples/ISR_8_PWMs_Array_Simple/ISR_8_PWMs_Array_Simple.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,23 @@
defined(ARDUINO_AVR_METRO) || defined(ARDUINO_AVR_PROTRINKET5) || defined(ARDUINO_AVR_PROTRINKET3) || defined(ARDUINO_AVR_PROTRINKET5FTDI) || \
defined(ARDUINO_AVR_PROTRINKET3FTDI) )
#define USE_TIMER_1 true
#warning Using Timer1
#else
#define USE_TIMER_3 true
#warning Using Timer3
#endif

// These define's must be placed at the beginning before #include "ESP32_PWM.h"
// These define's must be placed at the beginning before #include "AVR_Slow_PWM.h"
// _PWM_LOGLEVEL_ from 0 to 4
// Don't define _PWM_LOGLEVEL_ > 0. Only for special ISR debugging only. Can hang the system.
#define _PWM_LOGLEVEL_ 3

#if (_PWM_LOGLEVEL_ > 3)
#if USE_TIMER_1
#warning Using Timer1
#elif USE_TIMER_1
#warning Using Timer3
#endif
#endif

#define USING_MICROS_RESOLUTION true //false

// Default is true, uncomment to false
Expand Down
12 changes: 9 additions & 3 deletions examples/ISR_Changing_PWM/ISR_Changing_PWM.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,23 @@
defined(ARDUINO_AVR_METRO) || defined(ARDUINO_AVR_PROTRINKET5) || defined(ARDUINO_AVR_PROTRINKET3) || defined(ARDUINO_AVR_PROTRINKET5FTDI) || \
defined(ARDUINO_AVR_PROTRINKET3FTDI) )
#define USE_TIMER_1 true
#warning Using Timer1
#else
#define USE_TIMER_3 true
#warning Using Timer3
#endif

// These define's must be placed at the beginning before #include "ESP32_PWM.h"
// These define's must be placed at the beginning before #include "AVR_Slow_PWM.h"
// _PWM_LOGLEVEL_ from 0 to 4
// Don't define _PWM_LOGLEVEL_ > 0. Only for special ISR debugging only. Can hang the system.
#define _PWM_LOGLEVEL_ 3

#if (_PWM_LOGLEVEL_ > 3)
#if USE_TIMER_1
#warning Using Timer1
#elif USE_TIMER_1
#warning Using Timer3
#endif
#endif

#define USING_MICROS_RESOLUTION true //false

// Default is true, uncomment to false
Expand Down
24 changes: 15 additions & 9 deletions examples/ISR_Modify_PWM/ISR_Modify_PWM.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,23 @@
defined(ARDUINO_AVR_METRO) || defined(ARDUINO_AVR_PROTRINKET5) || defined(ARDUINO_AVR_PROTRINKET3) || defined(ARDUINO_AVR_PROTRINKET5FTDI) || \
defined(ARDUINO_AVR_PROTRINKET3FTDI) )
#define USE_TIMER_1 true
#warning Using Timer1
#else
#define USE_TIMER_3 true
#warning Using Timer3
#endif

// These define's must be placed at the beginning before #include "ESP32_PWM.h"
// These define's must be placed at the beginning before #include "AVR_Slow_PWM.h"
// _PWM_LOGLEVEL_ from 0 to 4
// Don't define _PWM_LOGLEVEL_ > 0. Only for special ISR debugging only. Can hang the system.
#define _PWM_LOGLEVEL_ 3

#if (_PWM_LOGLEVEL_ > 3)
#if USE_TIMER_1
#warning Using Timer1
#elif USE_TIMER_1
#warning Using Timer3
#endif
#endif

#define USING_MICROS_RESOLUTION true //false

// Default is true, uncomment to false
Expand Down Expand Up @@ -86,19 +92,19 @@ void TimerHandler()
uint32_t PWM_Pin = LED_BUILTIN;

// You can assign any interval for any timer here, in Hz
float PWM_Freq1 = 1.0f;
float PWM_Freq1 = 200.0f; //1.0f;
// You can assign any interval for any timer here, in Hz
float PWM_Freq2 = 2.0f;
float PWM_Freq2 = 100.0f; //2.0f;

// You can assign any interval for any timer here, in microseconds
uint32_t PWM_Period1 = 1000000 / PWM_Freq1;
// You can assign any interval for any timer here, in microseconds
uint32_t PWM_Period2 = 1000000 / PWM_Freq2;

// You can assign any duty_cycle for any PWM here, from 0-100
float PWM_DutyCycle1 = 50.0;
float PWM_DutyCycle1 = 1.0f; //50.0f;
// You can assign any duty_cycle for any PWM here, from 0-100
float PWM_DutyCycle2 = 90.0;
float PWM_DutyCycle2 = 5.55f; //90.0f;

// Channel number used to identify associated channel
int channelNum;
Expand Down Expand Up @@ -207,8 +213,8 @@ void changePWM()
{
static uint8_t count = 1;

double PWM_Freq;
uint32_t PWM_DutyCycle;
float PWM_Freq;
float PWM_DutyCycle;

if (count++ % 2)
{
Expand Down
6 changes: 2 additions & 4 deletions examples/multiFileProject/multiFileProject.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@
defined(ARDUINO_AVR_METRO) || defined(ARDUINO_AVR_PROTRINKET5) || defined(ARDUINO_AVR_PROTRINKET3) || defined(ARDUINO_AVR_PROTRINKET5FTDI) || \
defined(ARDUINO_AVR_PROTRINKET3FTDI) )
#define USE_TIMER_1 true
#warning Using Timer1
#else
#define USE_TIMER_3 true
#warning Using Timer3
#endif

#define AVR_SLOW_PWM_VERSION_MIN_TARGET F("AVR_Slow_PWM v1.2.2")
#define AVR_SLOW_PWM_VERSION_MIN 1002002
#define AVR_SLOW_PWM_VERSION_MIN_TARGET F("AVR_Slow_PWM v1.2.3")
#define AVR_SLOW_PWM_VERSION_MIN 1002003

#include "multiFileProject.h"

Expand Down

0 comments on commit e52cd46

Please sign in to comment.