Fix monitor button labels

This commit is contained in:
Just Call Me Koko
2020-02-07 18:58:50 -05:00
parent c32dc08c18
commit 5d6e4ca808
3 changed files with 13 additions and 2 deletions

View File

@@ -2,7 +2,7 @@
[![Gitter](https://badges.gitter.im/justcallmekoko/ESP32Marauder.png)](https://gitter.im/justcallmekoko/ESP32Marauder)
<!---[![Build Status](https://travis-ci.com/justcallmekoko/ESP32Marauder.svg?branch=master)](https://travis-ci.com/justcallmekoko/ESP32Marauder)--->
# ESP32 Marauder v0.4.3
# ESP32 Marauder v0.4.4
<p align="center"><img alt="Marauder logo" src="https://github.com/justcallmekoko/ESP32Marauder/blob/master/pictures/marauder3L.jpg?raw=true" width="300"></p>
<p align="center">
<b>A suite of WiFi/Bluetooth offensive and defensive tools for the ESP32</b>

View File

@@ -101,6 +101,9 @@ void Display::tftDrawXScaleButtons(byte x_scale)
"+",
2);
key[0].setLabelDatum(1, 5, MC_DATUM);
key[1].setLabelDatum(1, 5, MC_DATUM);
key[0].drawButton();
key[1].drawButton();
}
@@ -131,6 +134,9 @@ void Display::tftDrawYScaleButtons(byte y_scale)
"+",
2);
key[2].setLabelDatum(1, 5, MC_DATUM);
key[3].setLabelDatum(1, 5, MC_DATUM);
key[2].drawButton();
key[3].drawButton();
}
@@ -161,6 +167,9 @@ void Display::tftDrawChannelScaleButtons(int set_channel)
"+",
2);
key[4].setLabelDatum(1, 5, MC_DATUM);
key[5].setLabelDatum(1, 5, MC_DATUM);
key[4].drawButton();
key[5].drawButton();
}
@@ -181,6 +190,8 @@ void Display::tftDrawExitScaleButtons()
"X",
2);
key[6].setLabelDatum(1, 5, MC_DATUM);
key[6].drawButton();
}

View File

@@ -54,7 +54,7 @@ class Display
TFT_eSPI tft = TFT_eSPI();
TFT_eSprite img = TFT_eSprite(&tft);
TFT_eSPI_Button key[BUTTON_ARRAY_LEN];
String version_number = "v0.4.3";
String version_number = "v0.4.4";
bool printing = false;
bool loading = false;