From cd0cfa1d404b025d96923a8fc229df08b7bbc24a Mon Sep 17 00:00:00 2001
From: true <true_git@trueserve.org>
Date: Sat, 16 Nov 2024 13:29:40 -0800
Subject: [PATCH] minor cleanup in V003 code

---
 nametag8_V003/.cproject                       | 2 +-
 nametag8_V003/.settings/language.settings.xml | 2 +-
 nametag8_V003/user/ch32v00x_conf.h            | 4 ++--
 nametag8_V003/user/device/irda.c              | 4 +++-
 nametag8_V003/user/device/irda.h              | 4 ++--
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/nametag8_V003/.cproject b/nametag8_V003/.cproject
index 3688c69..13a178e 100644
--- a/nametag8_V003/.cproject
+++ b/nametag8_V003/.cproject
@@ -64,7 +64,7 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.include.paths.1567947810" name="Include paths (-I)" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Debug}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Core}&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/User}&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/user}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/Peripheral/inc}&quot;"/>
 								</option>
 								<option id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.std.2020844713" name="Language standard" superClass="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.std" useByScannerDiscovery="true" value="ilg.gnumcueclipse.managedbuild.cross.riscv.option.c.compiler.std.gnu99" valueType="enumerated"/>
diff --git a/nametag8_V003/.settings/language.settings.xml b/nametag8_V003/.settings/language.settings.xml
index 4a661c0..87d54d5 100644
--- a/nametag8_V003/.settings/language.settings.xml
+++ b/nametag8_V003/.settings/language.settings.xml
@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-16790866626903596" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="472368321955700908" id="ilg.gnumcueclipse.managedbuild.cross.riscv.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT RISC-V Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
diff --git a/nametag8_V003/user/ch32v00x_conf.h b/nametag8_V003/user/ch32v00x_conf.h
index ce626b7..d906d92 100644
--- a/nametag8_V003/user/ch32v00x_conf.h
+++ b/nametag8_V003/user/ch32v00x_conf.h
@@ -23,11 +23,11 @@
 #include <ch32v00x_misc.h>
 #include <ch32v00x_pwr.h>
 #include <ch32v00x_rcc.h>
-#include <ch32v00x_spi.h>
+//#include <ch32v00x_spi.h>
 #include <ch32v00x_tim.h>
 #include <ch32v00x_usart.h>
 #include <ch32v00x_wwdg.h>
-#include <ch32v00x_opa.h>
+//#include <ch32v00x_opa.h>
 
 #include "ch32v00x_it.h"
 
diff --git a/nametag8_V003/user/device/irda.c b/nametag8_V003/user/device/irda.c
index 1f3ca1d..8ef30b2 100644
--- a/nametag8_V003/user/device/irda.c
+++ b/nametag8_V003/user/device/irda.c
@@ -26,7 +26,7 @@
 #include "irda.h"
 
 #include "intr_out.h"
-#include "../i2c_slave.h"
+#include "i2c_slave.h"
 
 
 
@@ -106,6 +106,7 @@ void irda_ena_rx()
     USART1->CTLR2 &= ~USART_CTLR1_TE;
     USART1->CTLR2 |=  USART_CTLR1_RE;
 
+    USART_ClearITPendingBit(USART1, USART_IT_RXNE);
     USART_ITConfig(USART1, USART_IT_RXNE, ENABLE);
 }
 
@@ -255,6 +256,7 @@ void irda_process()
     }
 
     irda_timeout--;
+    i2cs_reg[REG_IRDA_TIMER] = irda_timeout;
 
     switch (irda_state) {
         case IRDA_STATE_TX_HEADER:
diff --git a/nametag8_V003/user/device/irda.h b/nametag8_V003/user/device/irda.h
index f33d2ce..1c6adff 100644
--- a/nametag8_V003/user/device/irda.h
+++ b/nametag8_V003/user/device/irda.h
@@ -25,8 +25,8 @@ enum {
 
 
 
-#define IRDA_HEADER_01  0x5a
-#define IRDA_HEADER_02  0xa5
+#define IRDA_HEADER_01          0x5a
+#define IRDA_HEADER_02          0xa5
 
 
 #define IRDA_SD_PORT            GPIOA