3.1.0.BETA3
* Version Bump to 3.1.0.BETA3 * Bugfixes * adresse issue: #39
This commit is contained in:
@@ -535,11 +535,11 @@ void setup() {
|
||||
DBG_OUTPUT_PORT.print("Use http://");
|
||||
DBG_OUTPUT_PORT.print(HOSTNAME);
|
||||
DBG_OUTPUT_PORT.println(".local/ when you have Bonjour installed.");
|
||||
|
||||
#if !defined(USE_HTML_MIN_GZ)
|
||||
DBG_OUTPUT_PORT.print("New users: Open http://");
|
||||
DBG_OUTPUT_PORT.print(WiFi.localIP());
|
||||
DBG_OUTPUT_PORT.println("/upload to upload the webpages first.");
|
||||
|
||||
#endif
|
||||
DBG_OUTPUT_PORT.println("");
|
||||
|
||||
// ***************************************************************************
|
||||
|
||||
@@ -12,7 +12,6 @@
|
||||
#define FX_OPTIONS 48 // ws2812fx Options 48 = SIZE_SMALL + FADE_MEDIUM is configurable just for the start; for WS2812FX setSegment OPTIONS, see: https://github.com/kitesurfer1404/WS2812FX/blob/master/extras/WS2812FX%20Users%20Guide.md
|
||||
//#define LED_TYPE_WS2811 // Uncomment, if LED type uses 400 KHz (classic 'v1' (not v2) FLORA pixels, WS2811 drivers)
|
||||
#define LED_BUILTIN 2 // ESP-12F has the built in LED on GPIO2, see https://github.com/esp8266/Arduino/issues/2192
|
||||
//#define POWER_SUPPLY 12 // PIN (12 / D6) If defined, enable output to control external power supply
|
||||
char HOSTNAME[65] = "McLightingRGBW"; // Friedly hostname is configurable just for the start. Hostname should not contain spaces as this can break Home Assistant discovery if used.
|
||||
|
||||
#define ENABLE_OTA 1 // If defined, enable Arduino OTA code. If set to 0 enable Arduino OTA code, if set to 1 enable ESP8266HTTPUpdateServer OTA code.
|
||||
@@ -21,12 +20,15 @@ char HOSTNAME[65] = "McLightingRGBW"; // Friedly hostname is configurable just
|
||||
//#define ENABLE_MQTT_INCLUDE_IP // uncomment/comment to add the IP-adress to the MQTT message
|
||||
#define ENABLE_HOMEASSISTANT // If defined, enable Homeassistant integration, ENABLE_MQTT must be active
|
||||
#define MQTT_HOME_ASSISTANT_SUPPORT // If defined, use AMQTT and select Tools -> IwIP Variant -> Higher Bandwidth
|
||||
|
||||
#define ENABLE_BUTTON 14 // If defined, enable button handling code, see: https://github.com/toblum/McLighting/wiki/Button-control, the value defines the input pin (14 / D5) for switching the LED strip on / off, connect this PIN to ground to trigger button.
|
||||
//#define ENABLE_BUTTON_GY33 12 // If defined, enable button handling code for GY-33 color sensor to scan color. The value defines the input pin (12 / D6) for read color data with RGB sensor, connect this PIN to ground to trigger button.
|
||||
//#define POWER_SUPPLY 12 // PIN (12 / D6) If defined, enable output to control external power supply
|
||||
//#define ENABLE_REMOTE 13 // If defined, enable Remote Control via TSOP31238. The value defines the input pin (13 / D7) for TSOP31238 Out
|
||||
|
||||
#if defined(ENABLE_BUTTON_GY33)
|
||||
#define GAMMA 2.5 // Gamma correction for GY-33 sensor
|
||||
#endif
|
||||
//#define ENABLE_REMOTE 13 // If defined, enable Remote Control via TSOP31238. The value defines the input pin (13 / D7) for TSOP31238 Out
|
||||
|
||||
#define ENABLE_STATE_SAVE // If defined, load saved state on reboot and save state on SPIFFS
|
||||
|
||||
|
||||
@@ -712,8 +712,9 @@ void webSocketEvent(uint8_t num, WStype_t type, uint8_t * payload, size_t lenght
|
||||
JsonObject root = jsonBuffer.to<JsonObject>();
|
||||
root["state"] = (State.mode != OFF) ? on_cmd : off_cmd;
|
||||
#if defined(ENABLE_MQTT_INCLUDE_IP)
|
||||
root["ip"] = WiFi.localIP();
|
||||
root["ip"] = WiFi.localIP().toString();
|
||||
#endif
|
||||
root["segment"] = State.segment;
|
||||
JsonObject color = root.createNestedObject("color");
|
||||
color["r"] = main_color.red;
|
||||
color["g"] = main_color.green;
|
||||
|
||||
@@ -1 +1 @@
|
||||
#define SKETCH_VERSION "3.1.0.BETA2"
|
||||
#define SKETCH_VERSION "3.1.0.BETA3"
|
||||
|
||||
@@ -216,4 +216,10 @@
|
||||
* Version Bump to 3.1.0.BETA2
|
||||
* bugfixes
|
||||
* implemented https://github.com/FabLab-Luenen/McLighting/commit/589806d0fda737011426754a6d84c88535ded688
|
||||
*
|
||||
* 20 October
|
||||
* Version Bump to 3.1.0.BETA3
|
||||
* Bugfixes
|
||||
* adresse issue: #39
|
||||
*
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user