Revert "camera: use VGA camera resolution for esp32s3"

QVGA appears to give faster and more accurate results when scanning than
VGA for Jade Plus.

Includes some minor cleanup since the surrounding code has changed
slightly.

This reverts commit 52df986.

Author: jgriffiths

main/camera.c

@@ -37,12 +37,10 @@ void camera_set_debug_image(const uint8_t* data, const size_t len)
 // as we don't want the unit to shut down because of apparent inactivity.
 #define CAMERA_MIN_TIMEOUT_SECS 300
 
-// Size of the image as provided by the camera - note this should be consistent
-// with CAMERA_IMAGE_WIDTH and CAMERA_IMAGE_HEIGHT !  TODO: fetch from Kconfig?
-#ifdef CONFIG_IDF_TARGET_ESP32S3
-#define CAMERA_IMAGE_RESOLUTION FRAMESIZE_VGA
-#else
+// Size of the image as provided by the camera
 #define CAMERA_IMAGE_RESOLUTION FRAMESIZE_QVGA
+#if (CAMERA_IMAGE_WIDTH != 320) || (CAMERA_IMAGE_HEIGHT != 240)
+#error CAMERA_IMAGE_WIDTH/HEIGHT inconsistent with CAMERA_IMAGE_RESOLUTION!
 #endif
 
 #define CAM_MIN(a, b) (a < b ? a : b)
@@ -543,12 +541,7 @@ void jade_camera_process_images(camera_process_fn_t fn, void* ctx, const bool sh
     const UBaseType_t mem_caps = MALLOC_CAP_DEFAULT | MALLOC_CAP_INTERNAL;
 #endif
 
-#if defined(CONFIG_IDF_TARGET_ESP32S3) && defined(CONFIG_RETURN_CAMERA_IMAGES)
-    const uint32_t stack_size = 18 * 1024;
-#else
     const uint32_t stack_size = 16 * 1024;
-#endif
-
     TaskHandle_t camera_task;
     const BaseType_t retval = xTaskCreatePinnedToCoreWithCaps(&jade_camera_task, "jade_camera", stack_size,
         &camera_config, JADE_TASK_PRIO_CAMERA, &camera_task, JADE_CORE_SECONDARY, mem_caps);

main/camera.h

@@ -8,15 +8,10 @@
 #include <stddef.h>
 #include <stdint.h>
 
-// Size of the image as provided by the camera - note this should be consistent
-// with CAMERA_IMAGE_RESOLUTION !  TODO: fetch from Kconfig?
-#ifdef CONFIG_IDF_TARGET_ESP32S3
-#define CAMERA_IMAGE_WIDTH 640
-#define CAMERA_IMAGE_HEIGHT 480
-#else
+// Size of the image as provided by the camera
+// TODO: fetch from Kconfig?
 #define CAMERA_IMAGE_WIDTH 320
 #define CAMERA_IMAGE_HEIGHT 240
-#endif
 
 // How much image (central area) is displayed on screen
 uint16_t camera_displayed_image_width(void);

main/process.h

@@ -21,20 +21,15 @@
 #define MAX_INPUT_MSG_SIZE (1024 * 401)
 #endif
 
+#ifndef CONFIG_RETURN_CAMERA_IMAGES
 // This should be the size of the largest valid output message.
 // Used by ble and serial when sending messages. (pinserver handshake)
-// NOTE: if CONFIG_RETURN_CAMERA_IMAGES is defined we allocate a larger
-// buffer as image sizes are much larger than standard messges.
-#define MAX_STANDARD_OUTPUT_MSG_SIZE (1024 * 3)
-#ifdef CONFIG_RETURN_CAMERA_IMAGES
-#ifdef CONFIG_IDF_TARGET_ESP32S3
-#define MAX_OUTPUT_MSG_SIZE (MAX_STANDARD_OUTPUT_MSG_SIZE * 100)
-#else
-#define MAX_OUTPUT_MSG_SIZE (MAX_STANDARD_OUTPUT_MSG_SIZE * 30)
-#endif // CONFIG_IDF_TARGET_ESP32S3
+#define MAX_OUTPUT_MSG_SIZE (1024 * 3)
 #else
-#define MAX_OUTPUT_MSG_SIZE MAX_STANDARD_OUTPUT_MSG_SIZE
-#endif // CONFIG_RETURN_CAMERA_IMAGES
+// When CONFIG_RETURN_CAMERA_IMAGES is defined we allocate a larger
+// buffer as image sizes are much larger than standard messges.
+#define MAX_OUTPUT_MSG_SIZE ((1024 * 3) * 30)
+#endif
 
 // Cbor encoding function prototype
 typedef void (*cbor_encoder_fn_t)(const void*, CborEncoder*);