Nuvoton / Mbed OS NuMaker-mbed-emWin-example

NuMaker emWin HMI

Files at this revision

API Documentation at this revision

Revision 4:3d28c66231b0, committed 2021-02-25

Comitter:
SHLIU1@OANBE02333.nuvoton.com
Date:
Thu Feb 25 15:40:31 2021 +0800
Parent:
3:ff78c029f033
Child:
5:818b7cd6db35
Commit message:
Support the both V5.X and V6.X for mbed-os

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
tslib/M48XTouchPanel.c Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Fri Apr 12 11:27:23 2019 +0800
+++ b/main.cpp	Thu Feb 25 15:40:31 2021 +0800
@@ -61,6 +61,9 @@
 //
 int main(void)
 {
+#ifdef MBED_MAJOR_VERSION
+    printf("Mbed OS version %d.%d.%d\r\n\n", MBED_MAJOR_VERSION, MBED_MINOR_VERSION, MBED_PATCH_VERSION);
+#endif
     //
     // Before touch calibration
     //

--- a/tslib/M48XTouchPanel.c	Fri Apr 12 11:27:23 2019 +0800
+++ b/tslib/M48XTouchPanel.c	Thu Feb 25 15:40:31 2021 +0800
@@ -70,7 +70,7 @@
     /* Enable the sample module 1 interrupt.  */
     EADC_ENABLE_INT(EADC, BIT1);    //Enable sample module A/D ADINT1 interrupt.
     EADC_ENABLE_SAMPLE_MODULE_INT(EADC, 1, BIT1);    //Enable sample module 1 interrupt.
-    NVIC_EnableIRQ(ADC1_IRQn);
+    NVIC_EnableIRQ(43); //for ADC1_IRQn and EADC01_IRQn
 
     /* Reset the ADC interrupt indicator and trigger sample module 1 to start A/D conversion */
     g_u32AdcIntFlag_TP = 0;
@@ -117,7 +117,7 @@
     /* Enable the sample module 2 interrupt.  */
     EADC_ENABLE_INT(EADC, BIT2);    //Enable sample module A/D ADINT1 interrupt.
     EADC_ENABLE_SAMPLE_MODULE_INT(EADC, 1, BIT2);    //Enable sample module 2 interrupt.
-    NVIC_EnableIRQ(ADC1_IRQn);
+    NVIC_EnableIRQ(43); //for ADC1_IRQn and EADC01_IRQn)
 
     /* Reset the ADC interrupt indicator and trigger sample module 2 to start A/D conversion */
     g_u32AdcIntFlag_TP = 0;