userbogd/webguiapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved to idf5

Browse Source
This commit is contained in:
Bogdan Pilyugin 2023-02-19 15:46:55 +02:00
parent 36994cd33d
commit 77a59eb45a
11 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -40,7 +40,7 @@ idf_component_register(
"src/MQTT.c"
"src/MQTTSysHandler.c"
"src/OTA.c"
"src/mDNS.c"
# "src/mDNS.c"
INCLUDE_DIRS "."
"include"
@ -55,7 +55,10 @@ idf_component_register(
mqtt
esp_https_ota
app_update
mdns
# mdns
esp_wifi
esp_http_server
esp_eth
EMBED_FILES "upload_script.html"
EMBED_TXTFILES ca_cert.pem

7
include/NetTransport.h
View File

@ -30,6 +30,7 @@
#include "mqtt_client.h"
#include "esp_netif.h"
#include "esp_log.h"
#include "esp_wifi_types.h"
typedef struct
{
@ -46,9 +47,9 @@ typedef struct
//#define DEFAULT_FALLBACK_DNS "8.8.8.8"
QueueHandle_t MQTT1MessagesQueueHandle;
QueueHandle_t MQTT2MessagesQueueHandle;
EventGroupHandle_t transport_event_group;
//QueueHandle_t MQTT1MessagesQueueHandle;
//QueueHandle_t MQTT2MessagesQueueHandle;
//EventGroupHandle_t transport_event_group;
wifi_ap_record_t* GetWiFiAPRecord(uint8_t n);

2
include/romfs.h
View File

@ -28,7 +28,7 @@
#include "libespfs/espfs_format.h"
#include "libespfs/vfs.h"
espfs_fs_t *fs;
void init_rom_fs(const char *root);
#endif /* COMPONENTS_WEB_GUI_APPLICATION_INCLUDE_ROMFS_H_ */

6
src/HTTPPrintSystem.c
View File

@ -33,6 +33,8 @@
static const char *TAG = "HTTPServerPrint";
extern espfs_fs_t *fs;
typedef enum
{
IP,
@ -122,11 +124,11 @@ static void HTTPPrint_time(char *VarData, void *arg)
{
time_t now;
time(&now);
snprintf(VarData, MAX_DYNVAR_LENGTH, "%d", (uint32_t) now);
snprintf(VarData, MAX_DYNVAR_LENGTH, "%d", (int) now);
}
static void HTTPPrint_uptime(char *VarData, void *arg)
{
snprintf(VarData, MAX_DYNVAR_LENGTH, "%d", GetUpTime());
snprintf(VarData, MAX_DYNVAR_LENGTH, "%d", (int)GetUpTime());
}
static void HTTPPrint_status_fail(char *VarData, void *arg)

2
src/HTTPServer.c
View File

@ -24,6 +24,8 @@
#include "HTTPServer.h"
#include "sdkconfig.h"
extern espfs_fs_t *fs;
const char GZIP_SIGN[] = { 0x1f, 0x8b, 0x08 };
static esp_err_t GETHandler(httpd_req_t *req);

18
src/MQTT.c
View File

@ -24,6 +24,7 @@
#include "NetTransport.h"
#include "MQTT.h"
#define MQTT_DEBUG_MODE 1
#define MQTT_MESSAGE_BUFER_LENTH 5 //size of mqtt queue
@ -31,6 +32,9 @@
#if CONFIG_WEBGUIAPP_MQTT_ENABLE
QueueHandle_t MQTT1MessagesQueueHandle;
QueueHandle_t MQTT2MessagesQueueHandle;
static SemaphoreHandle_t xSemaphoreMQTTHandle = NULL;
static StaticSemaphore_t xSemaphoreMQTTBuf;
static StaticQueue_t xStaticMQTT1MessagesQueue;
@ -105,7 +109,7 @@ static void mqtt_system_event_handler(int idx, void *handler_args, esp_event_bas
{
xSemaphoreTake(xSemaphoreMQTTHandle, pdMS_TO_TICKS(1000));
#if MQTT_DEBUG_MODE > 0
ESP_LOGI(TAG, "Event dispatched from event loop base=%s, event_id=%d", base, event_id);
ESP_LOGI(TAG, "Event dispatched from event loop base=%s, event_id=%d", base, (int)event_id);
#endif
esp_mqtt_event_handle_t event = event_data;
esp_mqtt_client_handle_t client = event->client;
@ -284,13 +288,17 @@ static void start_mqtt()
itoa(GetSysConf()->mqttStation[i].ServerPort, tmp, 10);
strcat(url, ":");
strcat(url, tmp);
mqtt_cfg.uri = url;
mqtt_cfg.username = GetSysConf()->mqttStation[i].UserName;
mqtt_cfg.password = GetSysConf()->mqttStation[i].UserPass;
//mqtt_cfg.uri = url;
mqtt_cfg.broker.address.uri = url;
//mqtt_cfg.username = GetSysConf()->mqttStation[i].UserName;
mqtt_cfg.credentials.username = GetSysConf()->mqttStation[i].UserName;
//mqtt_cfg.password = GetSysConf()->mqttStation[i].UserPass;
mqtt_cfg.credentials.authentication.password = GetSysConf()->mqttStation[i].UserPass;
strcpy(tmp, GetSysConf()->mqttStation[i].ClientID);
strcat(tmp, "-");
strcat(tmp, GetSysConf()->ID);
mqtt_cfg.client_id = tmp;
//mqtt_cfg.client_id = tmp;
mqtt_cfg.credentials.client_id = tmp;
mqtt[i].is_connected = false;
mqtt[i].mqtt_index = i;
//mqtt_cfg.user_context = (void*) &mqtt[i];

1
src/MQTTSysHandler.c
View File

@ -51,6 +51,7 @@
#include "romfs.h"
#include "HTTPServer.h"
extern espfs_fs_t *fs;
#define PANEL_MESSAGE_LENGTH 32 //base message length, mainly depended by radio requirements
#define MAX_JSON_MESSAGE 256 //max size of mqtt message to publish

3
src/OTA.c
View File

@ -73,6 +73,9 @@ esp_err_t _http_event_handler(esp_http_client_event_t *evt)
case HTTP_EVENT_DISCONNECTED:
ESP_LOGD(TAG, "HTTP_EVENT_DISCONNECTED");
break;
case HTTP_EVENT_REDIRECT:
ESP_LOGD(TAG, "HTTP_EVENT_REDIRECT");
break;
}
return ESP_OK;
}

4
src/WebGUIAppMain.c
View File

@ -173,7 +173,7 @@ esp_err_t WebGuiAppInit(void)
static void InitSysIO(void)
{
#if (MAIN_FUNCTIONAL_BUTTON_GPIO >= 0)
gpio_pad_select_gpio(MAIN_FUNCTIONAL_BUTTON_GPIO);
esp_rom_gpio_pad_select_gpio(MAIN_FUNCTIONAL_BUTTON_GPIO);
gpio_set_direction(MAIN_FUNCTIONAL_BUTTON_GPIO, GPIO_MODE_INPUT);
gpio_set_pull_mode(MAIN_FUNCTIONAL_BUTTON_GPIO, GPIO_PULLUP_ONLY);
gpio_pullup_en(MAIN_FUNCTIONAL_BUTTON_GPIO);
@ -241,7 +241,7 @@ static void ResetSysConfig(SYS_CONFIG *Conf)
UINT32_VAL d;
GetChipId((uint8_t*) d.v);
snprintf(Conf->SN, 11, "%010u", swap(d.Val));
snprintf(Conf->SN, 11, "%010d", (int)swap(d.Val));
memcpy(Conf->NetBIOSName, CONFIG_WEBGUIAPP_HOSTNAME,
sizeof(CONFIG_WEBGUIAPP_HOSTNAME));

1
src/WiFiTransport.c
View File

@ -32,6 +32,7 @@
#include "NetTransport.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
#include "esp_mac.h"
esp_netif_t *sta_netif;
esp_netif_t *ap_netif;

2
src/romfs.c
View File

@ -23,6 +23,8 @@
#include "romfs.h"
espfs_fs_t *fs;
extern const uint8_t espfs_bin[];
espfs_fs_t *fs;
espfs_config_t espfs_config = {