adjustments

Author: bmorcelli

platformio.ini

@@ -52,6 +52,7 @@ build_flags =
 	-DCONFIG_FILE='"/config.conf"'
 
 lib_deps = 
+	Wire
 	https://github.com/bmorcelli/AsyncTCP/
 	esphome/ESPAsyncWebServer-esphome
 	bblanchon/ArduinoJson @ ^7.0.4

src/main.cpp

@@ -48,7 +48,7 @@ TouchPoint touchPoint;
 keyStroke KeyStroke;
 
 #if defined(HAS_TOUCH)
-uint16_t tftHeight = TFT_WIDTH-20;
+volatile uint16_t tftHeight = TFT_WIDTH-20;
 #else
 volatile uint16_t tftHeight = TFT_WIDTH;
 #endif

src/mykeyboard.cpp

@@ -11,6 +11,45 @@
 int getBattery() { return 0; }
 
 
+struct box_t
+{
+  int x;
+  int y;
+  int w;
+  int h;
+  std::uint16_t color;
+  int touch_id = -1;
+  char key;
+  char key_sh;
+
+  void clear(void)
+  {
+    for (int i = 0; i < 8; ++i)
+    {
+      tft.fillRect(x, y, w, h,BGCOLOR);
+    }
+  }
+  void draw(void)
+  {
+    int ie = touch_id < 0 ? 4 : 8;
+    for (int i = 0; i < ie; ++i)
+    {
+      tft.drawRect(x, y, w, h,color);
+      tft.setTextColor(color);
+      tft.drawChar(key,x+w/2-FM*LW/2,y+h/2-FM*LH/2);
+    }
+  }
+  bool contain(int x, int y)
+  {
+    return this->x <= x && x < (this->x + this->w)
+        && this->y <= y && y < (this->y + this->h);
+  }
+};
+
+static constexpr std::size_t box_count = 52;
+static box_t box_list[box_count];
+
+
 String keyboard(String mytext, int maxSize, String msg) {
   resetTftDisplay();
 
@@ -168,7 +207,7 @@ String keyboard(String mytext, int maxSize, String msg) {
           };
         #else // small keyboard size, for small letters (smaller screen)
           #define KBLH 10
-          int ofs[4][2] = {
+          int ofs[4][3] = {
             {7 , 20, 10},
             {27, 25, 30},
             {52, 25, 55},

variants/CYD-2432S028/variant.cpp

@@ -1,6 +1,6 @@
 #include "interface.h"
 #include "powerSave.h"
-#include "core/utils.h"
+
 
 #if defined(HAS_CAPACITIVE_TOUCH)
     #include "CYD28_TouchscreenC.h"

variants/lilygo-t-display-s3-pro/variant.cpp

@@ -124,6 +124,10 @@ void _setBrightness(uint8_t brightval) {
   ledcWrite(TFT_BRIGHT_CHANNEL,dutyCycle); // Channel 0
 }
 
+struct TouchPointPro {
+  int16_t x[5];
+  int16_t y[5];
+};
 /*********************************************************************
 ** Function: InputHandler
 ** Handles the variables PrevPress, NextPress, SelPress, AnyKeyPress and EscPress

variants/lilygo-t-embed-cc1101/pins_arduino.h

@@ -58,6 +58,33 @@ static const uint8_t SCL = GROVE_SCL;
 #define SDCARD_MOSI SPI_MOSI_PIN
 #define SDCARD_SCK  SPI_SCK_PIN
 
+// NRF24 - Over QWIIC Port #2
+#define USE_NRF24_VIA_SPI
+#define NRF24_CE_PIN    43
+#define NRF24_SS_PIN    44
+#define NRF24_MOSI_PIN  SDCARD_MOSI
+#define NRF24_SCK_PIN   SDCARD_SCK
+#define NRF24_MISO_PIN  SDCARD_MISO
+
+// CC1101
+#define USE_CC1101_VIA_SPI
+#define CC1101_GDO0_PIN 3 
+#define CC1101_GDO2_PIN 38
+#define CC1101_SW1_PIN  47
+#define CC1101_SW0_PIN  48
+#define CC1101_SS_PIN   12
+#define CC1101_MISO_PIN SPI_MISO_PIN
+#define CC1101_MOSI_PIN SPI_MOSI_PIN
+#define CC1101_SCK_PIN  SPI_SCK_PIN
+
+//PN532
+#define PN532_RF_REST   45
+#define PN532_IRQ       17
+
+// Mic
+#define PIN_CLK         39
+#define PIN_DATA        42
+
 // Speaker
 #define HAS_NS4168_SPKR
 #define BCLK    46
@@ -113,7 +140,6 @@ static const uint8_t RX = SERIAL_RX;
 
 // BadUSB 
 #define USB_as_HID 1
-
 #else
 // Lite Version
 // #define LITE_VERSION 1

variants/m5stack-core2/variant.cpp

@@ -1,7 +1,5 @@
 #include "interface.h"
 #include "powerSave.h"
-#include "core/utils.h"
-
 #include <M5Unified.h>
 
 /***************************************************************************************

variants/m5stack-cores3/variant.cpp

@@ -1,7 +1,5 @@
 #include "interface.h"
 #include "powerSave.h"
-#include "core/utils.h"
-
 #include <M5Unified.h>
 
 /***************************************************************************************

variants/marauder-mini/variant.cpp

@@ -36,7 +36,7 @@ int getBattery() {
     static esp_adc_cal_characteristics_t* adc_chars = nullptr;
     static constexpr int BASE_VOLATAGE = 3600;
     adc_chars = (esp_adc_cal_characteristics_t*)calloc(1, sizeof(esp_adc_cal_characteristics_t));
-    esp_adc_cal_characterize((adc_unit_t)_batAdcUnit, ADC_ATTEN_DB_12, ADC_tftWidth_BIT_12, BASE_VOLATAGE, adc_chars);
+    esp_adc_cal_characterize((adc_unit_t)_batAdcUnit, ADC_ATTEN_DB_12, ADC_WIDTH_BIT_12, BASE_VOLATAGE, adc_chars);
     int raw;
     raw = adc1_get_raw((adc1_channel_t)_batAdcCh);
     uint32_t volt = esp_adc_cal_raw_to_voltage(raw, adc_chars);