This is a captive portal example. All requests will " - "be redirected here.
"; - boolean configured=false; + TODO: Eliminate these two lines and replace with a new generic CaptiveAP flag to trackAP mode + ALSO CHANGE HAP[0] to POINTER REFERENCES + + hap[0].cPair=NULL; // reset pointer to verified ID + HAPClient::pairStatus=pairState_M1; // reset starting PAIR STATE (which may be needed if Accessory failed in middle of pair-setup) + + while(!configured){ + + dnsServer.processNextRequest(); + + if(hap[0].client=apServer.available()){ // found a new HTTP client + LOG2("=======================================\n"); + LOG1("** Access Point Client Connected: ("); + LOG1(millis()/1000); + LOG1(" sec) "); + LOG1(hap[0].client.remoteIP()); + LOG1("\n"); + LOG2("\n"); + } + + if(hap[0].client && hap[0].client.available()){ // if connection exists and data is available + + HAPClient::conNum=0; // set connection number + hap[0].processRequest(); // process HAP request + + if(!hap[0].client){ // client disconnected by server + LOG1("** Disconnecting AP Client ("); + LOG1(millis()/1000); + LOG1(" sec)\n"); + } + + LOG2("\n"); + + } // process HAP Client + + } + + while(1); + + while(!configured){ dnsServer.processNextRequest(); WiFiClient apClient=apServer.available(); diff --git a/src/HomeSpan.h b/src/HomeSpan.h index 005f662..16ae87a 100644 --- a/src/HomeSpan.h +++ b/src/HomeSpan.h @@ -64,7 +64,7 @@ struct Span{ void begin(Category catID, char *displayName="HomeSpan Server", - char *hostNameBase="homespan", + char *hostNameBase="HomeSpan", char *modelName="HS-ESP32"); void poll(); // poll HAP Clients and process any new HAP requests diff --git a/src/Settings.h b/src/Settings.h index 98550b1..e224953 100644 --- a/src/Settings.h +++ b/src/Settings.h @@ -18,7 +18,7 @@ const int MAX_CONNECTIONS=8; // Verbosity -- controls message output // // 0=Minimal, 1=Informative, 2=All // -#define VERBOSITY 1 +#define VERBOSITY 2 //-------------------------------------------------// diff --git a/src/src.ino b/src/src.ino index 3ac41a3..79ceba5 100644 --- a/src/src.ino +++ b/src/src.ino @@ -1,6 +1,39 @@ -// This is a dummy .ino file that allows you to easily edit the contents of this library using the Arduino IDE. -// The code is NOT designed to be compiled from this point. Compile and test the library using one of the examples. +// This is a placeholder .ino file that allows you to easily edit the contents of this library using the Arduino IDE, +// as well as compile and test from this point. This file is ignored when the library is included in other sketchges. -void setup(){} -void loop(){} +#include "HomeSpan.h" + +void setup() { + + Serial.begin(115200); + + homeSpan.begin(Category::Lighting,"HomeSpan Benchmark"); + + char *version=(char *)HOMESPAN_VERSION; + + new SpanAccessory(); // Begin by creating a new Accessory using SpanAccessory(), which takes no arguments + + new Service::AccessoryInformation(); // HAP requires every Accessory to implement an AccessoryInformation Service, which has 6 required Characteristics + new Characteristic::Name("HomeSpan Test"); // Name of the Accessory, which shows up on the HomeKit "tiles", and should be unique across Accessories + new Characteristic::Manufacturer("HomeSpan"); // Manufacturer of the Accessory (arbitrary text string, and can be the same for every Accessory) + new Characteristic::SerialNumber("HSL-123"); // Serial Number of the Accessory (arbitrary text string, and can be the same for every Accessory) + new Characteristic::Model("HSL Test"); // Model of the Accessory (arbitrary text string, and can be the same for every Accessory) + new Characteristic::FirmwareRevision(version); // Firmware of the Accessory (arbitrary text string, and can be the same for every Accessory) + new Characteristic::Identify(); // Create the required Identify + + new Service::HAPProtocolInformation(); // Create the HAP Protcol Information Service + new Characteristic::Version("1.1.0"); // Set the Version Characteristicto "1.1.0" as required by HAP + + new Service::LightBulb(); // Create the Light Bulb Service + new Characteristic::On(); // This Service requires the "On" Characterstic to turn the light on and off + +} // end of setup() + +////////////////////////////////////// + +void loop(){ + + homeSpan.poll(); + +} // end of loop()