andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1792 from proddy/feat_modules

Browse Source 
Feat modules
This commit is contained in:
Proddy
2024-06-09 14:03:45 +02:00
committed by GitHub
parent 66ba2f3218 8783267e18
commit caa6a0b7ae
6 changed files with 174 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
interface/src/project/Modules.tsx
View File

@@ -167,6 +167,7 @@ const Modules: FC = () => {
const colorStatus = (status: number) => { const colorStatus = (status: number) => {
if (status === 1) { if (status === 1) {
// TODO translate
return <div style={{ color: 'red' }}>Pending Activation</div>; return <div style={{ color: 'red' }}>Pending Activation</div>;
} }
return <div style={{ color: '#00FF7F' }}>Activated</div>; return <div style={{ color: '#00FF7F' }}>Activated</div>;

8
interface/src/project/ModulesDialog.tsx
View File

@@ -54,7 +54,7 @@ const ModulesDialog = ({
}; };
return ( return (
<Dialog sx={dialogStyle} open={open} onClose={onClose}> <Dialog sx={dialogStyle} fullWidth maxWidth="xs" open={open} onClose={onClose}>
<DialogTitle>{LL.EDIT() + ' ' + editItem.key}</DialogTitle> <DialogTitle>{LL.EDIT() + ' ' + editItem.key}</DialogTitle>
<DialogContent dividers> <DialogContent dividers>
<Grid container> <Grid container>
@@ -66,15 +66,17 @@ const ModulesDialog = ({
name="enabled" name="enabled"
/> />
} }
label={LL.ACTIVE()} // TODO translate
label="Enabled"
/> />
</Grid> </Grid>
<Box mt={1} mb={1}> <Box mt={2} mb={1}>
<TextField <TextField
name="license" name="license"
label="License Key" label="License Key"
multiline multiline
rows={6} rows={6}
columns={40}
fullWidth fullWidth
value={editItem.license} value={editItem.license}
onChange={updateFormValue} onChange={updateFormValue}

87
lib/OneWire/OneWire.h
View File

@@ -147,6 +147,7 @@
#elif defined(ARDUINO_ARCH_ESP32) #elif defined(ARDUINO_ARCH_ESP32)
#include <driver/rtc_io.h> #include <driver/rtc_io.h>
#include <soc/gpio_struct.h>
#if ESP_IDF_VERSION_MAJOR >= 5 #if ESP_IDF_VERSION_MAJOR >= 5
#include "soc/gpio_periph.h" #include "soc/gpio_periph.h"
#endif // ESP_IDF_VERSION_MAJOR >= 5 #endif // ESP_IDF_VERSION_MAJOR >= 5
@@ -156,9 +157,7 @@
#define IO_REG_BASE_ATTR #define IO_REG_BASE_ATTR
#define IO_REG_MASK_ATTR #define IO_REG_MASK_ATTR
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) IO_REG_TYPE directRead(IO_REG_TYPE pin) {
IO_REG_TYPE directRead(IO_REG_TYPE pin)
{
// return digitalRead(pin); // Works most of the time // return digitalRead(pin); // Works most of the time
// return gpio_ll_get_level(&GPIO, pin); // The hal is not public api, don't use in application code // return gpio_ll_get_level(&GPIO, pin); // The hal is not public api, don't use in application code
@@ -172,12 +171,9 @@ IO_REG_TYPE directRead(IO_REG_TYPE pin)
return (GPIO.in1.val >> (pin - 32)) & 0x1; return (GPIO.in1.val >> (pin - 32)) & 0x1;
#endif #endif
return 0; return 0;
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) void directWriteLow(IO_REG_TYPE pin) {
void directWriteLow(IO_REG_TYPE pin)
{
// digitalWrite(pin, 0); // Works most of the time // digitalWrite(pin, 0); // Works most of the time
// gpio_ll_set_level(&GPIO, pin, 0); // The hal is not public api, don't use in application code // gpio_ll_set_level(&GPIO, pin, 0); // The hal is not public api, don't use in application code
@@ -192,9 +188,7 @@ void directWriteLow(IO_REG_TYPE pin)
#endif #endif
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) void directWriteHigh(IO_REG_TYPE pin) {
void directWriteHigh(IO_REG_TYPE pin)
{
// digitalWrite(pin, 1); // Works most of the time // digitalWrite(pin, 1); // Works most of the time
// gpio_ll_set_level(&GPIO, pin, 1); // The hal is not public api, don't use in application code // gpio_ll_set_level(&GPIO, pin, 1); // The hal is not public api, don't use in application code
@@ -207,17 +201,13 @@ void directWriteHigh(IO_REG_TYPE pin)
else else
GPIO.out1_w1ts.val = ((uint32_t)1 << (pin - 32)); GPIO.out1_w1ts.val = ((uint32_t)1 << (pin - 32));
#endif #endif
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) void directModeInput(IO_REG_TYPE pin) {
void directModeInput(IO_REG_TYPE pin)
{
// pinMode(pin, INPUT); // Too slow - doesn't work // pinMode(pin, INPUT); // Too slow - doesn't work
// gpio_ll_output_disable(&GPIO, pin); // The hal is not public api, don't use in application code // gpio_ll_output_disable(&GPIO, pin); // The hal is not public api, don't use in application code
if ( digitalPinIsValid(pin) ) if (digitalPinIsValid(pin)) {
{
// Input // Input
//#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 //#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
#if SOC_GPIO_PIN_COUNT <= 32 #if SOC_GPIO_PIN_COUNT <= 32
@@ -229,17 +219,13 @@ void directModeInput(IO_REG_TYPE pin)
GPIO.enable1_w1tc.val = ((uint32_t)1 << (pin - 32)); GPIO.enable1_w1tc.val = ((uint32_t)1 << (pin - 32));
#endif #endif
} }
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) void directModeOutput(IO_REG_TYPE pin) {
void directModeOutput(IO_REG_TYPE pin)
{
// pinMode(pin, OUTPUT); // Too slow - doesn't work // pinMode(pin, OUTPUT); // Too slow - doesn't work
// gpio_ll_output_enable(&GPIO, pin); // The hal is not public api, don't use in application code // gpio_ll_output_enable(&GPIO, pin); // The hal is not public api, don't use in application code
if ( digitalPinCanOutput(pin) ) if (digitalPinCanOutput(pin)) {
{
// Output // Output
//#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6 //#if CONFIG_IDF_TARGET_ESP32C2 || CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32C6
#if SOC_GPIO_PIN_COUNT <= 32 #if SOC_GPIO_PIN_COUNT <= 32
@@ -251,7 +237,6 @@ void directModeOutput(IO_REG_TYPE pin)
GPIO.enable1_w1ts.val = ((uint32_t)1 << (pin - 32)); GPIO.enable1_w1ts.val = ((uint32_t)1 << (pin - 32));
#endif #endif
} }
} }
#define DIRECT_READ(base, pin) directRead(pin) #define DIRECT_READ(base, pin) directRead(pin)
@@ -305,9 +290,7 @@ void directModeOutput(IO_REG_TYPE pin)
#define IO_REG_BASE_ATTR #define IO_REG_BASE_ATTR
#define IO_REG_MASK_ATTR #define IO_REG_MASK_ATTR
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) IO_REG_TYPE directRead(volatile IO_REG_TYPE * base, IO_REG_TYPE pin) {
IO_REG_TYPE directRead(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
{
IO_REG_TYPE ret; IO_REG_TYPE ret;
if (SS_GPIO == GPIO_TYPE(pin)) { if (SS_GPIO == GPIO_TYPE(pin)) {
ret = READ_ARC_REG(((IO_REG_TYPE)base + EXT_PORT_OFFSET_SS)); ret = READ_ARC_REG(((IO_REG_TYPE)base + EXT_PORT_OFFSET_SS));
@@ -317,31 +300,23 @@ IO_REG_TYPE directRead(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
return ((ret >> GPIO_ID(pin)) & 0x01); return ((ret >> GPIO_ID(pin)) & 0x01);
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) void directModeInput(volatile IO_REG_TYPE * base, IO_REG_TYPE pin) {
void directModeInput(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
{
if (SS_GPIO == GPIO_TYPE(pin)) { if (SS_GPIO == GPIO_TYPE(pin)) {
WRITE_ARC_REG(READ_ARC_REG((((IO_REG_TYPE)base) + DIR_OFFSET_SS)) & ~(0x01 << GPIO_ID(pin)), WRITE_ARC_REG(READ_ARC_REG((((IO_REG_TYPE)base) + DIR_OFFSET_SS)) & ~(0x01 << GPIO_ID(pin)), ((IO_REG_TYPE)(base) + DIR_OFFSET_SS));
((IO_REG_TYPE)(base) + DIR_OFFSET_SS));
} else { } else {
MMIO_REG_VAL_FROM_BASE((IO_REG_TYPE)base, DIR_OFFSET_SOC) &= ~(0x01 << GPIO_ID(pin)); MMIO_REG_VAL_FROM_BASE((IO_REG_TYPE)base, DIR_OFFSET_SOC) &= ~(0x01 << GPIO_ID(pin));
} }
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) void directModeOutput(volatile IO_REG_TYPE * base, IO_REG_TYPE pin) {
void directModeOutput(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
{
if (SS_GPIO == GPIO_TYPE(pin)) { if (SS_GPIO == GPIO_TYPE(pin)) {
WRITE_ARC_REG(READ_ARC_REG(((IO_REG_TYPE)(base) + DIR_OFFSET_SS)) | (0x01 << GPIO_ID(pin)), WRITE_ARC_REG(READ_ARC_REG(((IO_REG_TYPE)(base) + DIR_OFFSET_SS)) | (0x01 << GPIO_ID(pin)), ((IO_REG_TYPE)(base) + DIR_OFFSET_SS));
((IO_REG_TYPE)(base) + DIR_OFFSET_SS));
} else { } else {
MMIO_REG_VAL_FROM_BASE((IO_REG_TYPE)base, DIR_OFFSET_SOC) |= (0x01 << GPIO_ID(pin)); MMIO_REG_VAL_FROM_BASE((IO_REG_TYPE)base, DIR_OFFSET_SOC) |= (0x01 << GPIO_ID(pin));
} }
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) void directWriteLow(volatile IO_REG_TYPE * base, IO_REG_TYPE pin) {
void directWriteLow(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
{
if (SS_GPIO == GPIO_TYPE(pin)) { if (SS_GPIO == GPIO_TYPE(pin)) {
WRITE_ARC_REG(READ_ARC_REG(base) & ~(0x01 << GPIO_ID(pin)), base); WRITE_ARC_REG(READ_ARC_REG(base) & ~(0x01 << GPIO_ID(pin)), base);
} else { } else {
@@ -349,9 +324,7 @@ void directWriteLow(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
} }
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) void directWriteHigh(volatile IO_REG_TYPE * base, IO_REG_TYPE pin) {
void directWriteHigh(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
{
if (SS_GPIO == GPIO_TYPE(pin)) { if (SS_GPIO == GPIO_TYPE(pin)) {
WRITE_ARC_REG(READ_ARC_REG(base) | (0x01 << GPIO_ID(pin)), base); WRITE_ARC_REG(READ_ARC_REG(base) | (0x01 << GPIO_ID(pin)), base);
} else { } else {
@@ -380,15 +353,11 @@ void directWriteHigh(volatile IO_REG_TYPE *base, IO_REG_TYPE pin)
#define IO_REG_BASE_ATTR #define IO_REG_BASE_ATTR
#define IO_REG_MASK_ATTR #define IO_REG_MASK_ATTR
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) IO_REG_TYPE directRead(IO_REG_TYPE mask) {
IO_REG_TYPE directRead(IO_REG_TYPE mask)
{
return ((GPIO_REG(GPIO_INPUT_VAL) & mask) != 0) ? 1 : 0; return ((GPIO_REG(GPIO_INPUT_VAL) & mask) != 0) ? 1 : 0;
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) void directModeInput(IO_REG_TYPE mask) {
void directModeInput(IO_REG_TYPE mask)
{
GPIO_REG(GPIO_OUTPUT_XOR) &= ~mask; GPIO_REG(GPIO_OUTPUT_XOR) &= ~mask;
GPIO_REG(GPIO_IOF_EN) &= ~mask; GPIO_REG(GPIO_IOF_EN) &= ~mask;
@@ -396,9 +365,7 @@ void directModeInput(IO_REG_TYPE mask)
GPIO_REG(GPIO_OUTPUT_EN) &= ~mask; GPIO_REG(GPIO_OUTPUT_EN) &= ~mask;
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) void directModeOutput(IO_REG_TYPE mask) {
void directModeOutput(IO_REG_TYPE mask)
{
GPIO_REG(GPIO_OUTPUT_XOR) &= ~mask; GPIO_REG(GPIO_OUTPUT_XOR) &= ~mask;
GPIO_REG(GPIO_IOF_EN) &= ~mask; GPIO_REG(GPIO_IOF_EN) &= ~mask;
@@ -406,15 +373,11 @@ void directModeOutput(IO_REG_TYPE mask)
GPIO_REG(GPIO_OUTPUT_EN) |= mask; GPIO_REG(GPIO_OUTPUT_EN) |= mask;
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) void directWriteLow(IO_REG_TYPE mask) {
void directWriteLow(IO_REG_TYPE mask)
{
GPIO_REG(GPIO_OUTPUT_VAL) &= ~mask; GPIO_REG(GPIO_OUTPUT_VAL) &= ~mask;
} }
static inline __attribute__((always_inline)) static inline __attribute__((always_inline)) void directWriteHigh(IO_REG_TYPE mask) {
void directWriteHigh(IO_REG_TYPE mask)
{
GPIO_REG(GPIO_OUTPUT_VAL) |= mask; GPIO_REG(GPIO_OUTPUT_VAL) |= mask;
} }
@@ -440,8 +403,7 @@ void directWriteHigh(IO_REG_TYPE mask)
#endif #endif
class OneWire class OneWire {
{
private: private:
IO_REG_TYPE bitmask; IO_REG_TYPE bitmask;
volatile IO_REG_TYPE * baseReg; volatile IO_REG_TYPE * baseReg;
@@ -455,8 +417,11 @@ class OneWire
#endif #endif
public: public:
OneWire() { } OneWire() {
OneWire(uint8_t pin) { begin(pin); } }
OneWire(uint8_t pin) {
begin(pin);
}
void begin(uint8_t pin); void begin(uint8_t pin);
// OneWire( uint8_t pin); // OneWire( uint8_t pin);

2
lib/uuid-telnet/src/telnet.cpp
View File

@@ -138,7 +138,7 @@ void TelnetService::loop() {
} }
} }
WiFiClient client = server_.available(); WiFiClient client = server_.accept();
if (client) { if (client) {
if (connections_.size() >= maximum_connections_) { if (connections_.size() >= maximum_connections_) {
#if UUID_TELNET_HAVE_WIFICLIENT_REMOTE #if UUID_TELNET_HAVE_WIFICLIENT_REMOTE

4
mock-api/rest_server.ts
View File

@@ -2144,7 +2144,7 @@ let emsesp_modules = {
"version": "1.0.0", "version": "1.0.0",
"enabled": true, "enabled": true,
"status": 1, "status": 1,
"message": "Ready", "message": "Running",
"license": "1234567890" "license": "1234567890"
}, },
{ {
@@ -2155,7 +2155,7 @@ let emsesp_modules = {
"version": "1.0.0", "version": "1.0.0",
"enabled": true, "enabled": true,
"status": 2, "status": 2,
"message": "Ready", "message": "Running",
"license": "ABCDEFGHIJKL" "license": "ABCDEFGHIJKL"
} }

18
platformio.ini
View File

@@ -6,13 +6,14 @@
default_envs = lolin_s3 default_envs = lolin_s3
; default_envs = esp32_16M ; default_envs = esp32_16M
; default_envs = standalone ; default_envs = standalone
; default_envs = espressi32_v3
extra_configs = extra_configs =
factory_settings.ini factory_settings.ini
pio_local.ini pio_local.ini
[common] [common]
core_build_flags = -std=gnu++2a -Isrc core_build_flags = -std=gnu++2a -Isrc -Wno-type-limits
core_unbuild_flags = -std=gnu++11 core_unbuild_flags = -std=gnu++11
; my_build_flags is set in pio_local.ini ; my_build_flags is set in pio_local.ini
@@ -37,7 +38,7 @@ unbuild_flags =
${common.core_unbuild_flags} ${common.core_unbuild_flags}
[espressi32_base] [espressi32_base]
platform = espressif32@6.7.0 platform = espressif32
framework = arduino framework = arduino
board_build.filesystem = littlefs board_build.filesystem = littlefs
build_flags = build_flags =
@@ -50,9 +51,9 @@ extra_scripts =
[espressi32_base_tasmota] [espressi32_base_tasmota]
; use Tasmota's library which removes some unused libs (like mbedtsl, so no WiFi_secure.h) and increases available heap ; use Tasmota's library which removes some unused libs (like mbedtsl, so no WiFi_secure.h) and increases available heap
; Tasmota Arduino Core 2.0.17 with IPv6 support, based on IDF 4.4.7 ; Tasmota Arduino Core 2.0.17 with IPv6 support, based on IDF 4.4.7
platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.05.00/platform-espressif32.zip ; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.05.00/platform-espressif32.zip
; Tasmota Arduino Core 3.0.0.240529 based on IDF v5.1.4.240528 ; Tasmota Arduino Core 3.0.1.240605 based on IDF v5.1.4.240602
; platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.05.13/platform-espressif32.zip platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.06.10/platform-espressif32.zip
framework = arduino framework = arduino
board_build.filesystem = littlefs board_build.filesystem = littlefs
build_flags = build_flags =
@@ -79,8 +80,9 @@ lib_deps =
bblanchon/ArduinoJson@^7.0.4 bblanchon/ArduinoJson@^7.0.4
; build for GitHub Actions CI ; build for GitHub Actions CI
; the Web interface is built seperately, so is skipper in extra_scripts ; the Web interface is built seperately, so is skipped in extra_scripts
[env:ci] [env:ci]
; 4MB using Tasmota (no SSL)
extends = espressi32_base_tasmota extends = espressi32_base_tasmota
extra_scripts = scripts/rename_fw.py extra_scripts = scripts/rename_fw.py
board = esp32dev board = esp32dev
@@ -88,6 +90,7 @@ board_build.partitions = esp32_partition_4M.csv
board_build.extra_flags = -DBOARD_HAS_PSRAM board_build.extra_flags = -DBOARD_HAS_PSRAM
[env:ci_s3] [env:ci_s3]
; 16MB ESP32-S3
extends = espressi32_base extends = espressi32_base
extra_scripts = scripts/rename_fw.py extra_scripts = scripts/rename_fw.py
board = lolin_s3 board = lolin_s3
@@ -100,6 +103,7 @@ build_flags =
'-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"' '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
[env:ci_16M] [env:ci_16M]
; 16MB ESP32 with PSRAM
extends = espressi32_base extends = espressi32_base
extra_scripts = scripts/rename_fw.py extra_scripts = scripts/rename_fw.py
board = esp32dev board = esp32dev
@@ -109,6 +113,8 @@ build_flags =
${espressi32_base.build_flags} ${espressi32_base.build_flags}
'-DEMSESP_DEFAULT_BOARD_PROFILE="E32V2"' '-DEMSESP_DEFAULT_BOARD_PROFILE="E32V2"'
; Direct builds
[env:esp32_4M] [env:esp32_4M]
extends = espressi32_base_tasmota extends = espressi32_base_tasmota
board = esp32dev board = esp32dev