Skip to content

TIMER refactoring #7904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Mar 31, 2023
+192 −273
Merged

TIMER refactoring #7904

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b9f243a
refactor using GPtimer
P-R-O-C-H-Y Feb 28, 2023
acd8672
Updated timer HW test
P-R-O-C-H-Y Feb 28, 2023
82da5a6
fix examples
P-R-O-C-H-Y Feb 28, 2023
fcc3b17
Add v2.0.7 in issue template (#7871)
VojtechBartoska Feb 20, 2023
15a68e6
refactor using GPtimer
P-R-O-C-H-Y Feb 28, 2023
ca6013e
Updated timer HW test
P-R-O-C-H-Y Feb 28, 2023
8b7c06d
fix examples
P-R-O-C-H-Y Feb 28, 2023
745e267
Merge branch 'Timer-refactoring' of https://github.com/P-R-O-C-H-Y/ar…
P-R-O-C-H-Y Feb 28, 2023
909535f
Revert "Add v2.0.7 in issue template (#7871)"
P-R-O-C-H-Y Feb 28, 2023
1ba2280
Update upload-artifact to v3 in HW CI
P-R-O-C-H-Y Mar 1, 2023
529f9e5
Revert "Update upload-artifact to v3 in HW CI"
P-R-O-C-H-Y Mar 1, 2023
ee97642
replace resolution with frequency
P-R-O-C-H-Y Mar 16, 2023
346fa4e
remove count_down option
P-R-O-C-H-Y Mar 16, 2023
b39eb3e
countup removed from examples + header
P-R-O-C-H-Y Mar 16, 2023
eaaa51f
Refactored timer object
P-R-O-C-H-Y Mar 17, 2023
3aef5f7
code cleanup + examples and tests fixes
P-R-O-C-H-Y Mar 17, 2023
d3c9393
TimerAlarm fix
P-R-O-C-H-Y Mar 17, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
TimerAlarm fix
  • Loading branch information
@P-R-O-C-H-Y
P-R-O-C-H-Y committed Mar 17, 2023
commit d3c9393681f6e44ccc86387ddc54c2c1aeba7697
2 changes: 1 addition & 1 deletion libraries/ESP32/examples/Timer/RepeatTimer/RepeatTimer.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ void setup() {

// Set alarm to call onTimer function every second (value in microseconds).
// Repeat the alarm (third parameter) with unlimited count = 0 (fourth parameter).
timerAlarmWrite(timer, 1000000, true, 0);
timerAlarm(timer, 1000000, true, 0);
}

void loop() {
Expand Down
2 changes: 1 addition & 1 deletion libraries/ESP32/examples/Timer/WatchdogTimer/WatchdogTimer.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ void setup() {
pinMode(button, INPUT_PULLUP); //init control pin
timer = timerBegin(1000000); //timer 1Mhz resolution
timerAttachInterrupt(timer, &resetModule); //attach callback
timerAlarmWrite(timer, wdtTimeout * 1000, false, 0); //set time in us
timerAlarm(timer, wdtTimeout * 1000, false, 0); //set time in us
}

void loop() {
Expand Down
2 changes: 1 addition & 1 deletion tests/timer/timer.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ void timer_interrupt_test(void){

alarm_flag = false;
timerAttachInterrupt(timer, &onTimer);
timerAlarmWrite(timer, (1.2 * TIMER_FREQUENCY), true, 0);
timerAlarm(timer, (1.2 * TIMER_FREQUENCY), true, 0);
timerStart(timer);

delay(2000);
Expand Down