Skip to content

WIP: move gui to esp-gui #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

WIP: move gui to esp-gui #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a68d46
logging: switch to yal
alexmohr May 27, 2022
b43e224
Issue-ID: yalfixes: minor fixes and crashes
alexmohr Jul 17, 2022
037511c
esp-gui: change UI to esp-gui
alexmohr Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion platformio.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ build_flags =
-DVERSION=0.1.0
-DMONITOR_SPEED=115200
-O3
-DTEMP_SENSOR=BM280
-std=c++17
-std=gnu++17
-DCMAKE_C_STANDARD=c99
-DYAL_ARDUINO_SUPPORT=true
-frtti

build_unflags =
-std=gnu++11
Expand All @@ -46,6 +46,8 @@ lib_deps =
Adafruit BMP280 Library
MQTT@>=2.5.0
yal
esp-gui
ArduinoJson

[env:nodemcuv2]
build_flags =
Expand Down
85 changes: 0 additions & 85 deletions scripts/generate_html.py
View file
Open in desktop

This file was deleted.

175 changes: 92 additions & 83 deletions src/Config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,90 +1,99 @@
////
//// Copyright (c) 2021 Alexander Mohr
//// Licensed under the terms of the GNU General Public License v3.0
////
//
// Copyright (c) 2021 Alexander Mohr
// Licensed under the terms of the GNU General Public License v3.0
//

#ifndef WIFIMANAGERCONFIG_HPP_
#define WIFIMANAGERCONFIG_HPP_

// disable formatter, cstdin must be included first
// formatter:off
#include <cstdint>
// formatter:on
#include <hardware/pins.h>
#include <pins_arduino.h>

static constexpr uint8_t MIN_AP_PASSWORD_SIZE = 8;
static constexpr uint8_t SSID_MAX_LEN = 32;
static constexpr uint8_t PASS_MAX_LEN = 64;

static constexpr uint16_t MQTT_DEFAULT_PORT = 1883;
static constexpr uint8_t MQTT_SERVER_NAME_MAX_SIZE = 32;
static constexpr uint8_t MQTT_PORT_STR_MAX_SIZE = 16;
static constexpr uint16_t MQTT_TOPIC_MAX_SIZE = 64;
static constexpr uint8_t MQTT_USERNAME_MAX_SIZE = 32;
static constexpr uint8_t MQTT_PASSWORD_MAX_SIZE = 32;

static constexpr uint8_t UPDATE_MIN_USERNAME_LEN = 1;
static constexpr uint8_t UPDATE_MAX_USERNAME_LEN = 32;
static constexpr uint8_t UPDATE_MIN_PW_LEN = 1;
static constexpr uint8_t UPDATE_MAX_PW_LEN = 64;

static constexpr uint8_t HOST_NAME_MAX_LEN = 32;

static constexpr int8_t DEFAULT_MOTOR_GROUND = D6;
static constexpr int8_t DEFAULT_MOTOR_VIN = D5;

static constexpr int8_t DEFAULT_TEMP_VIN = D7;
// On devboard defaults are D8 and D7
// PIN_D7 13
// PIN_D8 15
static constexpr int8_t DEFAULT_WINDOW_GROUND = -1;
static constexpr int8_t DEFAULT_WINDOW_VIN = -1;

static constexpr const char* DEFAULT_HOST_NAME = "OpenHeat";

static constexpr const char* DEFAULT_USER = "admin";
static constexpr const char* DEFAULT_PW = "letmein";

typedef struct {
char ssid[SSID_MAX_LEN];
char password[PASS_MAX_LEN];
} WiFiCredentials;

typedef struct MQTTSettings {
char Server[MQTT_SERVER_NAME_MAX_SIZE]{};
unsigned short Port = MQTT_DEFAULT_PORT;
char Topic[MQTT_TOPIC_MAX_SIZE]{};
char Username[MQTT_USERNAME_MAX_SIZE]{};
char Password[MQTT_PASSWORD_MAX_SIZE]{};
} MQTTSettings;

typedef struct UpdateSettings {
char Username[UPDATE_MAX_USERNAME_LEN]{};
char Password[UPDATE_MAX_PW_LEN]{};
} UpdateSettings;

// pins are signed to indicate unused with < 0
typedef struct PinSettings {
namespace open_heat::config {
//
//// disable formatter, cstdin must be included first
//// formatter:off
//#include <cstdint>
//// formatter:on
//#include <hardware/pins.h>
//#include <pins_arduino.h>
//
// static constexpr uint8_t MIN_AP_PASSWORD_SIZE = 8;
// static constexpr uint8_t SSID_MAX_LEN = 32;
// static constexpr uint8_t PASS_MAX_LEN = 64;
//
// static constexpr uint16_t MQTT_DEFAULT_PORT = 1883;
// static constexpr uint8_t MQTT_SERVER_NAME_MAX_SIZE = 32;
// static constexpr uint8_t MQTT_PORT_STR_MAX_SIZE = 16;
// static constexpr uint16_t MQTT_TOPIC_MAX_SIZE = 64;
// static constexpr uint8_t MQTT_USERNAME_MAX_SIZE = 32;
// static constexpr uint8_t MQTT_PASSWORD_MAX_SIZE = 32;
//
// static constexpr uint8_t UPDATE_MIN_USERNAME_LEN = 1;
// static constexpr uint8_t UPDATE_MAX_USERNAME_LEN = 32;
// static constexpr uint8_t UPDATE_MIN_PW_LEN = 1;
// static constexpr uint8_t UPDATE_MAX_PW_LEN = 64;
//
// static constexpr uint8_t HOST_NAME_MAX_LEN = 32;
//
// static constexpr int8_t DEFAULT_MOTOR_GROUND = D6;
// static constexpr int8_t DEFAULT_MOTOR_VIN = D5;
//
// static constexpr int8_t DEFAULT_TEMP_VIN = D7;
//// On devboard defaults are D8 and D7
//// PIN_D7 13
//// PIN_D8 15
// static constexpr int8_t DEFAULT_WINDOW_GROUND = -1;
// static constexpr int8_t DEFAULT_WINDOW_VIN = -1;
//
// static constexpr const char* DEFAULT_HOST_NAME = "OpenHeat";
//
// static constexpr const char* DEFAULT_USER = "admin";
// static constexpr const char* DEFAULT_PW = "letmein";
//
// typedef struct {
// char ssid[SSID_MAX_LEN];
// char password[PASS_MAX_LEN];
// } WiFiCredentials;
//
// typedef struct MQTTSettings {
// char Server[MQTT_SERVER_NAME_MAX_SIZE]{};
// unsigned short Port = MQTT_DEFAULT_PORT;
// char Topic[MQTT_TOPIC_MAX_SIZE]{};
// char Username[MQTT_USERNAME_MAX_SIZE]{};
// char Password[MQTT_PASSWORD_MAX_SIZE]{};
// } MQTTSettings;
//
// typedef struct UpdateSettings {
// char Username[UPDATE_MAX_USERNAME_LEN]{};
// char Password[UPDATE_MAX_PW_LEN]{};
// } UpdateSettings;
//
//// pins are signed to indicate unused with < 0
using PinSettings = struct PinSettings {
int8_t Ground{};
int8_t Vin{};
} PinSettings;

enum OperationMode { HEAT, OFF, FULL_OPEN, UNKNOWN };
enum TemperatureSensor { BME, BMP };

typedef struct Config {
WiFiCredentials WifiCredentials{"", ""};
MQTTSettings MQTT{};
UpdateSettings Update{};
char Hostname[HOST_NAME_MAX_LEN]{};
float SetTemperature{18};
OperationMode Mode{OFF};
PinSettings MotorPins{DEFAULT_MOTOR_GROUND, DEFAULT_MOTOR_VIN};
PinSettings WindowPins{};
int8_t TempVin{DEFAULT_TEMP_VIN};
TemperatureSensor TempSensor{TemperatureSensor::BME};

} Config;

};

enum class OperationMode { HEAT, OFF, FULL_OPEN, UNKNOWN };
enum class TemperatureSensor { BME, BMP };
constexpr const char* MOTOR_VIN = "MotorVIN";
constexpr const char* MOTOR_GROUND = "MotorGROUND";
constexpr const char* TEMP_VIN = "TempVIN";
constexpr const char* TEMP_SENSOR_TYPE = "TempSensorType";
constexpr const char* TEMP_SET = "TempSet";
constexpr const char* TEMP_MODE = "TempMode";
//
// typedef struct Config {
// WiFiCredentials WifiCredentials{"", ""};
// MQTTSettings MQTT{};
// UpdateSettings Update{};
// char Hostname[HOST_NAME_MAX_LEN]{};
// float SetTemperature{18};
// OperationMode Mode{OFF};
// PinSettings MotorPins{DEFAULT_MOTOR_GROUND, DEFAULT_MOTOR_VIN};
// PinSettings WindowPins{};
// int8_t TempVin{DEFAULT_TEMP_VIN};
// TemperatureSensor TempSensor{TemperatureSensor::BME};
//
//} Config;
//
} // namespace open_heat::config
#endif // WIFIMANAGERCONFIG_HPP_
Loading