Touch defaults and M->Ref

pull/51/head
erikkaashoek 3 years ago
parent 74d68f215c
commit 1da836e2d8

@ -963,7 +963,7 @@ config_t config = {
.touch_cal = { 347, 495, 160, 205 }, // 2.8 inch LCD panel .touch_cal = { 347, 495, 160, 205 }, // 2.8 inch LCD panel
#endif #endif
#ifdef TINYSA4 #ifdef TINYSA4
.touch_cal = { 278, 513, 115, 154 }, // 4 inch panel .touch_cal = { 444, 715, 3552, 3499 }, // 4 inch panel
#endif #endif
._mode = _MODE_USB | _MODE_AUTO_FILENAME, ._mode = _MODE_USB | _MODE_AUTO_FILENAME,
._serial_speed = SERIAL_DEFAULT_BITRATE, ._serial_speed = SERIAL_DEFAULT_BITRATE,

@ -1384,7 +1384,7 @@ typedef struct properties {
//sizeof(properties_t) == 0x1200 //sizeof(properties_t) == 0x1200
#define CONFIG_MAGIC 0x434f4e5C /* 'CONF' */ #define CONFIG_MAGIC 0x434f4e5D /* 'CONF' */
extern int16_t lastsaveid; extern int16_t lastsaveid;
//extern properties_t *active_props; //extern properties_t *active_props;

@ -764,8 +764,12 @@ static UI_FUNCTION_CALLBACK(menu_marker_op_cb)
case 4: // marker -> ref level case 4: // marker -> ref level
{ {
float l = actual_t[markers[active_marker].index]; float l = actual_t[markers[active_marker].index];
#if 1
user_set_reflevel(l);
#else
float s_max = value(l)/setting.scale; float s_max = value(l)/setting.scale;
user_set_reflevel(setting.scale*(floorf(s_max)+2)); user_set_reflevel(setting.scale*(floorf(s_max)+2));
#endif
} }
break; break;
#ifdef __VNA__ #ifdef __VNA__

Loading…
Cancel
Save

Powered by TurnKey Linux.