(nuttx-apps) branch master updated: testing/monkey: add screen offset config support

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new f1fc3616d testing/monkey: add screen offset config support
f1fc3616d is described below

commit f1fc3616d05da7948ade853b78c2b7c75bc67ab7
Author: pengyiqiang <pengyiqi...@xiaomi.com>
AuthorDate: Wed Oct 9 16:20:12 2024 +0800

    testing/monkey: add screen offset config support
    
    Signed-off-by: pengyiqiang <pengyiqi...@xiaomi.com>
---
 testing/monkey/monkey_event.c | 16 ++++++++++++----
 testing/monkey/monkey_main.c  | 22 +++++++++++++++++++---
 testing/monkey/monkey_type.h  |  2 ++
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/testing/monkey/monkey_event.c b/testing/monkey/monkey_event.c
index c60d52a24..5e19d3a19 100644
--- a/testing/monkey/monkey_event.c
+++ b/testing/monkey/monkey_event.c
@@ -82,6 +82,8 @@ void monkey_event_gen(FAR struct monkey_s *monkey,
   int rnd;
   int duration_min;
   int duration_max;
+  int x_offset;
+  int y_offset;
 
   memset(param, 0, sizeof(struct monkey_event_param_s));
 
@@ -109,12 +111,18 @@ void monkey_event_gen(FAR struct monkey_s *monkey,
 
   duration_min = monkey->config.event[param->event].duration_min;
   duration_max = monkey->config.event[param->event].duration_max;
+  x_offset = monkey->config.screen.x_offset;
+  y_offset = monkey->config.screen.y_offset;
 
   param->duration = monkey_random(duration_min, duration_max);
-  param->x1 = monkey_random(0, monkey->config.screen.hor_res - 1);
-  param->y1 = monkey_random(0, monkey->config.screen.ver_res - 1);
-  param->x2 = monkey_random(0, monkey->config.screen.hor_res - 1);
-  param->y2 = monkey_random(0, monkey->config.screen.ver_res - 1);
+  param->x1 = monkey_random(x_offset,
+                            x_offset + monkey->config.screen.hor_res - 1);
+  param->y1 = monkey_random(y_offset,
+                            y_offset + monkey->config.screen.ver_res - 1);
+  param->x2 = monkey_random(x_offset,
+                            x_offset + monkey->config.screen.hor_res - 1);
+  param->y2 = monkey_random(y_offset,
+                            y_offset + monkey->config.screen.ver_res - 1);
 
   MONKEY_LOG_INFO("event=%d(%s) duration=%d x1=%d y1=%d x2=%d y2=%d",
                   param->event,
diff --git a/testing/monkey/monkey_main.c b/testing/monkey/monkey_main.c
index 21ae1b010..eab797053 100644
--- a/testing/monkey/monkey_main.c
+++ b/testing/monkey/monkey_main.c
@@ -126,6 +126,8 @@ struct monkey_param_s
 {
   int dev_type_mask;
   FAR const char *file_path;
+  int x_offset;
+  int y_offset;
   int hor_res;
   int ver_res;
   int period_min;
@@ -165,7 +167,8 @@ static void show_usage(FAR const char *progname, int 
exitcode)
          " --weight-drag <decimal-value>\n"
          " --duration-click <string>"
          " --duration-longpress <string>"
-         " --duration-drag <string>\n",
+         " --duration-drag <string>\n"
+         " --screen-offset <string>\n",
          progname);
 
   printf("\nWhere:\n");
@@ -193,6 +196,8 @@ static void show_usage(FAR const char *progname, int 
exitcode)
          "<decimal-value min>-<decimal-value max>.\n");
   printf("  --duration-drag <string> Drag duration(ms) range: "
          "<decimal-value min>-<decimal-value max>.\n");
+  printf("  --screen-offset <string> Screen offset: "
+         "<decimal-value x_offset>,<decimal-value y_offset>\n");
 
   exit(exitcode);
 }
@@ -264,6 +269,8 @@ static FAR struct monkey_s *monkey_init(
     }
 
   monkey_config_default_init(&config);
+  config.screen.x_offset = param->x_offset;
+  config.screen.y_offset = param->y_offset;
   config.screen.hor_res = param->hor_res;
   config.screen.ver_res = param->ver_res;
   config.period.min = param->period_min;
@@ -273,9 +280,11 @@ static FAR struct monkey_s *monkey_init(
   monkey_set_config(monkey, &config);
   monkey_log_set_level(param->log_level);
 
-  MONKEY_LOG_NOTICE("Screen: %dx%d",
+  MONKEY_LOG_NOTICE("Screen: %dx%d, offset: %d,%d",
                     config.screen.hor_res,
-                    config.screen.ver_res);
+                    config.screen.ver_res,
+                    config.screen.x_offset,
+                    config.screen.y_offset);
   MONKEY_LOG_NOTICE("Period: %" PRIu32 " ~ %" PRIu32 "ms",
                     config.period.min,
                     config.period.max);
@@ -360,6 +369,12 @@ static void parse_long_commandline(int argc, FAR char 
**argv,
                         "-");
         break;
 
+      case 6:
+        OPTARG_TO_RANGE(param->x_offset,
+                        param->y_offset,
+                        ",");
+        break;
+
       default:
         MONKEY_LOG_WARN("Unknown longindex: %d", longindex);
         show_usage(argv[0], EXIT_FAILURE);
@@ -385,6 +400,7 @@ static void parse_commandline(int argc, FAR char **argv,
       {"duration-click",     required_argument, NULL, 0 },
       {"duration-longpress", required_argument, NULL, 0 },
       {"duration-drag",      required_argument, NULL, 0 },
+      {"screen-offset",      required_argument, NULL, 0 },
       {0,                    0,                 NULL, 0 }
     };
 
diff --git a/testing/monkey/monkey_type.h b/testing/monkey/monkey_type.h
index 43a39f797..1312a82e7 100644
--- a/testing/monkey/monkey_type.h
+++ b/testing/monkey/monkey_type.h
@@ -98,6 +98,8 @@ struct monkey_config_s
 {
   struct
   {
+    int x_offset;
+    int y_offset;
     int hor_res;
     int ver_res;
   } screen;