AP IP configurable

factory_settings.ini

@@ -5,10 +5,13 @@ build_flags =
     -D FACTORY_WIFI_PASSWORD=\"\"
     -D FACTORY_WIFI_HOSTNAME=\"ems-esp\"
 
-    ; Access point settings
-    -D FACTORY_AP_SSID=\"ems-esp\"
-    -D FACTORY_AP_PASSWORD=\"ems-esp-neo\"
+	; Access point settings
     -D FACTORY_AP_PROVISION_MODE=AP_MODE_DISCONNECTED
+    -D FACTORY_AP_SSID=\"ems-esp\" ; 1-64 characters
+    -D FACTORY_AP_PASSWORD=\"ems-esp-neo\" ; 8-64 characters
+    -D FACTORY_AP_LOCAL_IP=\"192.168.4.1\"
+    -D FACTORY_AP_GATEWAY_IP=\"192.168.4.1\"
+    -D FACTORY_AP_SUBNET_MASK=\"255.255.255.0\"
 
     ; User credentials for admin and guest user
     -D FACTORY_ADMIN_USERNAME=\"admin\"

interface/src/ap/APSettingsForm.tsx

@@ -4,15 +4,20 @@ import { TextValidator, ValidatorForm, SelectValidator } from 'react-material-ui
 import MenuItem from '@material-ui/core/MenuItem';
 import SaveIcon from '@material-ui/icons/Save';
 
-import {PasswordValidator, RestFormProps, FormActions, FormButton} from '../components';
+import { PasswordValidator, RestFormProps, FormActions, FormButton } from '../components';
 
 import { isAPEnabled } from './APModes';
 import { APSettings, APProvisionMode } from './types';
+import { isIP } from '../validators';
 
 type APSettingsFormProps = RestFormProps<APSettings>;
 
 class APSettingsForm extends React.Component<APSettingsFormProps> {
 
+  componentWillMount() {
+    ValidatorForm.addValidationRule('isIP', isIP);
+  }
+
   render() {
     const { data, handleValueChange, saveData, loadData } = this.props;
     return (
@@ -53,6 +58,39 @@ class APSettingsForm extends React.Component<APSettingsFormProps> {
               onChange={handleValueChange('password')}
               margin="normal"
             />
+            <TextValidator
+              validators={['required', 'isIP']}
+              errorMessages={['Local IP is required', 'Must be an IP address']}
+              name="local_ip"
+              label="Local IP"
+              fullWidth
+              variant="outlined"
+              value={data.local_ip}
+              onChange={handleValueChange('local_ip')}
+              margin="normal"
+            />
+            <TextValidator
+              validators={['required', 'isIP']}
+              errorMessages={['Gateway IP is required', 'Must be an IP address']}
+              name="gateway_ip"
+              label="Gateway"
+              fullWidth
+              variant="outlined"
+              value={data.gateway_ip}
+              onChange={handleValueChange('gateway_ip')}
+              margin="normal"
+            />
+            <TextValidator
+              validators={['required', 'isIP']}
+              errorMessages={['Subnet mask is required', 'Must be an IP address']}
+              name="subnet_mask"
+              label="Subnet"
+              fullWidth
+              variant="outlined"
+              value={data.subnet_mask}
+              onChange={handleValueChange('subnet_mask')}
+              margin="normal"
+            />
           </Fragment>
         }
         <FormActions>

lib/framework/APSettingsService.cpp

@@ -45,10 +45,7 @@ void APSettingsService::manageAP() {
 
 void APSettingsService::startAP() {
   // Serial.println(F("Starting software access point"));
-  IPAddress localIP(192, 168, 4, 1);
-  IPAddress gateway(192, 168, 4, 1);
-  IPAddress subnet(255, 255, 255, 0);
-  WiFi.softAPConfig(localIP, gateway, subnet);
+  WiFi.softAPConfig(_state.localIP, _state.gatewayIP, _state.subnetMask);
   WiFi.softAP(_state.ssid.c_str(), _state.password.c_str());
   if (!_dnsServer) {
     IPAddress apIp = WiFi.softAPIP();

lib/framework/APSettingsService.h

@@ -3,6 +3,7 @@
 
 #include <HttpEndpoint.h>
 #include <FSPersistence.h>
+#include <JsonUtils.h>
 
 #include <DNSServer.h>
 #include <IPAddress.h>
@@ -15,6 +16,10 @@
 
 #define DNS_PORT 53
 
+#ifndef FACTORY_AP_PROVISION_MODE
+#define FACTORY_AP_PROVISION_MODE AP_MODE_DISCONNECTED
+#endif
+
 #ifndef FACTORY_AP_SSID
 #define FACTORY_AP_SSID "ESP8266-React"
 #endif
@@ -23,29 +28,44 @@
 #define FACTORY_AP_PASSWORD "esp-react"
 #endif
 
-#ifndef FACTORY_AP_PROVISION_MODE
-#define FACTORY_AP_PROVISION_MODE AP_MODE_DISCONNECTED
+#ifndef FACTORY_AP_LOCAL_IP
+#define FACTORY_AP_LOCAL_IP "192.168.4.1"
+#endif
+
+#ifndef FACTORY_AP_GATEWAY_IP
+#define FACTORY_AP_GATEWAY_IP "192.168.4.1"
+#endif
+
+#ifndef FACTORY_AP_SUBNET_MASK
+#define FACTORY_AP_SUBNET_MASK "255.255.255.0"
 #endif
 
 #define AP_SETTINGS_FILE "/config/apSettings.json"
 #define AP_SETTINGS_SERVICE_PATH "/rest/apSettings"
 
-enum APNetworkStatus {
-  ACTIVE = 0,
-  INACTIVE,
-  LINGERING
-};
+enum APNetworkStatus { ACTIVE = 0, INACTIVE, LINGERING };
 
 class APSettings {
  public:
   uint8_t provisionMode;
   String ssid;
   String password;
+  IPAddress localIP;
+  IPAddress gatewayIP;
+  IPAddress subnetMask;
+
+  bool operator==(const APSettings& settings) const {
+    return provisionMode == settings.provisionMode && ssid == settings.ssid && password == settings.password &&
+           localIP == settings.localIP && gatewayIP == settings.gatewayIP && subnetMask == settings.subnetMask;
+  }
 
   static void read(APSettings& settings, JsonObject& root) {
     root["provision_mode"] = settings.provisionMode;
     root["ssid"] = settings.ssid;
     root["password"] = settings.password;
+    root["local_ip"] = settings.localIP.toString();
+    root["gateway_ip"] = settings.gatewayIP.toString();
+    root["subnet_mask"] = settings.subnetMask.toString();
   }
 
   static StateUpdateResult update(JsonObject& root, APSettings& settings) {
@@ -61,8 +81,12 @@ class APSettings {
     }
     newSettings.ssid = root["ssid"] | FACTORY_AP_SSID;
     newSettings.password = root["password"] | FACTORY_AP_PASSWORD;
-    if (newSettings.provisionMode == settings.provisionMode && newSettings.ssid.equals(settings.ssid) &&
-        newSettings.password.equals(settings.password)) {
+
+    JsonUtils::readIP(root, "local_ip", newSettings.localIP, FACTORY_AP_LOCAL_IP);
+    JsonUtils::readIP(root, "gateway_ip", newSettings.gatewayIP, FACTORY_AP_GATEWAY_IP);
+    JsonUtils::readIP(root, "subnet_mask", newSettings.subnetMask, FACTORY_AP_SUBNET_MASK);
+
+    if (newSettings == settings) {
       return StateUpdateResult::UNCHANGED;
     }
     settings = newSettings;

lib/framework/JsonUtils.h

@@ -7,9 +7,16 @@
 
 class JsonUtils {
  public:
-  static void readIP(JsonObject& root, const String& key,  IPAddress& ip) {
+  static void readIP(JsonObject& root, const String& key, IPAddress& ip, const String& def) {
+    IPAddress defaultIp = {};
+    if (!defaultIp.fromString(def)) {
+      defaultIp = INADDR_NONE;
+    }
+    readIP(root, key, ip, defaultIp);
+  }
+  static void readIP(JsonObject& root, const String& key, IPAddress& ip, const IPAddress& defaultIp = INADDR_NONE) {
     if (!root[key].is<String>() || !ip.fromString(root[key].as<String>())) {
-      ip = INADDR_NONE;
+      ip = defaultIp;
     }
   }
   static void writeIP(JsonObject& root, const String& key, const IPAddress& ip) {