Skip to content

Fix for AdvancedDimmableLed example #97

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
rauberdaniel wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix for AdvancedDimmableLed example #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96cf887
fix EspHapAdvancedDimmableLed consistency and typos
rauberdaniel Jun 29, 2021
fc0defb
html cleaning
rauberdaniel Jul 9, 2021
ec90b8a
html fix
rauberdaniel Jul 9, 2021
7036090
fixed checkbox elements on web-control
rauberdaniel Jul 11, 2021
89ddc43
avoid unnecessary storing of dim value
rauberdaniel Jul 11, 2021
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
308 changes: 153 additions & 155 deletions examples/EspHapAdvancedDimmableLed/EspHapAdvancedDimmableLed.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,224 +1,222 @@
#ifdef ESP32
#include <SPIFFS.h>
#include <SPIFFS.h>
#endif
#ifdef ESP8266
#include <ESP8266WiFi.h>

#include <ESP8266mDNS.h>
#include "coredecls.h"
#include <ESP8266WiFi.h>
#include <ESP8266mDNS.h>
#include "coredecls.h"
#endif
extern "C"{
#include "homeintegration.h"
extern "C" {
#include "homeintegration.h"
}
#ifdef ESP8266
#include "homekitintegrationcpp.h"
#include "homekitintegrationcpp.h"
#endif

#include <WiFiManager.h> // https://github.com/tzapu/WiFiManager

#include <hapfilestorage/hapfilestorage.hpp>
#include <hapweb/hap_webserver.hpp>

#include "file_index_html.h"

#include <WiFiManager.h> //https://github.com/tzapu/WiFiManager



bool isWebserver_started=false;
const int identity_led=2;
bool is_webserver_started = false;
const int identity_led = 2;
const int led_gpio = 4;
int channel =0; // for esp32, we will use channel 0 for PWM
uint8_t led_level_srored=0;
int pwm_channel = 0; // for esp32, we will use channel 0 for PWM

#define DIM_MIN_VAL 0
#define DIM_MAX_VAL 0xFF
#define DIM_FREQ 5000
#define DIM_RESOLUTION 8

#define DIMCALC_VAL(val,invert) constrain(((!invert)?val:(DIM_MAX_VAL-val)),DIM_MIN_VAL,DIM_MAX_VAL)
#define MAP_100_2_255(val) map(val,0,100,DIM_MIN_VAL,DIM_MAX_VAL)
#define DIMCALC_VAL(val, invert) \
constrain(((!invert) ? val : (DIM_MAX_VAL - val)), DIM_MIN_VAL, DIM_MAX_VAL)
#define MAP_100_TO_255(val) map(val, 0, 100, DIM_MIN_VAL, DIM_MAX_VAL)

const char* HOSTNAME="EspLed";
homekit_service_t* hapservice={0};
const char *HOSTNAME = "EspLed";
homekit_service_t *hapservice = {0};

void startwifimanager() {
void startWiFiManager() {
WiFiManager wifiManager;
if (!wifiManager.autoConnect(HOSTNAME, NULL)) {
ESP.restart();
delay(1000);
}
ESP.restart();
delay(1000);
}
}

void setup() {
#ifdef ESP8266
disable_extra4k_at_link_time();
#endif
#ifdef ESP8266
disable_extra4k_at_link_time();
#endif
Serial.begin(115200);
delay(10);

// We start by connecting to a WiFi network
#ifdef ESP32
#ifdef ESP32
if (!SPIFFS.begin(true)) {
#else if ESP8266
#else if ESP8266
if (!SPIFFS.begin()) {
#endif
Serial.print("SPIFFS Mount failed");
#endif
Serial.print("SPIFFS Mount failed");
}

pinMode(led_gpio,OUTPUT);
#ifdef ESP32
ledcSetup(channel, DIM_FREQ, DIM_RESOLUTION);
ledcAttachPin(led_gpio, channel);
#endif
startwifimanager();
///setup identity gpio
hap_set_identity_gpio(identity_led); //identity_led=2 will blink on identity

/// now will setup homekit device

//this is for custom storaage usage
// In given example we are using \pair.dat file in our spiffs system
init_hap_storage("/pair.dat");


/// We will use for this example only one accessory (possible to use a several on the same esp)
//Our accessory type is light bulb , apple interface will proper show that
hap_setbase_accessorytype(homekit_accessory_category_lightbulb);

// Setup ID in format "XXXX" (where X is digit or latin capital letter)
// Used for pairing using QR code
hap_set_device_setupId((char*)"YK72");
/// init base properties
hap_initbase_accessory_service(HOSTNAME,"Yurik72","0","EspHapLed","1.0");

//we will add only one light bulb service and keep pointer for nest using
hapservice= hap_add_relaydim_service("Led",led_callback,(void*)&led_gpio);

//and finally init HAP
hap_init_homekit_server();


set_indexhml(FPSTR(INDEX_HTML));
hap_webserver_begin();

server.on("/get", handleGetVal);

pinMode(led_gpio, OUTPUT);
#ifdef ESP32
ledcSetup(pwm_channel, DIM_FREQ, DIM_RESOLUTION);
ledcAttachPin(led_gpio, pwm_channel);
#endif

// We start by connecting to a WiFi network
startWiFiManager();

// setup identity gpio
hap_set_identity_gpio(identity_led); // identity_led = 2 will blink on identity

/// now will setup homekit device

// this is for custom storage usage
// In given example we are using /pair.dat file in our spiffs system
init_hap_storage("/pair.dat");

/// We will use for this example only one accessory (possible to use a several
/// on the same esp)
// Our accessory type is light bulb , apple interface will proper show that
hap_setbase_accessorytype(homekit_accessory_category_lightbulb);

// Setup ID in format "XXXX" (where X is digit or latin capital letter)
// Used for pairing using QR code
hap_set_device_setupId((char *)"YK72");
/// init base properties
hap_initbase_accessory_service(HOSTNAME, "Yurik72", "0", "EspHapLed", "1.0");

// we will add only one light bulb service and keep pointer for nest using
hapservice = hap_add_relaydim_service("Led", led_callback, (void *)&led_gpio);

// and finally init HAP
hap_init_homekit_server();

set_indexhml(FPSTR(INDEX_HTML));
hap_webserver_begin();

server.on("/get", handleGetVal);
server.on("/set", handleSetVal);

isWebserver_started=true;
is_webserver_started = true;
}

void loop() {
#ifdef ESP8266
hap_homekit_loop();
#endif
if(isWebserver_started){
hap_webserver_loop();
#ifdef ESP8266
hap_homekit_loop();
#endif
if (is_webserver_started) {
hap_webserver_loop();
}

}

bool get_led(){
if(hapservice){
homekit_characteristic_t * ch= homekit_service_characteristic_by_type(hapservice, HOMEKIT_CHARACTERISTIC_ON);
if(ch){
return ch->value.bool_value;
}
bool get_led() {
if (hapservice) {
homekit_characteristic_t *ch = homekit_service_characteristic_by_type(
hapservice, HOMEKIT_CHARACTERISTIC_ON);
if (ch) {
return ch->value.bool_value;
}
return false;
}
return false;
}

uint8_t get_led_level(){
if(hapservice){
homekit_characteristic_t * ch= homekit_service_characteristic_by_type(hapservice, HOMEKIT_CHARACTERISTIC_BRIGHTNESS);
if(ch){
return ch->value.int_value;
}
uint8_t get_led_level() {
if (hapservice) {
homekit_characteristic_t *ch = homekit_service_characteristic_by_type(
hapservice, HOMEKIT_CHARACTERISTIC_BRIGHTNESS);
if (ch) {
return ch->value.int_value;
}
return 0;
}
return 0;
}
void handleGetVal(){
if(server.arg("var") == "ch1")
server.send(200, FPSTR(TEXT_PLAIN),String(get_led()));
else if(server.arg("var") == "level")
server.send(200, FPSTR(TEXT_PLAIN),String(get_led_level()));
else
server.send(505, FPSTR(TEXT_PLAIN),"Bad args");

void handleGetVal() {
if (server.arg("var") == "ch1") {
server.send(200, FPSTR(TEXT_PLAIN), String(get_led()));
} else if (server.arg("var") == "level") {
server.send(200, FPSTR(TEXT_PLAIN), String(get_led_level()));
} else {
server.send(505, FPSTR(TEXT_PLAIN), "Bad args");
}
}
void handleSetVal(){
if (server.args() !=2){
server.send(505,"text/plain", "Bad args");

void handleSetVal() {
if (server.args() != 2) {
server.send(505, FPSTR(TEXT_PLAIN), "Bad args");
return;
}
bool isOk=false;

if(server.arg("var") == "ch1"){
if(hapservice){
homekit_characteristic_t * ch= homekit_service_characteristic_by_type(hapservice, HOMEKIT_CHARACTERISTIC_ON);
if(ch){
set_led(server.arg("val")=="true");
isOk=true;
bool isOk = false;

if (server.arg("var") == "ch1") {
if (hapservice) {
homekit_characteristic_t *ch = homekit_service_characteristic_by_type(
hapservice, HOMEKIT_CHARACTERISTIC_ON);
if (ch) {
set_led(server.arg("val") == "true");
isOk = true;
}
}
}
if(server.arg("var") == "level"){
if(hapservice){

homekit_characteristic_t * ch= homekit_service_characteristic_by_type(hapservice, HOMEKIT_CHARACTERISTIC_BRIGHTNESS);
if(ch){
if (server.arg("var") == "level") {
if (hapservice) {
homekit_characteristic_t *ch = homekit_service_characteristic_by_type(
hapservice, HOMEKIT_CHARACTERISTIC_BRIGHTNESS);
if (ch) {
set_led_level(String(server.arg("val")).toInt());
isOk=true;
isOk = true;
}
}
}
if( isOk)
if (isOk) {
server.send(200, FPSTR(TEXT_PLAIN), "OK");
else
} else {
server.send(505, FPSTR(TEXT_PLAIN), "WRONG");
}
//can be used for any logic, it will automatically inform Apple about state changes
void set_led(bool val){
Serial.println("set_led");

//we need notify apple about changes
if(hapservice){
Serial.println("notify hap state");
homekit_characteristic_t * ch= homekit_service_characteristic_by_type(hapservice, HOMEKIT_CHARACTERISTIC_ON);
HAP_NOTIFY_CHANGES(bool, ch, val, 0)
}
if(!val){
set_led_level(0);
}
else{
set_led_level(led_level_srored);
}
// can be used for any logic, it will automatically inform Apple about state
// changes
void set_led(bool val) {
Serial.println("set_led");

// we need notify apple about changes
if (hapservice) {
Serial.println("notify hap state");
homekit_characteristic_t *ch = homekit_service_characteristic_by_type(
hapservice, HOMEKIT_CHARACTERISTIC_ON);
HAP_NOTIFY_CHANGES(bool, ch, val, 0)
}

}
void set_led_level(uint8_t val){
Serial.println("set_led_level");
void set_led_level(uint8_t val) {
Serial.println("set_led_level");
#ifdef ESP8266
analogWrite(led_gpio, DIMCALC_VAL(MAP_100_2_255(val), false));
analogWrite(led_gpio, DIMCALC_VAL(MAP_100_TO_255(val), false));
#endif
#ifdef ESP32
ledcWrite(channel, DIMCALC_VAL(MAP_100_2_255(val), false));
ledcWrite(pwm_channel, DIMCALC_VAL(MAP_100_TO_255(val), false));
#endif
if(hapservice){
Serial.println("notify led level:"+String(val));
//getting on/off characteristic
homekit_characteristic_t * ch= homekit_service_characteristic_by_type(hapservice, HOMEKIT_CHARACTERISTIC_BRIGHTNESS);
if (hapservice) {
Serial.println("notify led level:" + String(val));
// getting on/off characteristic
homekit_characteristic_t *ch = homekit_service_characteristic_by_type(
hapservice, HOMEKIT_CHARACTERISTIC_BRIGHTNESS);
HAP_NOTIFY_CHANGES(int, ch, val, 0)
if(val>0)
led_level_srored=val;
}

}
}

void led_callback(homekit_characteristic_t *ch, homekit_value_t value, void *context) {
void led_callback(homekit_characteristic_t *ch, homekit_value_t value,
void *context) {
Serial.println("led_callback");

if(strcmp(ch->type,HOMEKIT_CHARACTERISTIC_ON)==0)
set_led(ch->value.bool_value);
else if(strcmp(ch->type,HOMEKIT_CHARACTERISTIC_BRIGHTNESS)==0)
set_led_level(ch->value.int_value);
else
Serial.println(" unknown charactheristic");



if (strcmp(ch->type, HOMEKIT_CHARACTERISTIC_ON) == 0) {
set_led(ch->value.bool_value);
} else if (strcmp(ch->type, HOMEKIT_CHARACTERISTIC_BRIGHTNESS) == 0) {
set_led_level(ch->value.int_value);
} else {
Serial.println(" unknown characteristic");
}
}
Loading