Skip to content

Commit 71ddddf

Browse files
ckormanyosckormanyos
committed
Adapt some PWM clients
1 parent 7e8492e commit 71ddddf

5 files changed

Lines changed: 45 additions & 39 deletions

File tree

‎examples/chapter04_04/src/mcal_pwm/mcal_pwm_port.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
#include <mcal_pwm/mcal_pwm_base.h>
1212

13+
#include <algorithm>
14+
1315
namespace mcal { namespace pwm {
1416

1517
// A software PWM template for a port-pin having the standard

‎examples/chapter04_04a/src/mcal_pwm/mcal_pwm_port.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
#include <mcal_pwm/mcal_pwm_base.h>
1212

13+
#include <algorithm>
14+
1315
namespace mcal { namespace pwm {
1416

1517
// A software PWM template for a port-pin having the standard

‎ref_app/src/mcal_pwm/mcal_pwm_port.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
#include <mcal_pwm/mcal_pwm_base.h>
1212

13+
#include <algorithm>
14+
1315
namespace mcal { namespace pwm {
1416

1517
// A software PWM template for a port-pin having the standard

‎ref_app/target/micros/xtensa_esp32_s3/startup/coprocessor_binary.S‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.global coprocessor_bin
33
coprocessor_bin:
44
.byte 0x6F, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00
5-
.byte 0x17, 0x11, 0x00, 0x00, 0x13, 0x01, 0x41, 0x4B, 0x6F, 0x00, 0x00, 0x27, 0x41, 0x11, 0x06, 0xC6
5+
.byte 0x17, 0x11, 0x00, 0x00, 0x13, 0x01, 0x41, 0x4B, 0x6F, 0x00, 0xC0, 0x28, 0x41, 0x11, 0x06, 0xC6
66
.byte 0x31, 0x2A, 0xB2, 0x40, 0x41, 0x01, 0x82, 0x80, 0xB7, 0x16, 0x00, 0x50, 0x03, 0xA7, 0xC6, 0x09
77
.byte 0xB7, 0x17, 0x00, 0x50, 0x93, 0x87, 0x47, 0x0B, 0x3A, 0x95, 0x63, 0x74, 0xF5, 0x00, 0x23, 0xAE
88
.byte 0xA6, 0x08, 0x3A, 0x85, 0x82, 0x80, 0x00, 0x00, 0x82, 0x80, 0x00, 0x00, 0x82, 0x80, 0x00, 0x00
@@ -27,32 +27,33 @@ coprocessor_bin:
2727
.byte 0xB7, 0x06, 0x00, 0x40, 0x23, 0x2A, 0xD7, 0x0A, 0xB7, 0x46, 0xD8, 0x50, 0xB7, 0xF7, 0x01, 0x60
2828
.byte 0x23, 0x2C, 0x07, 0x0A, 0x93, 0x86, 0x16, 0xAA, 0xF4, 0xD3, 0x23, 0xA4, 0x07, 0x04, 0x23, 0xA2
2929
.byte 0x07, 0x06, 0x82, 0x80, 0x00, 0x00, 0x00, 0x00, 0x82, 0x80, 0x00, 0x00, 0x05, 0x45, 0x82, 0x80
30-
.byte 0x00, 0x00, 0x00, 0x00, 0x23, 0x14, 0xB5, 0x00, 0x82, 0x80, 0x00, 0x00, 0x82, 0x80, 0x00, 0x00
31-
.byte 0xB1, 0x45, 0x69, 0xBD, 0x41, 0x11, 0x01, 0x45, 0x06, 0xC6, 0xAD, 0x37, 0x37, 0x17, 0x00, 0x50
32-
.byte 0x13, 0x07, 0x87, 0x0B, 0x83, 0x57, 0x67, 0x00, 0x83, 0x55, 0x47, 0x00, 0xB7, 0x1E, 0x00, 0x50
33-
.byte 0xA9, 0x66, 0x37, 0x08, 0x00, 0xF8, 0x93, 0x8E, 0x8E, 0x01, 0x93, 0x86, 0x06, 0x40, 0x7D, 0x18
34-
.byte 0x05, 0x43, 0x01, 0x4E, 0xB7, 0x08, 0x00, 0x08, 0x13, 0x05, 0x00, 0x10, 0x11, 0x67, 0x6D, 0x07
35-
.byte 0x85, 0x07, 0xC2, 0x07, 0x90, 0x42, 0xC1, 0x83, 0x63, 0xE5, 0xF5, 0x02, 0x33, 0x66, 0x16, 0x01
36-
.byte 0x90, 0xC2, 0x7D, 0x17, 0x63, 0x8B, 0xA7, 0x00, 0x65, 0xF7, 0x05, 0x0E, 0x13, 0x77, 0xFE, 0x03
37-
.byte 0x06, 0x07, 0x76, 0x97, 0x03, 0x53, 0x07, 0x00, 0xD1, 0xBF, 0x9A, 0x85, 0x81, 0x47, 0x69, 0xFB
38-
.byte 0xED, 0xB7, 0x33, 0x76, 0x06, 0x01, 0x90, 0xC2, 0xE9, 0xBF, 0x00, 0x00, 0x37, 0x17, 0x00, 0x50
39-
.byte 0xB7, 0x16, 0x00, 0x50, 0xA9, 0x67, 0x13, 0x07, 0x87, 0x0B, 0x93, 0x86, 0x86, 0x00, 0x14, 0xC3
40-
.byte 0x83, 0xA6, 0x07, 0x40, 0x37, 0x06, 0x00, 0xF8, 0x7D, 0x16, 0xF1, 0x8E, 0x23, 0xA0, 0xD7, 0x40
41-
.byte 0x03, 0xA5, 0x87, 0x4C, 0x37, 0x08, 0x08, 0x00, 0xBE, 0x86, 0x33, 0x65, 0x05, 0x01, 0x23, 0xA4
42-
.byte 0xA7, 0x4C, 0x83, 0xA5, 0x07, 0x40, 0x37, 0x05, 0x00, 0x08, 0x6D, 0x8E, 0x23, 0xA0, 0xC7, 0x40
43-
.byte 0x83, 0xA7, 0xC7, 0x40, 0x23, 0x22, 0x07, 0x00, 0x23, 0x14, 0x07, 0x00, 0xC9, 0x8F, 0x23, 0xA6
44-
.byte 0xF6, 0x40, 0x82, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x11, 0x06, 0xC6, 0xA5, 0x3D, 0x39, 0x20
45-
.byte 0xB5, 0x20, 0x6F, 0xF0, 0x3F, 0xF2, 0x09, 0x37, 0xFD, 0xBF, 0x00, 0x00, 0xB7, 0x16, 0x00, 0x50
46-
.byte 0x37, 0x17, 0x00, 0x50, 0x93, 0x86, 0x06, 0x0A, 0x93, 0x05, 0xC7, 0x09, 0xB7, 0x17, 0x00, 0x50
47-
.byte 0x33, 0x85, 0xB6, 0x40, 0x13, 0x86, 0xC7, 0x09, 0x2A, 0x96, 0x63, 0x8D, 0xB6, 0x00, 0x13, 0x07
48-
.byte 0xC7, 0x09, 0x93, 0x87, 0xC7, 0x09, 0x94, 0x43, 0x91, 0x07, 0x11, 0x07, 0x23, 0x2E, 0xD7, 0xFE
49-
.byte 0xE3, 0x1B, 0xF6, 0xFE, 0xB7, 0x17, 0x00, 0x50, 0x37, 0x17, 0x00, 0x50, 0x93, 0x86, 0x07, 0x0A
50-
.byte 0x13, 0x07, 0x47, 0x0C, 0x63, 0x89, 0xE6, 0x00, 0x93, 0x87, 0x07, 0x0A, 0x23, 0xA0, 0x07, 0x00
51-
.byte 0x91, 0x07, 0xE3, 0x9D, 0xE7, 0xFE, 0x82, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x11, 0x22, 0xC4
52-
.byte 0x26, 0xC2, 0x37, 0x14, 0x00, 0x50, 0xB7, 0x14, 0x00, 0x50, 0x06, 0xC6, 0x93, 0x07, 0xC4, 0x09
53-
.byte 0x93, 0x84, 0x84, 0x09, 0x63, 0x8A, 0x97, 0x00, 0x13, 0x04, 0xC4, 0x09, 0x83, 0x27, 0xC4, 0xFF
54-
.byte 0x71, 0x14, 0x82, 0x97, 0xE3, 0x1C, 0x94, 0xFE, 0xB2, 0x40, 0x22, 0x44, 0x92, 0x44, 0x41, 0x01
55-
.byte 0x82, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
30+
.byte 0x00, 0x00, 0x00, 0x00, 0x13, 0x07, 0x80, 0x3E, 0xAE, 0x87, 0x63, 0x73, 0xB7, 0x00, 0xBA, 0x87
31+
.byte 0x23, 0x14, 0xF5, 0x00, 0x82, 0x80, 0x00, 0x00, 0x82, 0x80, 0x00, 0x00, 0xB1, 0x45, 0x79, 0xB5
32+
.byte 0x41, 0x11, 0x01, 0x45, 0x06, 0xC6, 0xB9, 0x3F, 0x37, 0x17, 0x00, 0x50, 0x13, 0x07, 0x87, 0x0B
33+
.byte 0xB7, 0x1E, 0x00, 0x50, 0xA9, 0x66, 0x37, 0x08, 0x00, 0xF8, 0x83, 0x57, 0x67, 0x00, 0x83, 0x55
34+
.byte 0x47, 0x00, 0x93, 0x8E, 0x8E, 0x01, 0x93, 0x86, 0x06, 0x40, 0x7D, 0x18, 0x05, 0x47, 0x01, 0x4E
35+
.byte 0x13, 0x05, 0x80, 0x3E, 0xB7, 0x08, 0x00, 0x08, 0x3A, 0x83, 0x63, 0x74, 0xE5, 0x00, 0x13, 0x03
36+
.byte 0x80, 0x3E, 0x42, 0x03, 0x11, 0x67, 0x13, 0x53, 0x03, 0x01, 0x6D, 0x07, 0x85, 0x07, 0xC2, 0x07
37+
.byte 0x90, 0x42, 0xC1, 0x83, 0x63, 0xE5, 0xF5, 0x02, 0x33, 0x66, 0x16, 0x01, 0x90, 0xC2, 0x7D, 0x17
38+
.byte 0x63, 0x8B, 0xA7, 0x00, 0x65, 0xF7, 0x05, 0x0E, 0x13, 0x77, 0xFE, 0x03, 0x06, 0x07, 0x76, 0x97
39+
.byte 0x03, 0x57, 0x07, 0x00, 0xD1, 0xB7, 0x9A, 0x85, 0x81, 0x47, 0x69, 0xFB, 0xED, 0xB7, 0x33, 0x76
40+
.byte 0x06, 0x01, 0x90, 0xC2, 0xE9, 0xBF, 0x00, 0x00, 0x37, 0x17, 0x00, 0x50, 0xB7, 0x16, 0x00, 0x50
41+
.byte 0xA9, 0x67, 0x13, 0x07, 0x87, 0x0B, 0x93, 0x86, 0x86, 0x00, 0x14, 0xC3, 0x83, 0xA6, 0x07, 0x40
42+
.byte 0x37, 0x06, 0x00, 0xF8, 0x7D, 0x16, 0xF1, 0x8E, 0x23, 0xA0, 0xD7, 0x40, 0x03, 0xA5, 0x87, 0x4C
43+
.byte 0x37, 0x08, 0x08, 0x00, 0xBE, 0x86, 0x33, 0x65, 0x05, 0x01, 0x23, 0xA4, 0xA7, 0x4C, 0x83, 0xA5
44+
.byte 0x07, 0x40, 0x37, 0x05, 0x00, 0x08, 0x6D, 0x8E, 0x23, 0xA0, 0xC7, 0x40, 0x83, 0xA7, 0xC7, 0x40
45+
.byte 0x23, 0x22, 0x07, 0x00, 0x23, 0x14, 0x07, 0x00, 0xC9, 0x8F, 0x23, 0xA6, 0xF6, 0x40, 0x82, 0x80
46+
.byte 0x00, 0x00, 0x00, 0x00, 0x41, 0x11, 0x06, 0xC6, 0xB1, 0x3D, 0x39, 0x20, 0xB5, 0x20, 0x6F, 0xF0
47+
.byte 0x3F, 0xF1, 0xDD, 0x35, 0xFD, 0xBF, 0x00, 0x00, 0xB7, 0x16, 0x00, 0x50, 0x37, 0x17, 0x00, 0x50
48+
.byte 0x93, 0x86, 0x06, 0x0A, 0x93, 0x05, 0xC7, 0x09, 0xB7, 0x17, 0x00, 0x50, 0x33, 0x85, 0xB6, 0x40
49+
.byte 0x13, 0x86, 0xC7, 0x09, 0x2A, 0x96, 0x63, 0x8D, 0xB6, 0x00, 0x13, 0x07, 0xC7, 0x09, 0x93, 0x87
50+
.byte 0xC7, 0x09, 0x94, 0x43, 0x91, 0x07, 0x11, 0x07, 0x23, 0x2E, 0xD7, 0xFE, 0xE3, 0x1B, 0xF6, 0xFE
51+
.byte 0xB7, 0x17, 0x00, 0x50, 0x37, 0x17, 0x00, 0x50, 0x93, 0x86, 0x07, 0x0A, 0x13, 0x07, 0x47, 0x0C
52+
.byte 0x63, 0x89, 0xE6, 0x00, 0x93, 0x87, 0x07, 0x0A, 0x23, 0xA0, 0x07, 0x00, 0x91, 0x07, 0xE3, 0x9D
53+
.byte 0xE7, 0xFE, 0x82, 0x80, 0x00, 0x00, 0x00, 0x00, 0x41, 0x11, 0x22, 0xC4, 0x26, 0xC2, 0x37, 0x14
54+
.byte 0x00, 0x50, 0xB7, 0x14, 0x00, 0x50, 0x06, 0xC6, 0x93, 0x07, 0xC4, 0x09, 0x93, 0x84, 0x84, 0x09
55+
.byte 0x63, 0x8A, 0x97, 0x00, 0x13, 0x04, 0xC4, 0x09, 0x83, 0x27, 0xC4, 0xFF, 0x71, 0x14, 0x82, 0x97
56+
.byte 0xE3, 0x1C, 0x94, 0xFE, 0xB2, 0x40, 0x22, 0x44, 0x92, 0x44, 0x41, 0x01, 0x82, 0x80, 0x00, 0x00
5657
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
5758
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
5859
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -256,14 +257,13 @@ coprocessor_bin:
256257
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
257258
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
258259
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
259-
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
260-
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xAC, 0x01, 0x00, 0x50, 0xB0, 0x01, 0x00, 0x50
260+
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB8, 0x01, 0x00, 0x50, 0xBC, 0x01, 0x00, 0x50
261261
.byte 0x9C, 0x01, 0x00, 0x50, 0xA4, 0x01, 0x00, 0x50, 0x01, 0x00, 0x02, 0x00, 0x03, 0x00, 0x04, 0x00
262262
.byte 0x05, 0x00, 0x06, 0x00, 0x07, 0x00, 0x08, 0x00, 0x09, 0x00, 0x0A, 0x00, 0x0B, 0x00, 0x0C, 0x00
263263
.byte 0x0D, 0x00, 0x0E, 0x00, 0x0F, 0x00, 0x10, 0x00, 0x11, 0x00, 0x12, 0x00, 0x13, 0x00, 0x14, 0x00
264264
.byte 0x15, 0x00, 0x16, 0x00, 0x17, 0x00, 0x18, 0x00, 0x19, 0x00, 0x1A, 0x00, 0x1B, 0x00, 0x1C, 0x00
265-
.byte 0x1D, 0x00, 0x1E, 0x00, 0x1F, 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x24, 0x00, 0x26, 0x00
266-
.byte 0x28, 0x00, 0x2A, 0x00, 0x2C, 0x00, 0x2E, 0x00, 0x30, 0x00, 0x32, 0x00, 0x34, 0x00, 0x36, 0x00
267-
.byte 0x38, 0x00, 0x3A, 0x00, 0x3C, 0x00, 0x3E, 0x00, 0x40, 0x00, 0x44, 0x00, 0x48, 0x00, 0x4C, 0x00
268-
.byte 0x50, 0x00, 0x54, 0x00, 0x58, 0x00, 0x60, 0x00, 0x70, 0x00, 0x80, 0x00, 0x90, 0x00, 0xA0, 0x00
269-
.byte 0xB0, 0x00, 0xC0, 0x00, 0xE0, 0x00, 0x00, 0x01, 0x2C, 0x02, 0x00, 0x50, 0xAC, 0x10, 0x00, 0x50
265+
.byte 0x1D, 0x00, 0x1E, 0x00, 0x1F, 0x00, 0x20, 0x00, 0x21, 0x00, 0x22, 0x00, 0x23, 0x00, 0x24, 0x00
266+
.byte 0x26, 0x00, 0x28, 0x00, 0x2A, 0x00, 0x2C, 0x00, 0x2E, 0x00, 0x30, 0x00, 0x32, 0x00, 0x34, 0x00
267+
.byte 0x36, 0x00, 0x38, 0x00, 0x3A, 0x00, 0x3C, 0x00, 0x3E, 0x00, 0x42, 0x00, 0x44, 0x00, 0x46, 0x00
268+
.byte 0x48, 0x00, 0x4A, 0x00, 0x4C, 0x00, 0x4E, 0x00, 0x50, 0x00, 0x52, 0x00, 0x54, 0x00, 0x56, 0x00
269+
.byte 0x59, 0x00, 0x5C, 0x00, 0x60, 0x00, 0x64, 0x00, 0x48, 0x02, 0x00, 0x50, 0xAC, 0x10, 0x00, 0x50

‎ref_app/target/micros/xtensa_esp32_s3_riscv_cop/startup/main.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ namespace
3737
{
3838
using pwm_port_type = mcal::port::port_pin<UINT32_C(17)>;
3939

40-
using pwm_type = mcal::pwm::pwm_port<pwm_port_type, mcal::pwm::pwm_base::duty_type { UINT16_C(256) }>;
40+
using pwm_type = mcal::pwm::pwm_port<pwm_port_type>;
4141

4242
using duty_type = typename pwm_type::duty_type;
4343

@@ -52,10 +52,10 @@ namespace
5252
9U, 10U, 11U, 12U, 13U, 14U, 15U, 16U,
5353
17U, 18U, 19U, 20U, 21U, 22U, 23U, 24U,
5454
25U, 26U, 27U, 28U, 29U, 30U, 31U, 32U,
55-
33U, 34U, 36U, 38U, 40U, 42U, 44U, 46U,
56-
48U, 50U, 52U, 54U, 56U, 58U, 60U, 62U,
57-
64U, 68U, 72U, 76U, 80U, 84U, 88U, 96U,
58-
112U, 128U, 144U, 160U, 176U, 192U, 224U, 256U
55+
33U, 34U, 35U, 36U, 38U, 40U, 42U, 44U,
56+
46U, 48U, 50U, 52U, 54U, 56U, 58U, 60U,
57+
62U, 66U, 68U, 70U, 72U, 74U, 76U, 78U,
58+
80U, 82U, 84U, 86U, 89U, 92U, 96U, 100U,
5959
};
6060

6161
static_assert

0 commit comments

Comments
 (0)