Simplified GetImage and enabled esp_cli for all modes

- `GetImage` function now uses only `display_buf`, `cam_buf` points to a certain region in this buffer
- `esp_cli` commands like cpu-dump, mem-dump, task-dump are now always accessible. `detect_image` is accessible only for `CLI_ONLY_INFERENCE`

Author: ShardulNalegave

examples/person_detection/main/app_camera_esp.c

@@ -42,8 +42,6 @@ int app_camera_init() {
 
 #if (CONFIG_TFLITE_USE_BSP)
   bsp_i2c_init();
-  bsp_display_start();
-  bsp_display_backlight_on();
   camera_config_t config = BSP_CAMERA_DEFAULT_CONFIG;
 
 #else // CONFIG_TFLITE_USE_BSP

examples/person_detection/main/detection_responder.cc

@@ -38,6 +38,24 @@ static lv_obj_t *label = NULL;
 
 void create_gui(void)
 {
+  bsp_display_cfg_t cfg = {
+    .lvgl_port_cfg = {
+      .task_priority = CONFIG_BSP_DISPLAY_LVGL_TASK_PRIORITY,
+      .task_stack = 6144,
+      .task_affinity = 1,
+      .task_max_sleep_ms = CONFIG_BSP_DISPLAY_LVGL_MAX_SLEEP,
+      .timer_period_ms = CONFIG_BSP_DISPLAY_LVGL_TICK,
+    },
+    .buffer_size = BSP_LCD_DRAW_BUFF_SIZE,
+    .double_buffer = BSP_LCD_DRAW_BUFF_DOUBLE,
+    .flags = {
+      .buff_dma = false,
+      .buff_spiram = true,
+    }
+  };
+  bsp_display_start_with_config(&cfg);
+  bsp_display_backlight_on();
+
   bsp_display_lock(0);
   camera_canvas = lv_canvas_create(lv_scr_act());
   assert(camera_canvas);

examples/person_detection/main/esp_cli.c

@@ -24,6 +24,7 @@
 #include "esp_cli.h"
 #include "esp_timer.h"
 
+#if CLI_ONLY_INFERENCE
 #define IMAGE_COUNT 10
 static uint8_t *image_database[IMAGE_COUNT];
 
@@ -38,6 +39,7 @@ extern const uint8_t image6_start[]   asm("_binary_image6_start");
 extern const uint8_t image7_start[]   asm("_binary_image7_start");
 extern const uint8_t image8_start[]   asm("_binary_image8_start");
 extern const uint8_t image9_start[]   asm("_binary_image9_start");
+#endif
 
 static const char *TAG = "[esp_cli]";
 
@@ -96,6 +98,7 @@ static int mem_dump_cli_handler(int argc, char *argv[])
     return 0;
 }
 
+#if CLI_ONLY_INFERENCE
 static int inference_cli_handler(int argc, char *argv[])
 {
     /* Just to go to the next line */
@@ -121,6 +124,18 @@ static int inference_cli_handler(int argc, char *argv[])
     return 0;
 }
 
+int esp_cli_register_inference_command() {
+    esp_console_cmd_t command = {
+        .command = "detect_image",
+        .help = "detect_image <image_number>"
+                "Note: image numbers ranging from 0 - 9 only are valid",
+        .func = inference_cli_handler,
+    };
+    esp_console_cmd_register(&command);
+    return 0;
+}
+#endif
+
 static esp_console_cmd_t diag_cmds[] = {
     {
         .command = "mem-dump",
@@ -137,12 +152,6 @@ static esp_console_cmd_t diag_cmds[] = {
         .help = "",
         .func = cpu_dump_cli_handler,
     },
-    {
-        .command = "detect_image",
-        .help = "detect_image <image_number>"
-                "Note: image numbers ranging from 0 - 9 only are valid",
-        .func = inference_cli_handler,
-    },
 };
 
 int esp_cli_register_cmds()
@@ -158,6 +167,7 @@ int esp_cli_register_cmds()
 
 static void image_database_init()
 {
+#if CLI_ONLY_INFERENCE
     image_database[0] = (uint8_t *) image0_start;
     image_database[1] = (uint8_t *) image1_start;
     image_database[2] = (uint8_t *) image2_start;
@@ -168,7 +178,7 @@ static void image_database_init()
     image_database[7] = (uint8_t *) image7_start;
     image_database[8] = (uint8_t *) image8_start;
     image_database[9] = (uint8_t *) image9_start;
-
+#endif
 }
 
 int esp_cli_start()

examples/person_detection/main/esp_cli.h

@@ -19,6 +19,7 @@ extern "C" {
 #endif
 
 int esp_cli_start();
+int esp_cli_register_inference_command();
 
 #ifdef __cplusplus
 }

examples/person_detection/main/image_provider.cc

@@ -29,7 +29,6 @@ limitations under the License.
 
 static const char* TAG = "app_camera";
 static uint16_t* display_buf;
-static uint16_t* cam_buf;
 
 // Get the camera module ready
 TfLiteStatus InitCamera() {
@@ -48,14 +47,6 @@ TfLiteStatus InitCamera() {
     ESP_LOGE(TAG, "Couldn't allocate display buffer");
     return kTfLiteError;
   }
-
-  if (cam_buf == NULL) {
-    cam_buf = (uint16_t *) heap_caps_malloc(96 * 96 * sizeof(uint16_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
-  }
-  if (display_buf == NULL) {
-    ESP_LOGE(TAG, "Couldn't allocate camera buffer");
-    return kTfLiteError;
-  }
 #endif // DISPLAY_SUPPORT
 
 #if ESP_CAMERA_SUPPORTED
@@ -90,13 +81,14 @@ TfLiteStatus GetImage(int image_width, int image_height, int channels, int8_t* i
   // Hence, we need to convert this data to grayscale to send it to tf model
   // For display we extra-polate the data to 192X192
 
-  memcpy(cam_buf, fb->buf, fb->len);
-  lv_draw_sw_rgb565_swap(fb->buf, 96 * 96);
+  // point to the last quarter of buffer
+  uint16_t* cam_buf = display_buf + (96 * 96 * 3);
+  memcpy((uint8_t*)cam_buf, fb->buf, fb->len);
+  esp_camera_fb_return(fb);
 
   for (int i = 0; i < kNumRows; i++) {
     for (int j = 0; j < kNumCols; j++) {
-      uint16_t pixel = ((uint16_t *) (fb->buf))[i * kNumCols + j];
-      uint16_t inference_pixel = ((uint16_t *) (cam_buf))[i * kNumCols + j];
+      uint16_t inference_pixel = cam_buf[i * kNumCols + j];
 
       // for inference
       uint8_t hb = inference_pixel & 0xFF;
@@ -112,7 +104,14 @@ TfLiteStatus GetImage(int image_width, int image_height, int channels, int8_t* i
       int8_t grey_pixel = ((305 * r + 600 * g + 119 * b) >> 10) - 128;
 
       image_data[i * kNumCols + j] = grey_pixel;
+    }
+  }
 
+  // for display
+  lv_draw_sw_rgb565_swap(cam_buf, 96 * 96);
+  for (int i = 0; i < kNumRows; i++) {
+    for (int j = 0; j < kNumCols; j++) {
+      uint16_t pixel = cam_buf[i * kNumCols + j];
       display_buf[2 * i * kNumCols * 2 + 2 * j] = pixel;
       display_buf[2 * i * kNumCols * 2 + 2 * j + 1] = pixel;
       display_buf[(2 * i + 1) * kNumCols * 2 + 2 * j] = pixel;
@@ -127,8 +126,6 @@ TfLiteStatus GetImage(int image_width, int image_height, int channels, int8_t* i
     image_data[i] = ((uint8_t *) fb->buf)[i] ^ 0x80;
   }
 #endif // DISPLAY_SUPPORT
-
-  esp_camera_fb_return(fb);
   /* here the esp camera can give you grayscale image directly */
   return kTfLiteOk;
 #else

examples/person_detection/main/main.cc

@@ -20,15 +20,13 @@ limitations under the License.
 #include "freertos/task.h"
 
 #include "esp_main.h"
-
-#if CLI_ONLY_INFERENCE
 #include "esp_cli.h"
-#endif
 
 void tf_main(void) {
   setup();
-#if CLI_ONLY_INFERENCE
   esp_cli_start();
+#if CLI_ONLY_INFERENCE
+  esp_cli_register_inference_command();
   vTaskDelay(portMAX_DELAY);
 #else
   while (true) {