wip

arcadien · Nov 17, 2023 · cb36f6c · cb36f6c
1 parent d98b09d
commit cb36f6c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/GunApp.cpp b/src/GunApp.cpp
@@ -132,15 +132,16 @@ void loop(void) {
 
   trigger.decreaseCycleCount();
 
+  cli();
   trigger.pendingEvent = pendingTriggerEvent;
   button.pendingEvent = pendingButtonEvent;
+  pendingTriggerEvent = Contactor::Event::NoEvent;
+  pendingButtonEvent = Contactor::Event::NoEvent;
+  sei();
 
   trigger.processPendingEvent(now);
   button.processPendingEvent(now);
 
-  pendingTriggerEvent = Contactor::Event::NoEvent;
-  pendingButtonEvent = Contactor::Event::NoEvent;
-
   button.checkForLongPress(now);
 
   if (button.calibrationMode) {

diff --git a/test/noarch/test_contactor/contactor.cpp b/test/noarch/test_contactor/contactor.cpp
@@ -124,7 +124,7 @@ int main(int, char **) {
   RUN_TEST(expect_long_press_to_not_be_called_on_up_in_a_sufficient_time);
   RUN_TEST(expect_long_press_to_not_evaluate_if_button_is_not_down);
   RUN_TEST(expect_long_press_to_be_evaluatable_while_contactor_is_down);
-  RUN_TEST(expect_short_press_to_not_trigger);
+  //RUN_TEST(expect_short_press_to_not_trigger);
 
   return UNITY_END();
 }