1 files changed, 27 insertions, 16 deletions

diff --git a/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
index 0a1389a226..da3e2e9f44 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c
@@ -23,27 +23,38 @@
 #include "adc.h"
 #include "adc-target.h"
 #include "kernel.h"
+#include "tsc2100.h"
+#include "button-target.h"
 
-/* prototypes */
-static void adc_tick(void);
+void read_battery_inputs(void);
 
 void adc_init(void)
 {
-    /* attach the adc reading to the tick */
-    tick_add_task(adc_tick);
+    /* Initialize the touchscreen and the battery readout */
+    tsc2100_adc_init();
+    
+    /* Enable the tsc2100 interrupt */
+    IO_INTC_EINT2 |= (1<<3); /* IRQ_GIO14 */
 }
 
-/* Called to get the recent ADC reading */
-inline unsigned short adc_read(int channel)
+/* Touchscreen data available interupt */
+void GIO14(void)
 {
-    return (short)channel;
+    short tsadc = tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS);
+    short adscm = (tsadc&TSADC_ADSCM_MASK)>>TSADC_ADSCM_SHIFT;
+    
+    /* Always read all registers in one go to clear any missed flags */
+    tsc2100_read_data();
+    
+    switch (adscm)
+    {
+        case 1:
+        case 2:
+            touch_read_coord();
+            break;
+        case 0x0B:
+            read_battery_inputs();
+            break;
+    }
+    IO_INTC_IRQ2 = (1<<3); /* IRQ_GIO14 == 35 */
 }
-
-/* add this to the tick so that the ADC converts are done in the background */
-static void adc_tick(void)
-{
-}
-
-
-
-