fix(Examples): Fixed bug in FaceId RISC-V example (#807)

Co-authored-by: Jake Carter <[email protected]>
Co-authored-by: Jake Carter <[email protected]>

Author: vicloginov

Examples/MAX78000/CNN/asl_demo/README.md

@@ -25,21 +25,21 @@ Universal instructions on building, flashing, and debugging this project can be
 * This project comes pre-configured for the MAX78000EVKIT.  See [Board Support Packages](https://analog-devices-msdk.github.io/msdk/USERGUIDE/#board-support-packages) in the UG for instructions on changing the target board.
 
 * This project supports output to a TFT display.
-    * For the MAX78000EVKIT, the TFT display is **enabled** by default.  It can be _disabled_ by commenting out `#define ENABLE_TFT` in [example_config.h](example_config.h).
+    * For the MAX78000EVKIT, the TFT display is **enabled** by default.  It can be _disabled_ by commenting out `#define TFT_ENABLE` in [example_config.h](example_config.h).
 
         ```C
         #ifdef BOARD_EVKIT_V1
-        // #define ENABLE_TFT
+        // #define TFT_ENABLE
         #include "bitmap.h"
         #include "tft_ssd2119.h"
         #endif
         ```
 
-    * For the MAX78000FTHR, the TFT display is **disabled** by default.  The TFT display is not supplied with the MAX78000 Feather board. The compatible 2.4'' TFT FeatherWing display can be ordered [here](https://learn.adafruit.com/adafruit-2-4-tft-touch-screen-featherwing).  To _enable_ the display code, uncomment `#define ENABLE_TFT` in [example_config.h](example_config.h)
+    * For the MAX78000FTHR, the TFT display is **disabled** by default.  The TFT display is not supplied with the MAX78000 Feather board. The compatible 2.4'' TFT FeatherWing display can be ordered [here](https://learn.adafruit.com/adafruit-2-4-tft-touch-screen-featherwing).  To _enable_ the display code, uncomment `#define TFT_ENABLE` in [example_config.h](example_config.h)
 
         ```C
         #ifdef BOARD_FTHR_REVA
-        // #define ENABLE_TFT
+        // #define TFT_ENABLE
         #include "tft_ili9341.h"
         #endif
         ```

Examples/MAX78000/CNN/asl_demo/example_config.h

@@ -2,13 +2,13 @@
 #define CONFIG_H
 
 #ifdef BOARD_EVKIT_V1
-#define ENABLE_TFT
+#define TFT_ENABLE
 #include "bitmap.h"
 #include "tft_ssd2119.h"
 #endif
 
 #ifdef BOARD_FTHR_REVA
-// #define ENABLE_TFT
+// #define TFT_ENABLE
 #include "tft_ili9341.h"
 #endif
 

Examples/MAX78000/CNN/digit-detection-demo/README.md

@@ -37,7 +37,7 @@ Universal instructions on building, flashing, and debugging this project can be
         #endif
         ```
 
-    * For the MAX78000FTHR, the TFT display is **disabled** by default.  The TFT display is not supplied with the MAX78000 Feather board. The compatible 2.4'' TFT FeatherWing display can be ordered [here](https://learn.adafruit.com/adafruit-2-4-tft-touch-screen-featherwing).  To _enable_ the display code, uncomment `#define ENABLE_TFT` in [example_config.h](example_config.h)
+    * For the MAX78000FTHR, the TFT display is **disabled** by default.  The TFT display is not supplied with the MAX78000 Feather board. The compatible 2.4'' TFT FeatherWing display can be ordered [here](https://learn.adafruit.com/adafruit-2-4-tft-touch-screen-featherwing).  To _enable_ the display code, uncomment `#define TFT_ENABLE` in [example_config.h](example_config.h)
 
         ```C
         #ifdef BOARD_FTHR_REVA

Examples/MAX78000/CNN/faceid_evkit-riscv/include/faceID.h

@@ -65,7 +65,7 @@
 #define IMAGE_READY 3
 #define RESULT_READY 4
 
-#define CAPTURE_X 70
+#define CAPTURE_X 50
 #define CAPTURE_Y 290
 #define SKIP_X 60
 #define SKIP_Y 290

Examples/MAX78000/CNN/faceid_evkit-riscv/main.c

@@ -197,7 +197,7 @@ static void screen_faceID(void)
 #ifdef BOARD_EVKIT_V1
     MXC_TFT_ShowImage(BACK_X, BACK_Y, left_arrow_bmp); // back button icon
 #endif
-    MXC_TFT_PrintFont(98, 5, font, &screen_msg[0], NULL); // FACEID DEMO
+    MXC_TFT_PrintFont(50, 5, font, &screen_msg[0], NULL); // FACEID DEMO
     MXC_TFT_PrintFont(12, 240, font, &screen_msg[1], NULL); // Process Time:
     // texts
 #ifdef TS_ENABLE
@@ -212,7 +212,7 @@ static int init(void)
     uint8_t *raw;
     uint32_t w, h;
     area_t area1 = { 150, 240, 50, 30 };
-    area_t area2 = { 60, 290, 180, 30 };
+    area_t area2 = { 50, 290, 180, 30 };
 
     screen_faceID();
 
@@ -402,7 +402,7 @@ int main(void)
     MXC_RTC_Start();
 
 #ifdef TFT_ENABLE
-
+    printf("TFT init\n");
 #ifdef BOARD_EVKIT_V1
     /* Initialize TFT display */
     MXC_TFT_Init();
@@ -446,6 +446,7 @@ int main(void)
     NVIC_EnableIRQ(RISCV_IRQn);
     MXC_SYS_ClockEnable(MXC_SYS_PERIPH_CLOCK_CPU1); // Enable RISC-V clock
 
+#ifdef LP_MODE_ENABLE
     // Get ticks based off of milliseconds
     MXC_WUT_GetTicks(LP_TIME, MXC_WUT_UNIT_MILLISEC, &ticks);
 
@@ -462,14 +463,13 @@ int main(void)
     MXC_LP_EnableWUTAlarmWakeup();
 
     NVIC_EnableIRQ(WUT_IRQn);
+#endif
 
 #ifndef TFT_ENABLE
     int i;
 
     for (i = 0; i < (1 << 27); i++) {}
     // Let debugger interrupt if needed
-
-    __WFI(); // ARM sleeps
 #endif
 
 #ifndef TS_ENABLE
@@ -485,8 +485,10 @@ int main(void)
 #endif
 
         if (key > 0) {
+#ifdef LP_MODE_ENABLE
             // Start Wakeup Timer in case RISC-V sleeps
             MXC_WUT_Enable();
+#endif
             arm_mail_box[0] = START_FACEID;
             state->prcss_key(key);
         }

Examples/MAX78000/CNN/faceid_evkit-riscv/main_riscv.c

@@ -134,9 +134,9 @@ int main(void)
     /* Enable camera power */
     Camera_Power(POWER_ON);
     MXC_Delay(300000);
-    PR_DEBUG("\n\nFaceID Feather Demo\n");
+    PR_DEBUG("FaceID Feather Demo\n");
 #else
-    PR_DEBUG("\n\nFaceID Evkit Demo\n");
+    PR_DEBUG("FaceID Evkit Demo\n");
 #endif
 
     // Initialize the camera driver.

Examples/MAX78000/CNN/faceid_evkit-riscv/project.mk

@@ -23,7 +23,7 @@ endif
 # Place build files specific to FTHR_RevA here.
 ifeq "$(BOARD)" "FTHR_RevA"
 # Only Enable if 2.4" TFT is connected to Feather
-#PROJ_CFLAGS+=-DENABLE_TFT
+#PROJ_CFLAGS+=-DTFT_ENABLE
 FONTS = LiberationSans16x16
 endif
 

Examples/MAX78000/CNN/kws20_demo-riscv/README.md

@@ -196,7 +196,7 @@ To compile code with enabled TFT feature use following setting in project.mk:
 
 ```bash
 ifeq "$(BOARD)" "FTHR_RevA"
-PROJ_CFLAGS += -DENABLE_TFT
+PROJ_CFLAGS += -DTFT_ENABLE
 endif
 ```
 

Examples/MAX78000/CNN/kws20_demo-riscv/main.c

@@ -77,7 +77,7 @@
 extern volatile void const *__FlashStart_; // Defined in linker file
 char buff[TFT_BUFF_SIZE];
 
-#ifdef ENABLE_TFT
+#ifdef TFT_ENABLE
 void TFT_Intro(void);
 void TFT_Print(char *str, int x, int y, int font, int length);
 void TFT_End(uint16_t words);
@@ -127,7 +127,7 @@ int main(void)
 
     printf("Analog Devices \nKeyword Spotting Demo\nVer. %s \n", VERSION);
 
-#ifdef ENABLE_TFT
+#ifdef TFT_ENABLE
     MXC_Delay(500000);
     printf("\n*** Init TFT ***\n");
 #ifdef BOARD_EVKIT_V1
@@ -169,9 +169,11 @@ int main(void)
         //  printf("mailbox ARM: %x\n",&mail_box[0]);
 
     while (1) {
-        int16_t max = 0; // soft_max output is 0->32767
-        int16_t max_index = -1;
+#ifdef TFT_ENABLE
         int i = 0;
+        int16_t max = 0; // soft_max output is 0->32767
+#endif
+        int16_t max_index;
 
         //LED_On(0);
         __WFI(); // Let RISC-V run
@@ -181,7 +183,7 @@ int main(void)
 
         /* is there anything in the mail box? */
         if (mail_box[MAILBOX_SIZE - 1]) {
-#ifdef ENABLE_TFT
+#ifdef TFT_ENABLE
             // update TFT message
             MXC_TFT_ClearScreen();
             memset(buff, 32, TFT_BUFF_SIZE);
@@ -218,7 +220,7 @@ int main(void)
 }
 
 /************************************************************************************/
-#ifdef ENABLE_TFT
+#ifdef TFT_ENABLE
 void TFT_Intro(void)
 {
     char buff[TFT_BUFF_SIZE];

Examples/MAX78000/CNN/kws20_demo-riscv/project.mk

@@ -9,17 +9,18 @@
 
 ifeq "$(BOARD)" ""
 BOARD = EvKit_V1
+#BOARD=FTHR_RevA
 endif
 
 # Place build files specific to EvKit_V1 here.
 ifeq "$(BOARD)" "EvKit_V1"
-PROJ_CFLAGS+=-DENABLE_TFT
+PROJ_CFLAGS+=-DTFT_ENABLE
 endif
 
 # Place build files specific to FTHR_RevA here.
 ifeq "$(BOARD)" "FTHR_RevA"
 # Only Enable if 2.4" TFT is connected to Feather
-# PROJ_CFLAGS+=-DENABLE_TFT
+#PROJ_CFLAGS+=-DTFT_ENABLE
 FONTS = LiberationSans16x16
 endif
 

Examples/MAX78000/CNN/kws20_demo/README.md

@@ -365,7 +365,7 @@ When option `-a` is used, each file is converted to a .wav file once and subsequ
 
 ***Note 1: When `SEND_MIC_OUT_SDCARD` is selected, the Wake-Up Timer (WUT) is disabled.***
 
-***Note 2: When `SEND_MIC_OUT_SDCARD` is selected, the `ENABLE_TFT` is disabled regardless of make options.***
+***Note 2: When `SEND_MIC_OUT_SDCARD` is selected, the `TFT_ENABLE` is disabled regardless of make options.***
 
 ### Sending Sound Snippets to serial
 

Examples/MAX78000/CNN/kws20_demo/main.c

@@ -109,13 +109,13 @@
 #ifdef SEND_MIC_OUT_SDCARD
 #undef WUT_ENABLE
 #warning !!! Disabling WUT_ENABLE option when SD card is enabled !!!
-#ifdef ENABLE_TFT
-#undef ENABLE_TFT
+#ifdef TFT_ENABLE
+#undef TFT_ENABLE
 #warning !!! TFT cannot be used when SD card is enabled  !!!
 #endif
 #endif
 
-#ifdef ENABLE_TFT
+#ifdef TFT_ENABLE
 #define DISPLAY_AUDIO // displays audio waveform on TFT
 #endif
 
@@ -266,7 +266,7 @@ uint8_t check_inference(q15_t *ml_soft, int32_t *ml_data, int16_t *out_class, do
 void I2SInit();
 void HPF_init(void);
 int16_t HPF(int16_t input);
-#ifdef ENABLE_TFT
+#ifdef TFT_ENABLE
 void TFT_Intro(void);
 void TFT_Print(char *str, int x, int y, int font, int length);
 void TFT_End(uint16_t words);
@@ -280,7 +280,7 @@ int image_bitmap = (int)&img_1_rgb565[0];
 int font_1 = (int)&Liberation_Sans16x16[0];
 int font_2 = (int)&Liberation_Sans16x16[0];
 #endif
-#endif //#ifdef ENABLE_TFT
+#endif //#ifdef TFT_ENABLE
 
 int32_t tot_usec = -100000;
 #ifdef WUT_ENABLE
@@ -466,7 +466,7 @@ int main(void)
     I2SInit();
 #endif
 
-#ifdef ENABLE_TFT
+#ifdef TFT_ENABLE
     MXC_Delay(500000);
     PR_DEBUG("\n*** Init TFT ***\n");
 #ifdef BOARD_EVKIT_V1
@@ -495,7 +495,7 @@ int main(void)
 #else
 
     MXC_Delay(SEC(2)); // wait for debugger to connect
-#endif // #ifdef ENABLE_TFT
+#endif // #ifdef TFT_ENABLE
 
     PR_INFO("\n*** READY ***\n");
 #ifdef WUT_ENABLE
@@ -918,7 +918,7 @@ int main(void)
     LED_Off(LED2);
     PR_DEBUG("Total Samples:%d, Total Words: %d \n", sampleCounter, wordCounter);
 
-#ifdef ENABLE_TFT
+#ifdef TFT_ENABLE
     TFT_End(wordCounter);
 #endif
 
@@ -979,7 +979,7 @@ void I2SInit()
 /* **************************************************************************** */
 uint8_t check_inference(q15_t *ml_soft, int32_t *ml_data, int16_t *out_class, double *out_prob)
 {
-#ifdef ENABLE_TFT
+#ifdef TFT_ENABLE
     char buff[TFT_BUFF_SIZE];
 #endif
     int32_t temp[NUM_OUTPUTS];
@@ -1004,7 +1004,7 @@ uint8_t check_inference(q15_t *ml_soft, int32_t *ml_data, int16_t *out_class, do
         if (top == 0) {
             *out_class = max_index;
             *out_prob = 100.0 * max / 32768.0;
-#ifndef ENABLE_TFT
+#ifndef TFT_ENABLE
             break;
         }
 
@@ -1317,7 +1317,7 @@ int16_t HPF(int16_t input)
 }
 
 /************************************************************************************/
-#ifdef ENABLE_TFT
+#ifdef TFT_ENABLE
 void TFT_Intro(void)
 {
     char buff[TFT_BUFF_SIZE];

Examples/MAX78000/CNN/kws20_demo/project.mk

@@ -21,7 +21,7 @@ MXC_OPTIMIZE_CFLAGS = -O2
 
 # Place build files specific to EvKit_V1 here.
 ifeq "$(BOARD)" "EvKit_V1"
-PROJ_CFLAGS+=-DENABLE_TFT
+PROJ_CFLAGS+=-DTFT_ENABLE
 IPATH += TFT/evkit/
 VPATH += TFT/evkit/
 endif
@@ -32,7 +32,7 @@ endif
 # Place build files specific to FTHR_RevA here.
 ifeq "$(BOARD)" "FTHR_RevA"
 # Only Enable if 2.4" TFT is connected to Feather
-#PROJ_CFLAGS+=-DENABLE_TFT
+#PROJ_CFLAGS+=-DTFT_ENABLE
 
 # If enabled, it saves out the Mic samples used for inference to SDCARD
 # Note that if both SDCARD and TFT are enabled, the TFT will be disabled to avoid SPI driver conflict.