From 4fbecc14062d272d6baeaf7a805f4ead58192261 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Fri, 2 Apr 2021 15:11:28 +0200 Subject: [PATCH] Name change from hasp-lvgl to openHASP --- .github/ISSUE_TEMPLATE/bug_report.md | 8 ++++---- .github/ISSUE_TEMPLATE/other-question.md | 2 +- README.md | 24 ++++++++++++------------ platformio.ini | 6 +++--- src/lang/lang.h | 2 +- src/main_sdl2.cpp | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index e25e3be3..494b4390 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -11,13 +11,13 @@ assignees: fvanroie IMPORTANT Issues that don't use this template will be ignored and closed. -If you are not sure if your issue is a bug, please open a [github discussion](https://github.com/fvanroie/hasp-lvgl/discussions) first -or join the [#hasp-lvgl channel](https://discord.gg/VCWyuhF) on Discord. +If you are not sure if your issue is a bug, please open a [github discussion](https://github.com/HASwitchPlate/openHASP/discussions) first +or join the [#openHASP channel](https://discord.gg/VCWyuhF) on Discord. --> ### Perform all steps below and tick them with [x] -- [ ] Check the related part of the [Documentation](https://fvanroie.github.io/hasp-docs/) -- [ ] Update hasp-lvgl to the latest version +- [ ] Check the related part of the [Documentation](https://haswitchplate.github.io/openHASP-docs/) +- [ ] Update openHASP to the latest version - [ ] Reproduce the issue and describe all steps ### Describe the bug diff --git a/.github/ISSUE_TEMPLATE/other-question.md b/.github/ISSUE_TEMPLATE/other-question.md index 698506b6..7234a925 100644 --- a/.github/ISSUE_TEMPLATE/other-question.md +++ b/.github/ISSUE_TEMPLATE/other-question.md @@ -11,6 +11,6 @@ assignees: '' We only keep bug reports and active requests being worked on in the issues tracker. -For general questions we have opened the [discussion forum](https://github.com/fvanroie/hasp-lvgl/discussions) on github and [#hasp-lvgl channel](https://discord.gg/VCWyuhF) on Discord. +For general questions we have opened the [discussion forum](https://github.com/HASwitchPlate/openHASP/discussions) on github and [#openHASP channel](https://discord.gg/VCWyuhF) on Discord. If you are not sure if your question is related to the code development, feel free to ask! diff --git a/README.md b/README.md index 61b5c299..bd9be9d7 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # HASP - Open Hardware edition -[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/fvanroie/hasp-lvgl/PlatformIO%20CI?label=build%20status&logo=github&logoColor=%23dddddd)](https://github.com/fvanroie/hasp-lvgl/actions) -[![GitHub release](https://img.shields.io/github/v/release/fvanroie/hasp-lvgl?include_prereleases)](https://github.com/fvanroie/hasp-lvgl/releases) -[![GitHub issues](https://img.shields.io/github/issues/fvanroie/hasp-lvgl.svg)](http://github.com/fvanroie/hasp-lvgl/issues) +[![GitHub Workflow Status](https://img.shields.io/github/workflow/status/HASwitchPlate/openHASP/PlatformIO%20CI?label=build%20status&logo=github&logoColor=%23dddddd)](https://github.com/HASwitchPlate/openHASP/actions) +[![GitHub release](https://img.shields.io/github/v/release/HASwitchPlate/openHASP?include_prereleases)](https://github.com/HASwitchPlate/openHASP/releases) +[![GitHub issues](https://img.shields.io/github/issues/HASwitchPlate/openHASP.svg)](http://github.com/HASwitchPlate/openHASP/issues) [![Discord](https://img.shields.io/discord/538814618106331137?color=%237289DA&label=support&logo=discord&logoColor=white)][6] [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](#Contributing) -[![GitHub](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/fvanroie/hasp-lvgl/blob/master/LICENSE) +[![GitHub](https://img.shields.io/github/license/mashape/apistatus.svg)](https://github.com/HASwitchPlate/openHASP/blob/master/LICENSE) Control your home-automation devices from a customizable touchscreen UI connected via MQTT. @@ -18,9 +18,9 @@ This version also adds ESP32 and STM32F4 support to take advantage of the additi ## Demo Screens -![Screenshot](https://raw.githubusercontent.com/fvanroie/hasp-lvgl/0.0.11/docs/img/sliders.png)   -![Screenshot](https://raw.githubusercontent.com/fvanroie/hasp-lvgl/0.0.11/docs/img/buttons.png)   -![Screenshot](https://raw.githubusercontent.com/fvanroie/hasp-lvgl/0.0.11/docs/img/mediaplayer.png) +![Screenshot](https://raw.githubusercontent.com/HASwitchPlate/openHASP/0.0.11/docs/img/sliders.png)   +![Screenshot](https://raw.githubusercontent.com/HASwitchPlate/openHASP/0.0.11/docs/img/buttons.png)   +![Screenshot](https://raw.githubusercontent.com/HASwitchPlate/openHASP/0.0.11/docs/img/mediaplayer.png) ## Features @@ -43,10 +43,10 @@ This version also adds ESP32 and STM32F4 support to take advantage of the additi Make sure to add the `--recursive` parameter when cloning the project. Otherwise git will not download the required submodules in the `/lib` subdirectory. ```bash -git clone --recursive https://github.com/fvanroie/hasp-lvgl +git clone --recursive https://github.com/HASwitchPlate/openHASP ``` -If you already cloned hasp-lvgl without the submodules, you can fetch the submodules seperately using: +If you already cloned openHASP without the submodules, you can fetch the submodules seperately using: ```bash git submodule update --init --recursive @@ -55,8 +55,8 @@ git submodule update --init --recursive To build a defierent branch use: ```bash -git clone --recursive https://github.com/fvanroie/hasp-lvgl -cd hasp-lvgl +git clone --recursive https://github.com/HASwitchPlate/openHASP +cd openHASP git checkout 0.1.0-dev git submodule update --init --recursive ``` @@ -67,7 +67,7 @@ Check out the [documentation](https://fvanroie.github.io/hasp-docs/) for how-to' Support --------------------------- -For support using hasp-lvgl, please join the [#hasp-lvgl channel][6] on Discord. +For support using openHASP, please join the [#openHASP channel][6] on Discord. diff --git a/platformio.ini b/platformio.ini index a13bf3af..04bf24c7 100644 --- a/platformio.ini +++ b/platformio.ini @@ -72,7 +72,6 @@ lib_deps = knolleary/PubSubClient@^2.8.0 ; MQTT client git+https://github.com/fvanroie/ConsoleInput.git ;git+https://github.com/andrethomas/TasmotaSlave.git - ;git+https://github.com/fvanroie/lv_components.git ;git+https://github.com/lvgl/lvgl.git lvgl/lvgl @^7.11.0 ; from PIO library ;bodmer/TFT_eSPI @ 2.3.4 ; Tft SPI drivers EXACT version 2.3.5 has compile error @@ -117,12 +116,13 @@ build_flags = -D ARDUINOJSON_ENABLE_PROGMEM=1 ; for PROGMEM arguments ; -- tft_espi build options ------------------------ ;-D USE_DMA_TO_TFT -; -- hasp-lvgl build options ------------------------ +; -- openHASP build options ------------------------ -D HASP_USE_TELNET=1 ;-D HASP_USE_SPIFFS=1 -D HASP_USE_LITTLEFS=1 ;-D HASP_USE_EEPROM=1 -D HASP_USE_CONFIG=1 ; Native application, not library + -D LV_LOG_TRACE_TIMER=1 ; -- LittleFS build options ------------------------ -D CONFIG_LITTLEFS_FOR_IDF_3_2 @@ -186,7 +186,7 @@ build_flags= ; -- ArduinoJson build options ---------------------------- -D ARDUINOJSON_ENABLE_PROGMEM=1 ; for PROGMEM arguments -D ARDUINOJSON_ENABLE_STD_STRING=1 ; for std::string -; -- hasp-lvgl build options ------------------------ +; -- openHASP build options ------------------------- -D HASP_USE_TELNET=1 ;-D HASP_USE_SPIFFS=1 -D HASP_USE_LITTLEFS=1 diff --git a/src/lang/lang.h b/src/lang/lang.h index 4a5428b9..1b40b78f 100644 --- a/src/lang/lang.h +++ b/src/lang/lang.h @@ -6,6 +6,6 @@ // language independent defines #define D_PASSWORD_MASK "********" #define D_BULLET " * " -#define D_MANUFACTURER "hasp-lvgl" +#define D_MANUFACTURER "openHASP" #endif \ No newline at end of file diff --git a/src/main_sdl2.cpp b/src/main_sdl2.cpp index cb031b78..b489f2d2 100644 --- a/src/main_sdl2.cpp +++ b/src/main_sdl2.cpp @@ -254,7 +254,7 @@ int main(int argc, char* argv[]) } if(showhelp) { - usage("hasp-lvgl"); + usage("openHASP"); #if defined(WINDOWS) WriteConsole(std_out, "bye", 3, NULL, NULL);