From 91691ee629514fabd0c2123c0633f5f901ed4e78 Mon Sep 17 00:00:00 2001 From: Ihor Nehrutsa Date: Fri, 31 Jan 2025 12:48:09 +0200 Subject: [PATCH] Update machine_Counter.py --- tests/extmod_hardware/machine_Counter.py | 46 ++++++++++++------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/tests/extmod_hardware/machine_Counter.py b/tests/extmod_hardware/machine_Counter.py index f01ebb155b724..e642288702c0e 100644 --- a/tests/extmod_hardware/machine_Counter.py +++ b/tests/extmod_hardware/machine_Counter.py @@ -26,27 +26,27 @@ OUT_PIN2, INP_PIN2 = 16, 17 elif "esp8266" in sys.platform: # OUT_PIN1, INP_PIN1 = 4, 5 - # + # # OUT_PIN2, INP_PIN2 = 16, 17 pass elif "mimxrt" in sys.platform: # OUT_PIN1 = "D0" # INP_PIN1 = "D1" - # + # # OUT_PIN2 = "D2" # INP_PIN2 = "D3" pass elif "rp2" in sys.platform: # OUT_PIN1 = "GPIO0" # INP_PIN1 = "GPIO1" - # + # # OUT_PIN2 = "GPIO2" # INP_PIN2 = "GPIO3" pass elif "samd" in sys.platform: # OUT_PIN1 = "D0" # INP_PIN1 = "D1" - # + # # OUT_PIN2 = "D2" # INP_PIN2 = "D3" pass @@ -148,7 +148,7 @@ def callback_timer(timer): assert counter.value() == -1 print("Ok.") print() - + # counter.deinit() print("2) Test count if direction is a Pin().") @@ -196,18 +196,18 @@ def callback_timer(timer): print() print("Test count DOWN to -(2^16 + 1000).") out2(0) - toggle(out1, 2*(2**16 + 1000)) + toggle(out1, 2 * (2**16 + 1000)) print(counter, "value:", counter.value()) assert counter.value() == - (2**16 + 1000), - (2**16 + 1000) print("Ok.") print() - + # counter.deinit() print("4) Test count UP at inp1 Pin() & DOWN at inp2 Pin().") print("out1 -> inp1 is counted UP pulses.") print("out2 -> inp2 is counted DOWN pulses.") - + print("Test count UP on inp1 Pin() at RISING-FALLING edges.") counter = Counter(0, src=inp1, _src=inp2, edge=Counter.RISING | Counter.FALLING) is_callback = False @@ -320,7 +320,7 @@ def callback_timer(timer): print(counter, "value:", counter.value()) assert is_callback == True assert counter.value() <= MATCH + 100 * 3 - assert counter.value() > MATCH + 100 * 3 - MATCH * 0.5 + assert counter.value() > MATCH + 100 * 3 -MATCH * 0.5 assert counter.value() == counter1.value() print("Ok.") print() @@ -334,7 +334,7 @@ def callback_timer(timer): print(counter, "value:", counter.value()) assert is_callback == True assert counter.value() <= MATCH - assert counter.value() > MATCH - MATCH * 0.5 + assert counter.value() > MATCH -MATCH * 0.5 assert counter.value() == counter1.value() print("Ok.") print() @@ -348,7 +348,7 @@ def callback_timer(timer): print(counter, "value:", counter.value()) assert is_callback == True assert counter.value() <= 0 - assert counter.value() > - MATCH * 0.5 + assert counter.value() > -MATCH * 0.5 assert counter.value() == counter1.value() print("Ok.") print() @@ -364,7 +364,7 @@ def callback_timer(timer): # print(counter, "value:", counter.value()) # assert is_callback == True # assert counter.value() <= 0 - # assert counter.value() > - MATCH * 0.5 + # assert counter.value() > -MATCH * 0.5 # assert counter.value() == counter1.value() # print("Ok.") # print() @@ -372,21 +372,21 @@ def callback_timer(timer): counter.irq(handler=None, trigger=Counter.IRQ_ZERO) is_callback = False - counter.irq(handler=callback_pwm_deinit, trigger=Counter.IRQ_MATCH, value= - MATCH) + counter.irq(handler=callback_pwm_deinit, trigger=Counter.IRQ_MATCH, value=-MATCH) print(counter, "value:", counter.value()) pwm.init(freq=FREQ) - while counter.value() > - MATCH: + while counter.value() > -MATCH: pass print(counter, "value:", counter.value()) assert is_callback == True - assert counter.value() <= - MATCH + assert counter.value() <= -MATCH assert counter.value() > - (MATCH + MATCH * 0.5) assert counter.value() == counter1.value() print("Ok.") print() is_callback = False - counter.irq(handler=callback_pwm_deinit, trigger=Counter.IRQ_MATCH, value= - (MATCH + 100 * 3)) + counter.irq(handler=callback_pwm_deinit, trigger=Counter.IRQ_MATCH, value=-(MATCH + 100 * 3)) print(counter, "value:", counter.value()) pwm.init(freq=FREQ) while counter.value() > - (MATCH + 100 * 3): @@ -400,7 +400,7 @@ def callback_timer(timer): print() is_callback = False - counter.irq(handler=callback_pwm_deinit, trigger=Counter.IRQ_MATCH, value= - (MATCH + 100 * 5)) + counter.irq(handler=callback_pwm_deinit, trigger=Counter.IRQ_MATCH, value=-(MATCH + 100 * 5)) print(counter, "value:", counter.value()) pwm.init(freq=FREQ) while counter.value() > - (MATCH + 100 * 5): @@ -417,7 +417,7 @@ def callback_timer(timer): out2(1) is_callback = False - counter.irq(handler=callback_pwm_deinit, trigger=Counter.IRQ_MATCH, value= - (MATCH + 100 * 3)) + counter.irq(handler=callback_pwm_deinit, trigger=Counter.IRQ_MATCH, value=-(MATCH + 100 * 3)) print(counter, "value:", counter.value()) pwm.init(freq=FREQ) while counter.value() < - (MATCH + 100 * 3): @@ -425,21 +425,21 @@ def callback_timer(timer): print(counter, "value:", counter.value()) assert is_callback == True assert counter.value() >= - (MATCH + 100 * 3) - assert counter.value() < - (MATCH + 100 * 3 - MATCH * 0.5) + assert counter.value() < - (MATCH + 100 * 3 -MATCH * 0.5) assert counter.value() == counter1.value() print("Ok.") print() is_callback = False - counter.irq(handler=callback_pwm_deinit, trigger=Counter.IRQ_MATCH, value= - MATCH) + counter.irq(handler=callback_pwm_deinit, trigger=Counter.IRQ_MATCH, value=-MATCH) print(counter, "value:", counter.value()) pwm.init(freq=FREQ) - while counter.value() < - MATCH: + while counter.value() < -MATCH: pass print(counter, "value:", counter.value()) assert is_callback == True - assert counter.value() >= - MATCH - assert counter.value() < - (MATCH - MATCH * 0.5) + assert counter.value() >= -MATCH + assert counter.value() < - (MATCH -MATCH * 0.5) assert counter.value() == counter1.value() print("Ok.") print()