From 6787f03f0a1c6e7c3dad056bc297b602f35b1cf9 Mon Sep 17 00:00:00 2001
From: RedHawk <tadshig@gmail.com>
Date: Thu, 4 May 2023 15:46:32 +0300
Subject: [PATCH] LiquidCrystal.cpp: [#22] Fixed the interrupt.

---
 source/shoh/src/peripherals/LiquidCrystal.cpp | 63 ++++++++-----------
 1 file changed, 27 insertions(+), 36 deletions(-)

diff --git a/source/shoh/src/peripherals/LiquidCrystal.cpp b/source/shoh/src/peripherals/LiquidCrystal.cpp
index 18d30c9..2b9b636 100644
--- a/source/shoh/src/peripherals/LiquidCrystal.cpp
+++ b/source/shoh/src/peripherals/LiquidCrystal.cpp
@@ -7,50 +7,58 @@
 #define HIGH 1
 #define MHz1 1000000
 
-/**
- * @brief	Handle interrupt from 32-bit timer 0
- * @return	Nothing
- */
-void TIMER32_0_IRQHandler(void)
-{
-	if (Chip_TIMER_MatchPending(LPC_TIMER32_0, 1)) {
-		Chip_TIMER_ClearMatch(LPC_TIMER32_0, 1);
-	}
+static bool match_flag = false;
+
+extern "C" {
+  /**
+   * @brief	Handle interrupt from 32-bit timer 0
+   * Sets match_flag to true when the match occurs.
+   * @return	Nothing
+   */
+  void TIMER32_0_IRQHandler(void)
+  {
+    if(Chip_TIMER_MatchPending(LPC_TIMER32_0, 0)) {
+      Chip_TIMER_ClearMatch(LPC_TIMER32_0, 0);
+      match_flag = true;
+    }
+  }
 }
 
-#if 1
 void delayMicroseconds(unsigned int us)
 {
+  /* Reset match flag */
+  match_flag = false;
+
   /* Initialize 32-bit timer 0 clock */
-	Chip_TIMER_Init(LPC_TIMER32_0);
+  Chip_TIMER_Init(LPC_TIMER32_0);
 
   /* Timer setup for match and interrupt at TICKRATE_HZ */
   Chip_TIMER_Reset(LPC_TIMER32_0);
 
   /* Enable timer to generate interrupt when time matches */
-  Chip_TIMER_MatchEnableInt(LPC_TIMER32_0, 1);
+  Chip_TIMER_MatchEnableInt(LPC_TIMER32_0, 0);
 
   /* Setup 32-bit timer's duration (32-bit match time) */
   /* Once_per_microsecond * number_of_microseconds. */
-	Chip_TIMER_SetMatch(LPC_TIMER32_0, 1, (Chip_Clock_GetSystemClockRate() / MHz1 * us));
+  Chip_TIMER_SetMatch(LPC_TIMER32_0, 0, (Chip_Clock_GetSystemClockRate() / MHz1 * us));
 
   /* Setup timer to stop when match occurs */
-  Chip_TIMER_StopOnMatchEnable(LPC_TIMER32_0, 1);
+  Chip_TIMER_StopOnMatchEnable(LPC_TIMER32_0, 0);
 
   /* Start timer */
   Chip_TIMER_Enable(LPC_TIMER32_0);
 
   /* Clear timer of any pending interrupts */
-	NVIC_ClearPendingIRQ(TIMER_32_0_IRQn);
+  NVIC_ClearPendingIRQ(TIMER_32_0_IRQn);
 
   /* Enable timer interrupt */
-	NVIC_EnableIRQ(TIMER_32_0_IRQn);
+  NVIC_EnableIRQ(TIMER_32_0_IRQn);
 
   /* Wait for the interrupt to trigger */
-  while(Chip_TIMER_MatchPending(LPC_TIMER32_0, 1));
+  while(!match_flag);
 
   /*Disable the interrupt*/
-  Chip_TIMER_MatchDisableInt(LPC_TIMER32_0, 1);
+  Chip_TIMER_MatchDisableInt(LPC_TIMER32_0, 0);
 
   /* Disable timer */
   Chip_TIMER_Disable(LPC_TIMER32_0);
@@ -58,23 +66,6 @@ void delayMicroseconds(unsigned int us)
   /* Deinitialise timer. */
   Chip_TIMER_DeInit(LPC_TIMER32_0);
 }
-#else
-void delayMicroseconds(uint32_t delay)
-{
-	static int init;
-	if(!init) {
-		// start core clock counter
-		CoreDebug->DEMCR |= 1 << 24;
-		DWT->CTRL |= 1;
-		init = 1;
-	}
-
-	uint32_t start = DWT->CYCCNT;
-	delay = delay * 72; // assuming 72MHz clock
-	while(DWT->CYCCNT - start < delay);
-}
-
-#endif
 
 // When the display powers up, it is configured as follows:
 //
@@ -98,7 +89,7 @@ void delayMicroseconds(uint32_t delay)
 
 
 LiquidCrystal::LiquidCrystal(DigitalIoPin *rs,  DigitalIoPin *enable,
-			     DigitalIoPin *d0, DigitalIoPin *d1, DigitalIoPin *d2, DigitalIoPin *d3)
+           DigitalIoPin *d0, DigitalIoPin *d1, DigitalIoPin *d2, DigitalIoPin *d3)
 {
   rs_pin = rs;
   enable_pin = enable;