Merge pull request #345 from shorepine/yscale

Setting y-scale for touchscreen, #343
shorepine · Sep 3, 2024 · 5bb7fb4 · 5bb7fb4
2 parents efefedf + 5c69514
commit 5bb7fb4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/amy b/amy
diff --git a/docs/tulip_api.md b/docs/tulip_api.md
@@ -308,7 +308,7 @@ tulip.keyboard_callback() # removes callbacks.
 
 # Modify the touch screen calibration if needed (on Tulip CC only)
 # Run ex/calibrate.py to determine this for your panel 
-tulip.touch_delta(-20, 0) # -20 x, 0 y
+tulip.touch_delta(-20, 0, 0.8) # -20 x, 0 y, 0.8 y scale
 tulip.touch_delta() # returns current delta
 
 # Set up a callback to receive raw touch events. up == 1 when finger / mouse lifted up

diff --git a/tulip/esp32s3/gt911_touchscreen.c b/tulip/esp32s3/gt911_touchscreen.c
@@ -6,11 +6,11 @@
 // Default for my V4R11
 int16_t touch_x_delta = -2;
 int16_t touch_y_delta = -12;
-float y_scale = 0.8f;
+float touch_y_scale = 0.8f;
 #else
 int16_t touch_x_delta = 0;
 int16_t touch_y_delta = 0;
-float y_scale = 1.0f;
+float touch_y_scale = 1.0f;
 #endif
 
 esp_lcd_touch_handle_t tp;
@@ -120,9 +120,9 @@ void run_gt911(void *param) {
                 last_touch_x[i] = touch_x[i] + touch_x_delta;
                 #ifdef TDECK
                     // tdeck has swapped y that mirror_y doesn't fix
-                    last_touch_y[i] = ((V_RES-touch_y[i]) + touch_y_delta)*y_scale;
+                    last_touch_y[i] = ((V_RES-touch_y[i]) + touch_y_delta)*touch_y_scale;
                 #else
-                    last_touch_y[i] = (touch_y[i] + touch_y_delta)*y_scale;
+                    last_touch_y[i] = (touch_y[i] + touch_y_delta)*touch_y_scale;
                 #endif
             }
             //fprintf(stderr, "touch DOWN %d %d\n", last_touch_x[0], last_touch_y[0]);

diff --git a/tulip/fs/ex/calibrate.py b/tulip/fs/ex/calibrate.py
@@ -42,15 +42,20 @@ def touch_cb(x):
 for (x,y) in deltas:
     x_mean += x
     y_mean += y
+
+
+old_delta = tulip.touch_delta()
 x_mean = int(float(x_mean) / float(len(deltas)))
 y_mean = int(float(y_mean) / float(len(deltas)))
 
-old_delta = tulip.touch_delta()
-print("New computed delta is [%d, %d]. It was [%d, %d]. " %(x_mean, y_mean, old_delta[0], old_delta[1]))
+# TODO: compute this from the deltas
+y_scale = old_delta[2]
+
+print("New computed delta is [%d, %d, %f]. It was [%d, %d, %f]. " %(x_mean, y_mean, y_scale, old_delta[0], old_delta[1], old_delta[2]))
 if(tulip.prompt("Set it?")):
-    tulip.touch_delta(x_mean, y_mean)
+    tulip.touch_delta(x_mean, y_mean, y_scale)
     if(tulip.prompt("Set. Add calibration to boot.py?")):
-        tulip.add_to_bootpy("tulip.touch_delta(%d,%d)" % (x_mean, y_mean))
+        tulip.add_to_bootpy("tulip.touch_delta(%d,%d,%f)" % (x_mean, y_mean, y_scale))
         print("Added.")
 
 tulip.bg_clear()

diff --git a/tulip/shared/modtulip.c b/tulip/shared/modtulip.c
@@ -1051,26 +1051,31 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tulip_touch_obj, 0, 0, tulip_touch);
 #ifdef ESP_PLATFORM
 extern int16_t touch_x_delta;
 extern int16_t touch_y_delta;
+extern float touch_y_scale;
 #else
 int16_t touch_x_delta = 0;
 int16_t touch_y_delta = 0;
+float touch_y_scale = 1.0;
 #endif
 
 STATIC mp_obj_t tulip_touch_delta(size_t n_args, const mp_obj_t *args) {
     if(n_args > 0) {
         touch_x_delta = mp_obj_get_int(args[0]);
         touch_y_delta = mp_obj_get_int(args[1]);
+        // Allow people to still set x,y delta without scale
+        if(n_args > 2) touch_y_scale = mp_obj_get_float(args[2]);
     } else {
-        mp_obj_t tuple[2];
+        mp_obj_t tuple[3];
         tuple[0] = mp_obj_new_int(touch_x_delta);
         tuple[1] = mp_obj_new_int(touch_y_delta);
-        return mp_obj_new_tuple(2, tuple);
+        tuple[2] = mp_obj_new_float(touch_y_scale);
+        return mp_obj_new_tuple(3, tuple);
     }
     return mp_const_none;
 
 }
 
-STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tulip_touch_delta_obj, 0, 2, tulip_touch_delta);
+STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tulip_touch_delta_obj, 0, 3, tulip_touch_delta);
 
 
 STATIC mp_obj_t tulip_key_remap(size_t n_args, const mp_obj_t *args) {
+5 −3		Makefile
+83 −65		README.md
+30 −36		amy.py
+1 −0		docs/amy.aw.js
+19 −0		docs/amy.js
+ −		docs/amy.wasm
+1 −0		docs/amy.ww.js
+75 −0		docs/enable-threads.js
+385 −0		docs/index.html
+25 −0		docs/server.py
+1 −1		docs/style.css
+ −		docs/vwood.png
+117 −0		examples/AMY_Test_ESP32_DualCore/AMY_Test_ESP32_DualCore.ino
+6 −7		examples/AMY_Test_Pi_Pico/AMY_Test_Pi_Pico.ino
+11 −14		juno.py
+2 −2		library.properties
+23 −1		src/amy-example.c
+116 −53		src/amy.c
+6 −4		src/amy.h
+2 −0		src/amy_config.h
+17 −3		src/libminiaudio-audio.c
+15,122 −13,788		src/miniaudio.h
+128 −128		src/patches.h
+0 −1		src/www/amy.js
+ −		src/www/amy.wasm
+0 −529		src/www/index.html
+5 −5		test.py
+ −		tests/ref/TestJunoClip.wav
+ −		tests/ref/TestNoiseOsc.wav
+ −		tests/ref/TestPartial.wav
+1 −1		timing.py