WIP: v2.0.0

.travis.yml

@@ -0,0 +1,42 @@
+# Continuous Integration (CI) is the practice, in software
+# engineering, of merging all developer working copies with a shared mainline
+# several times a day < https://docs.platformio.org/page/ci/index.html >
+#
+# Documentation:
+#
+# * Travis CI Embedded Builds with PlatformIO
+#   < https://docs.travis-ci.com/user/integration/platformio/ >
+#
+# * PlatformIO integration with Travis CI
+#   < https://docs.platformio.org/page/ci/travis.html >
+#
+# * User Guide for `platformio ci` command
+#   < https://docs.platformio.org/page/userguide/cmd_ci.html >
+#
+#
+# Please choose one of the following templates (proposed below) and uncomment
+# it (remove "# " before each line) or use own configuration according to the
+# Travis CI documentation (see above).
+#
+
+language: python
+python:
+    - "2.7"
+
+sudo: false
+cache:
+    directories:
+        - "~/.platformio"
+
+env:
+    - PLATFORMIO_CI_SRC=examples/current-sensor
+    - PLATFORMIO_CI_SRC=examples/demo-menu
+
+install:
+    - pip install -U platformio
+    - platformio update
+    - platformio lib -g install "XPT2046_Touchscreen@26b691b2c8"
+    - platformio lib -g install "Adafruit [email protected]"
+
+script:
+    - platformio ci --lib="." --board=nodemcuv2

README.md

@@ -1,14 +1,13 @@
-emGUI v1.0.0
+emGUI v2.0.0
 =====
+[![Build Status](https://travis-ci.org/libEmGUI/emGUI-arduino.svg?branch=master)](https://travis-ci.org/libEmGUI/emGUI-arduino)
 
-C GUI Library for Arduino. 
-
-Some photos 
+C/C++ GUI Library for Arduino. 
 
+Some photos
 
 ![Main menu](Pictures/fa314fcf-e02c-4a30-bb53-9c6628b62733.jpg)![Another photo](Pictures/af27046c-2f33-44af-a220-e1cf2456dcb5.jpg)
 
-
 This lib could work not only with Arduino, so we made an [example with visual studio](https://github.com/libEmGUI/emGUI-example) (will be submited soon)
 ![Example on PC: main menu](Pictures/main%20menu.PNG)![Example on PC: modal dialog](Pictures/modal%20dialog.PNG)![Example on PC: Big colorful image](Pictures/Image.PNG)![Example on PC: Multiline textbox with left allign](Pictures/Text%20box.PNG)
 

examples/current-sensor/.gitignore

@@ -1 +1,2 @@
 /.vscode/
+/.pio/

examples/current-sensor/User_Setup.h

@@ -1,103 +1,40 @@
-//                            USER DEFINED SETTINGS V16
-//            Set fonts to be loaded, pins used and SPI control method
+/*     
 
-// ##################################################################################
-//
-// Define the pins that are used to interface with the display here
-//
-// ##################################################################################
-
-// We must use hardware SPI
-// Typical setup for NodeMCU ESP-12 is :
-//
-// Display SDO/MISO to NodeMCU pin D6
-// Display LED      to NodeMCU pin VIN (5V)
-// Display SCK      to NodeMCU pin D5
-// Display SDI/MOSI to NodeMCU pin D7
-// Display DC       to NodeMCU pin D3
-// Display RESET    to NodeMCU pin D4
-// Display CS       to NodeMCU pin D8
-// Display GND      to NodeMCU pin GND (0V)
-// Display VCC      to NodeMCU pin VIN (5V)
-
-// ###### EDIT THE PIN NUMBERS IN THE 3 LINES FOLLOWING TO SUIT YOUR SETUP ######
-
-// LinkSpriteTouchScreen
-//#define TFT_DC   D4  // Data Command control pin
-
-
-
-/*
+USER DEFINED SETTINGS
 
 http://www.forward.com.au/pfod/ESP8266/GPIOpins/index.html
 
-
-static const uint8_t D0   = 16;  - встроенный PULL-DOWN  
-static const uint8_t D1   = 5;   - *cs TOUCH*
-static const uint8_t D2   = 4;   -  *cs TFT*
-static const uint8_t D3   = 0;   - [BOOT]*SDA_PIN*
-static const uint8_t D4   = 2;   - [BOOT] На старте должен быть HIGH *SCK_PIN*
-static const uint8_t D5   = 14;  - [SPI] SCK
-static const uint8_t D6   = 12;  - [SPI] MOSI
-static const uint8_t D7   = 13;  - [SPI] MOSI
-static const uint8_t D8   = 15;  - [BOOT] на старте должен быть LOW *DC*
-static const uint8_t D9   = 3;   - [UART] rx
-static const uint8_t D10  = 1;   - [UART] tx
+ We must use hardware SPI for Touch and Display
+
+| NodeMCU  |      Function       |  Display        | INA 219 (optional)     | Comment                                   |
+| ---------|---------------------|-----------------|------------------------| ------------------------------------------|
+| D1       |                     | T_CS            |                        | To Display                                |
+| D2       |                     | CS              |                        | To Display                                |
+| D3       | [BOOT, I2C] SDA     |                 | SDA                    | To INA219                                 |
+| D4       | [BOOT, I2C] SCL     |                 | SCL                    | To INA219, Should be HIGH on startup      |
+| D5       | [SPI] SCK           | SCK, T_CLK      |                        | To Display                                |
+| D6       | [SPI] MISO          | SDO, T_DO       |                        | To Display                                |
+| D7       | [SPI] MOSI          | SDI, T_DI       |                        | To Display                                |
+| D8       | [BOOT]              | DC              |                        | To Display, Should be LOW on startup      |
+| RST      | [RESET]             | RST             |                        | To Display, Optional                      |
+| GND      | [GROUND]            | GND             | GND                    | To INA and Display                        |
+| VCC      | [+3,3V]             | VCC, LED        | VCC                    | To INA and Display                        |
 
 */
-// Topfoison
-#define TFT_DC   15  // Data Command control pin
-#define TFT_CS   4 
-#define TOUCH_CS 5
-#define TFT_RST -1
-
-//#define INTR_TOUCH 10
-
-
-#define SDA_PIN   0
-#define SCK_PIN   2
-#define INTR_SYS  -1
-#define INTR_NFC  -1
-
-#define UART_RX   3
-
-// ##################################################################################
-//
-// Define the fonts that are to be used here
-//
-// ##################################################################################
-
-// Comment out the #defines below with // to stop that font being loaded
-// The ESP8366 had plenty of memory so commenting out fonts is not normally necessary
-// If all fonts are loaded the extra FLASH space required is about 17000 bytes...
-// To save FLASH space only enable the fonts you need!
-
-//#define LOAD_GLCD   // Font 1. Original Adafruit 8 pixel font needs ~1820 bytes in FLASH
-//#define LOAD_FONT2  // Font 2. Small 16 pixel high font, needs ~3534 bytes in FLASH, 96 characters
-//#define LOAD_FONT4  // Font 4. Medium 26 pixel high font, needs ~5848 bytes in FLASH, 96 characters
-//#define LOAD_FONT6  // Font 6. Large 48 pixel font, needs ~2666 bytes in FLASH, only characters 1234567890:-.apm
-//#define LOAD_FONT7  // Font 7. 7 segment 48 pixel font, needs ~2438 bytes in FLASH, only characters 1234567890:.
-//#define LOAD_FONT8  // Font 8. Large 75 pixel font needs ~3256 bytes in FLASH, only characters 1234567890:-.
-
-// ##################################################################################
-//
-// Define use of 9bit SPI use for displays without D/C pin, TFT_DC pin still needed
-//
-// ##################################################################################
 
-//#define USE_SPI9
+// ###### EDIT THE PIN NUMBERS IN THE FOLLOWING BLOCK TO SUIT YOUR SETUP ######
 
-// ##################################################################################
-//
-// Other speed up options
-//
-// ##################################################################################
+#define TFT_DC   D8  // Data Command control pin
+#define TFT_CS   D2 
+#define TOUCH_CS D1
+#define TFT_RST -1   // Use system reset or opt-out
 
-// Define the SPI clock frequency (40MHz works OK) 80MHz sometimes fails
+#define SDA_PIN   D3
+#define SCL_PIN   D4
 
 // #define SPI_FREQUENCY 20000000
-// #define SPI_FREQUENCY 40000000
- #define SPI_FREQUENCY 40000000
+#define SPI_FREQUENCY 40000000
+// #define SPI_FREQUENCY 80000000
 // #define SPI_FREQUENCY 16000000
 
 

examples/current-sensor/current-sensor.ino

@@ -4,7 +4,7 @@
 *  TFT configs are in User_Setup.h
 *  fbits.tech 2018 // Roman Savrulin, Mikhail Natalenko
 */
-
+#include <Arduino.h>
 #include <Wire.h>
 #include <Hash.h>
 #include <FS.h>
@@ -16,9 +16,6 @@
 #include <Adafruit_INA219.h>
 #include "src/FIR-filter-class/filt.h"
 
-extern "C" {
-  #include "user_interface.h"
-}
 #include "User_Setup.h"
 
 // Signal filter
@@ -28,20 +25,11 @@ Adafruit_INA219 monitor;
 TouchWrapper touch;
 
 void setup() {
-  // Init serial and start firmware
-  if(digitalRead(UART_RX) == 1) {
-    if(!Serial){
-      Serial.begin(115200);
-      while (!Serial){
-        delay(100);
-      }
-    }
-  }
+  Serial.begin(115200);
 
   Serial.println(F("Ready"));
-  SPIFFS.begin();
 
-  Wire.begin(SDA_PIN, SCK_PIN);
+  Wire.begin(SDA_PIN, SCL_PIN);
   touch.init();
 
   // Setup emGUI
@@ -57,7 +45,7 @@ void setup() {
 // To reduce noise in signal we use filter 
 void handleData(float data) {
   auto window = WindowPlot::getInstance(false);
-	auto fData = lpf.do_sample(data);
+	lpf.do_sample(data);
 	if (window) window->update(data);
 }
 

examples/current-sensor/emGUIGlue.cpp

@@ -44,7 +44,6 @@ check_size<BITMAPINFOHEADER, 40> CHECK_BITMAPINFOHEADER;
 
 #define pgm_read_pointer(addr) ((void *)pgm_read_dword(addr))
 
-//SPI9Class SPI9(TFT_DC);                   // construct global SPI9 instance here, where the dcPin is known
 static TFT_ILI9341_ESP *tft = NULL;
 static xDraw_t LCD;
 
@@ -134,8 +133,6 @@ bool vGUICheckUTF(uint8_t data, tUTFstateMachine * t_status) {      //returns tr
   static const uint8_t secondMarker  = 0b10000000;
   static const uint8_t secondMask    = 0b11000000;
 
-  tUTFstateMachine * status = t_status;
-
   switch (t_status->state) {
   case UTF_WAIT_FIRST:
     if ((data & firstMask) == firstMarker) {
@@ -161,6 +158,7 @@ bool vGUICheckUTF(uint8_t data, tUTFstateMachine * t_status) {      //returns tr
     t_status->buffer = 0;
     return false;
   }
+  return false;
 }
 
 static uint16_t usFontGetH(xFont pubFont) {
@@ -427,6 +425,7 @@ void TFTWake(){
 }
 
 void vGUIGlueInit(){
+  SPIFFS.begin();
   // Config EM_GUI opts 
   EMGUI_LCD_WIDTH = 320;
   EMGUI_STATUS_BAR_HEIGHT = 26;

examples/current-sensor/lib/.gitignore

@@ -0,0 +1 @@
+emGUI/

examples/current-sensor/platformio.ini

@@ -0,0 +1,30 @@
+;PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
+[platformio]
+src_dir = .
+data_dir = ./data/
+env_default = nodemcuv2
+
+[env:nodemcuv2]
+platform = [email protected]
+board = nodemcuv2
+framework = arduino
+lib_extra_dirs = ./lib/
+board_build.f_cpu = 80000000L
+board_build.f_flash = 80000000L
+board_build.flash_mode = dio
+monitor_speed = 115200
+monitor_rts = 0
+monitor_dtr = 0
+upload_speed = 921600
+lib_deps = XPT2046_Touchscreen@26b691b2c8, Adafruit [email protected]
+
+

examples/current-sensor/src/GUI/GUI.cpp

@@ -16,7 +16,7 @@ bool MainWindowCloseRequestHdl(xWidget *);
 bool bGUIonWindowManagerCreateHandler(xWidget *) {
   vWindowManagerSetKeypressHandler([](int iID, uint16_t uEv){
 	  (void)iID;
-    if(uEv = 1)
+    if(uEv == 1)
       vWindowManagerCloseActiveWindow();
 
     return true;

examples/current-sensor/src/GUI/WindowPlot.h

@@ -35,7 +35,7 @@ class WindowPlot : public DisposableWindow<WINDOW_PLOT, WindowPlot> {
 	xLabel * currentMonitor;
 	xLabel * currentMonitorHeader;
 	short data;
-	short passDelay = 60;
+	unsigned short passDelay = 60;
 	bool onClose(){
 		free(plotLead.psData);
 		return false;
@@ -51,7 +51,7 @@ class WindowPlot : public DisposableWindow<WINDOW_PLOT, WindowPlot> {
 		static auto lastMillis = millis();
 
 		if (millis() - lastMillis > passDelay) {
-			sprintf (textBuffer, "%d\0", data / 10);
+			snprintf (textBuffer, sizeof(textBuffer), "%d", data / 10);
 			pcLabelSetText(currentMonitor, textBuffer);
 			lastMillis = millis();
 		}