klaute/ESP32_Scope
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some optical improvements to fit the user interface on the screen

Browse source
This commit is contained in:
Kai Lauterbach 2024-02-04 17:04:09 +01:00
parent 49c0068a32
commit 3b6aa4e902
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ESP32_Oscilloscope/screen.ino
View file

@ -149,11 +149,11 @@ void draw_sprite(float freq,
draw_channel1(trigger, 0, i2s_buff, sample_rate); draw_channel1(trigger, 0, i2s_buff, sample_rate);
} }
int shift = 150; int shift = HEIGHT - 110;
if (menu) { if (menu) {
spr.drawLine( 0, 120, HEIGHT, 120, TFT_WHITE); //center line spr.drawLine( 0, WIDTH/2, HEIGHT, WIDTH/2, TFT_WHITE); //center line
spr.fillRect(shift, 0, 102, 135, TFT_BLACK); spr.fillRect(shift, 0, (WIDTH/2)-18, (WIDTH/2)+15, TFT_BLACK);
spr.drawRect(shift, 0, 102, 135, TFT_WHITE); spr.drawRect(shift, 0, (WIDTH/2)-18, (WIDTH/2)+15, TFT_WHITE);
spr.fillRect(shift + 1, 3 + 10 * (opt - 1), 100, 11, TFT_RED); spr.fillRect(shift + 1, 3 + 10 * (opt - 1), 100, 11, TFT_RED);
spr.drawString("AUTOSCALE", shift + 5, 5); spr.drawString("AUTOSCALE", shift + 5, 5);
@ -180,7 +180,7 @@ void draw_sprite(float freq,
spr.drawString(frequency, shift + 5, 15); spr.drawString(frequency, shift + 5, 15);
//String offset_line = String((2.0 * v_div) / 1000.0 - offset) + "V"; //String offset_line = String((2.0 * v_div) / 1000.0 - offset) + "V";
String offset_line = String((3.0 * v_div) / 1000.0 - offset) + "V"; String offset_line = String((3.0 * v_div) / 1000.0 - offset) + "V";
spr.drawString(offset_line, shift + 40, 59); spr.drawString(offset_line, shift + 25, 59);
if (set_value) { if (set_value) {
spr.fillRect(229, 0, 11, 11, TFT_BLUE); spr.fillRect(229, 0, 11, 11, TFT_BLUE);
@ -203,7 +203,7 @@ void draw_sprite(float freq,
spr.drawString(String(int(s_div)) + "uS/div", shift - 100, 15); spr.drawString(String(int(s_div)) + "uS/div", shift - 100, 15);
//String offset_line = String((2.0 * v_div) / 1000.0 - offset) + "V"; //String offset_line = String((2.0 * v_div) / 1000.0 - offset) + "V";
String offset_line = String((3.0 * v_div) / 1000.0 - offset) + "V"; String offset_line = String((3.0 * v_div) / 1000.0 - offset) + "V";
spr.drawString(offset_line, shift + 100, 112); spr.drawString(offset_line, shift + 75, 112);
} }