[web]rewrite HTTP_SetSettings

config/board_bt6703.h

@@ -89,41 +89,41 @@ XSETTING( char, our_srv_crt[1705], SETTINGS_SetSSLcrtDef, PART_DEFAULT_1 ) \
 #define MAX_IRQ_HANDLERS 4
 
 #define WEB_SETTINGS_TAGS_TABLE \
-  XJSON_SETTINGS_TAG("read_community",     GetReadCommunity) \
-  XJSON_SETTINGS_TAG("write_community",    GetWriteCommunity) \
-  XJSON_SETTINGS_TAG("managerIP",          GetManagerIp) \
-  XJSON_SETTINGS_TAG("managerIP2",         GetManagerIp2) \
-  XJSON_SETTINGS_TAG("managerIP3",         GetManagerIp3) \
-  XJSON_SETTINGS_TAG("managerIP4",         GetManagerIp4) \
-  XJSON_SETTINGS_TAG("managerIP5",         GetManagerIp5) \
-  XJSON_SETTINGS_TAG("di1",                GetDIN1TypeActStr) \
-  XJSON_SETTINGS_TAG("ro1",                GetRO0TypeActStr) \
-  XJSON_SETTINGS_TAG("ro2",                GetRO1TypeActStr) \
-  XJSON_SETTINGS_TAG("ipaddr",             GetIpStr) \
-  XJSON_SETTINGS_TAG("gw",                 GetGatewayStr) \
-  XJSON_SETTINGS_TAG("mask",               GetMaskStr) \
-  XJSON_SETTINGS_TAG("dhcp",               GetDhcpStateStr) \
-  XJSON_SETTINGS_TAG("swauth",             GetAuthEnableStateStr) \
-  XJSON_SETTINGS_TAG("rs_server",          GetRDSIpStr) \
-  XJSON_SETTINGS_TAG("rs_port",            GetRDSPortStr) \
-  XJSON_SETTINGS_TAG("rs_pwd",             GetRDSPasswordkStr) \
-  XJSON_SETTINGS_TAG("rs_key",             GetRDSKeyAccesstStr) \
-  XJSON_SETTINGS_TAG("rs_enabled",         GetRDSEnableStateStr) \
-  XJSON_SETTINGS_TAG("date",               GetDateStr) \
-  XJSON_SETTINGS_TAG("time",               GetTimeStr) \
-  XJSON_SETTINGS_TAG("ntp",                GetSntpStateStr) \
-  XJSON_SETTINGS_TAG("ntpservip",          GetSntpServerIpStr) \
-  XJSON_SETTINGS_TAG("utc",                GetSntpTimeZoneStr) \
-  XJSON_SETTINGS_TAG("utm",                GetUnixTimeStr) \
-  XJSON_SETTINGS_TAG("lastsynctime",       GetSntpLastDataStr) \
-  XJSON_SETTINGS_TAG("ups_cell_min",       GetUPSVoltCellMinStr) \
-  XJSON_SETTINGS_TAG("ups_cell_max",       GetUPSVoltCellMaxStr) \
-  XJSON_SETTINGS_TAG("temp_high",          GetTemperatureAlarmHighRangeStr) \
-  XJSON_SETTINGS_TAG("temp_low",           GetTemperatureAlarmLowRangeStr) \
-  XJSON_SETTINGS_TAG("temp_hist",          GetTemperatureAlarmHisteStr) \
-  XJSON_SETTINGS_TAG("loadvolt_high",      GetLoadAlarmHighRangeStr) \
-  XJSON_SETTINGS_TAG("loadvolt_hist",      GetLoadAlarmHisteStr) \
-  XJSON_SETTINGS_TAG("netsettings_changed",GetWebReinitFlag) \
+  XJSON_SETTINGS_TAG("read_community",     GetReadCommunity,                        SetReadCommunity) \
+  XJSON_SETTINGS_TAG("write_community",    GetWriteCommunity,                       SetWriteCommunity) \
+  XJSON_SETTINGS_TAG("managerIP",          GetManagerIp,                            SetManagerIp) \
+  XJSON_SETTINGS_TAG("managerIP2",         GetManagerIp2,                           SetManagerIp2) \
+  XJSON_SETTINGS_TAG("managerIP3",         GetManagerIp3,                           SetManagerIp3) \
+  XJSON_SETTINGS_TAG("managerIP4",         GetManagerIp4,                           SetManagerIp4) \
+  XJSON_SETTINGS_TAG("managerIP5",         GetManagerIp5,                           SetManagerIp5) \
+  XJSON_SETTINGS_TAG("di1",                GetDIN1TypeActStr,                       SetDIN1TypeActStr) \
+  XJSON_SETTINGS_TAG("ro1",                GetRO0TypeActStr,                        SetRO1TypeActStr) \
+  XJSON_SETTINGS_TAG("ro2",                GetRO1TypeActStr,                        SetRO2TypeActStr) \
+  XJSON_SETTINGS_TAG("ipaddr",             GetIpStr,                                SetIPStr) \
+  XJSON_SETTINGS_TAG("gw",                 GetGatewayStr,                           SetGatewayStr) \
+  XJSON_SETTINGS_TAG("mask",               GetMaskStr,                              SetMaskStr) \
+  XJSON_SETTINGS_TAG("dhcp",               GetDhcpStateStr,                         SetDhcpStateStr) \
+  XJSON_SETTINGS_TAG("swauth",             GetAuthEnableStateStr,                   SetAuthEnableStateStr) \
+  XJSON_SETTINGS_TAG("rs_server",          GetRDSIpStr,                             SetRDSIpStr) \
+  XJSON_SETTINGS_TAG("rs_port",            GetRDSPortStr,                           SetRDSPortStr) \
+  XJSON_SETTINGS_TAG("rs_pwd",             GetRDSPasswordkStr,                      SetRDSPasswordkStr) \
+  XJSON_SETTINGS_TAG("rs_key",             GetRDSKeyAccesstStr,                     SetRDSKeyAccesstStr) \
+  XJSON_SETTINGS_TAG("rs_enabled",         GetRDSEnableStateStr,                    SetRDSEnableStateStr) \
+  XJSON_SETTINGS_TAG("date",               GetDateStr,                              SetDateStr) \
+  XJSON_SETTINGS_TAG("time",               GetTimeStr,                              SetTimeWebStr) \
+  XJSON_SETTINGS_TAG("ntp",                GetSntpStateStr,                         SetSntpStateStr) \
+  XJSON_SETTINGS_TAG("ntpservip",          GetSntpServerIpStr,                      SetSntpServerIpStr) \
+  XJSON_SETTINGS_TAG("utc",                GetSntpTimeZoneStr,                      SetSntpTimeZoneStr) \
+  XJSON_SETTINGS_TAG("utm",                GetUnixTimeStr,                          SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("lastsynctime",       GetSntpLastDataStr,                      SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("ups_cell_min",       GetUPSVoltCellMinStr,                    SetUPSVoltCellMinStr) \
+  XJSON_SETTINGS_TAG("ups_cell_max",       GetUPSVoltCellMaxStr,                    SetUPSVoltCellMaxStr) \
+  XJSON_SETTINGS_TAG("temp_high",          GetTemperatureAlarmHighRangeStr,         SetTemperatureAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("temp_low",           GetTemperatureAlarmLowRangeStr,          SetTemperatureAlarmLowRangeStr) \
+  XJSON_SETTINGS_TAG("temp_hist",          GetTemperatureAlarmHisteStr,             SetTemperatureAlarmHisteStr) \
+  XJSON_SETTINGS_TAG("loadvolt_high",      GetLoadAlarmHighRangeStr,                SetLoadAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("loadvolt_hist",      GetLoadAlarmHisteStr,                    SetLoadAlarmHistStr) \
+  XJSON_SETTINGS_TAG("netsettings_changed",GetWebReinitFlag,                        SetEmptyFuncStr) \
 
   #define WEB_PARAMS_TAGS_TABLE \
   XJSON_PARAMS_TAG("AC",                 GetInputVoltageStr) \

config/board_bt6707.h

@@ -99,41 +99,41 @@ XSETTING( TELNET_t, sTelnet, SETTINGS_SetTelnetDef, PART_DEFAULT_1 ) \
 #define MAX_IRQ_HANDLERS 4
 
 #define WEB_SETTINGS_TAGS_TABLE \
-  XJSON_SETTINGS_TAG("read_community",     GetReadCommunity) \
-  XJSON_SETTINGS_TAG("write_community",    GetWriteCommunity) \
-  XJSON_SETTINGS_TAG("managerIP",          GetManagerIp) \
-  XJSON_SETTINGS_TAG("managerIP2",         GetManagerIp2) \
-  XJSON_SETTINGS_TAG("managerIP3",         GetManagerIp3) \
-  XJSON_SETTINGS_TAG("managerIP4",         GetManagerIp4) \
-  XJSON_SETTINGS_TAG("managerIP5",         GetManagerIp5) \
-  XJSON_SETTINGS_TAG("di1",                GetDIN1TypeActStr) \
-  XJSON_SETTINGS_TAG("ro1",                GetRO0TypeActStr) \
-  XJSON_SETTINGS_TAG("ro2",                GetRO1TypeActStr) \
-  XJSON_SETTINGS_TAG("ro3",                GetRO2TypeActStr) \
-  XJSON_SETTINGS_TAG("ipaddr",             GetIpStr) \
-  XJSON_SETTINGS_TAG("gw",                 GetGatewayStr) \
-  XJSON_SETTINGS_TAG("mask",               GetMaskStr) \
-  XJSON_SETTINGS_TAG("dhcp",               GetDhcpStateStr) \
-  XJSON_SETTINGS_TAG("tn_port",            GetTelnetPortStr) \
-  XJSON_SETTINGS_TAG("tn_enabled",         GetTelnetEnableStateStr) \
-  XJSON_SETTINGS_TAG("date",               GetDateStr) \
-  XJSON_SETTINGS_TAG("time",               GetTimeStr) \
-  XJSON_SETTINGS_TAG("ntp",                GetSntpStateStr) \
-  XJSON_SETTINGS_TAG("ntpservip",          GetSntpServerIpStr) \
-  XJSON_SETTINGS_TAG("utc",                GetSntpTimeZoneStr) \
-  XJSON_SETTINGS_TAG("utm",                GetUnixTimeStr) \
-  XJSON_SETTINGS_TAG("lastsynctime",       GetSntpLastDataStr) \
-  XJSON_SETTINGS_TAG("ups_cell_min",       GetUPSVoltCellMinStr) \
-  XJSON_SETTINGS_TAG("ups_cell_max",       GetUPSVoltCellMaxStr) \
-  XJSON_SETTINGS_TAG("mainvolt_high",      GetVACAlarmHighRangeStr) \
-  XJSON_SETTINGS_TAG("mainvolt_low",       GetVACAlarmLowRangeStr) \
-  XJSON_SETTINGS_TAG("mainvolt_hist",      GetVACAlarmHisteStr) \
-  XJSON_SETTINGS_TAG("temp_high",          GetTemperatureAlarmHighRangeStr) \
-  XJSON_SETTINGS_TAG("temp_low",           GetTemperatureAlarmLowRangeStr) \
-  XJSON_SETTINGS_TAG("temp_hist",          GetTemperatureAlarmHisteStr) \
-  XJSON_SETTINGS_TAG("loadvolt_high",      GetLoadAlarmHighRangeStr) \
-  XJSON_SETTINGS_TAG("loadvolt_hist",      GetLoadAlarmHisteStr) \
-  XJSON_SETTINGS_TAG("netsettings_changed",GetWebReinitFlag) \
+  XJSON_SETTINGS_TAG("read_community",     GetReadCommunity,                          SetReadCommunity) \
+  XJSON_SETTINGS_TAG("write_community",    GetWriteCommunity,                         SetWriteCommunity) \
+  XJSON_SETTINGS_TAG("managerIP",          GetManagerIp,                              SetManagerIp) \
+  XJSON_SETTINGS_TAG("managerIP2",         GetManagerIp2,                             SetManagerIp2) \
+  XJSON_SETTINGS_TAG("managerIP3",         GetManagerIp3,                             SetManagerIp3) \
+  XJSON_SETTINGS_TAG("managerIP4",         GetManagerIp4,                             SetManagerIp4) \
+  XJSON_SETTINGS_TAG("managerIP5",         GetManagerIp5,                             SetManagerIp5) \
+  XJSON_SETTINGS_TAG("di1",                GetDIN1TypeActStr,                         SetDIN1TypeActStr) \
+  XJSON_SETTINGS_TAG("ro1",                GetRO0TypeActStr,                          SetRO1TypeActStr) \
+  XJSON_SETTINGS_TAG("ro2",                GetRO1TypeActStr,                          SetRO2TypeActStr) \
+  XJSON_SETTINGS_TAG("ro3",                GetRO2TypeActStr,                          SetRO3TypeActStr) \
+  XJSON_SETTINGS_TAG("ipaddr",             GetIpStr,                                  SetIPStr) \
+  XJSON_SETTINGS_TAG("gw",                 GetGatewayStr,                             SetGatewayStr) \
+  XJSON_SETTINGS_TAG("mask",               GetMaskStr,                                SetMaskStr) \
+  XJSON_SETTINGS_TAG("dhcp",               GetDhcpStateStr,                           SetDhcpStateStr) \
+  XJSON_SETTINGS_TAG("tn_port",            GetTelnetPortStr,                          SetTelnetPortStr) \
+  XJSON_SETTINGS_TAG("tn_enabled",         GetTelnetEnableStateStr,                   SetTelnetEnableStateStr) \
+  XJSON_SETTINGS_TAG("date",               GetDateStr,                                SetDateStr) \
+  XJSON_SETTINGS_TAG("time",               GetTimeStr,                                SetTimeWebStr) \
+  XJSON_SETTINGS_TAG("ntp",                GetSntpStateStr,                           SetSntpStateStr) \
+  XJSON_SETTINGS_TAG("ntpservip",          GetSntpServerIpStr,                        SetSntpServerIpStr) \
+  XJSON_SETTINGS_TAG("utc",                GetSntpTimeZoneStr,                        SetSntpTimeZoneStr) \
+  XJSON_SETTINGS_TAG("utm",                GetUnixTimeStr,                            SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("lastsynctime",       GetSntpLastDataStr,                        SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("ups_cell_min",       GetUPSVoltCellMinStr,                      SetUPSVoltCellMinStr) \
+  XJSON_SETTINGS_TAG("ups_cell_max",       GetUPSVoltCellMaxStr,                      SetUPSVoltCellMaxStr) \
+  XJSON_SETTINGS_TAG("mainvolt_high",      GetVACAlarmHighRangeStr,                   SetVACAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("mainvolt_low",       GetVACAlarmLowRangeStr,                    SetVACAlarmLowRangeStr) \
+  XJSON_SETTINGS_TAG("mainvolt_hist",      GetVACAlarmHisteStr,                       SetVACAlarmHisteStr) \
+  XJSON_SETTINGS_TAG("temp_high",          GetTemperatureAlarmHighRangeStr,           SetTemperatureAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("temp_low",           GetTemperatureAlarmLowRangeStr,            SetTemperatureAlarmLowRangeStr) \
+  XJSON_SETTINGS_TAG("temp_hist",          GetTemperatureAlarmHisteStr,               SetTemperatureAlarmHisteStr) \
+  XJSON_SETTINGS_TAG("loadvolt_high",      GetLoadAlarmHighRangeStr,                  SetLoadAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("loadvolt_hist",      GetLoadAlarmHisteStr,                      SetLoadAlarmHistStr) \
+  XJSON_SETTINGS_TAG("netsettings_changed",GetWebReinitFlag,                          SetEmptyFuncStr) \
 
 #define WEB_PARAMS_TAGS_TABLE \
   XJSON_PARAMS_TAG("AC",                 GetInputVoltageStr) \

config/board_bt6709.h

@@ -84,49 +84,49 @@ XSETTING( uint8_t, sFlagNotification[ALL_TRAPS], SETTINGS_SetFlagNotificationDef
 #define MAX_IRQ_HANDLERS 4
 
 #define WEB_SETTINGS_TAGS_TABLE \
-  XJSON_SETTINGS_TAG("read_community",     GetReadCommunity) \
-  XJSON_SETTINGS_TAG("write_community",    GetWriteCommunity) \
-  XJSON_SETTINGS_TAG("managerIP",          GetManagerIp) \
-  XJSON_SETTINGS_TAG("managerIP2",         GetManagerIp2) \
-  XJSON_SETTINGS_TAG("managerIP3",         GetManagerIp3) \
-  XJSON_SETTINGS_TAG("managerIP4",         GetManagerIp4) \
-  XJSON_SETTINGS_TAG("managerIP5",         GetManagerIp5) \
-  XJSON_SETTINGS_TAG("ipaddr",             GetIpStr) \
-  XJSON_SETTINGS_TAG("gw",                 GetGatewayStr) \
-  XJSON_SETTINGS_TAG("mask",               GetMaskStr) \
-  XJSON_SETTINGS_TAG("dhcp",               GetDhcpStateStr) \
-  XJSON_SETTINGS_TAG("tn_port",            GetTelnetPortStr) \
-  XJSON_SETTINGS_TAG("tn_enabled",         GetTelnetEnableStateStr) \
-  XJSON_SETTINGS_TAG("ssh_port",           GetSSHPortStr) \
-  XJSON_SETTINGS_TAG("ssh_enabled",        GetSSHEnableStateStr) \
-  XJSON_SETTINGS_TAG("wtl_ip1",            GetWhiteList1STR) \
-  XJSON_SETTINGS_TAG("wtl_ip2",            GetWhiteList2STR) \
-  XJSON_SETTINGS_TAG("wtl_ip3",            GetWhiteList3STR) \
-  XJSON_SETTINGS_TAG("wtl_ip4",            GetWhiteList4STR) \
-  XJSON_SETTINGS_TAG("wtl_ip5",            GetWhiteList5STR) \
-  XJSON_SETTINGS_TAG("date",               GetDateStr) \
-  XJSON_SETTINGS_TAG("time",               GetTimeStr) \
-  XJSON_SETTINGS_TAG("ntp",                GetSntpStateStr) \
-  XJSON_SETTINGS_TAG("ntpservip",          GetSntpServerIpStr) \
-  XJSON_SETTINGS_TAG("utc",                GetSntpTimeZoneStr) \
-  XJSON_SETTINGS_TAG("utm",                GetUnixTimeStr) \
-  XJSON_SETTINGS_TAG("lastsynctime",       GetSntpLastDataStr) \
-  XJSON_SETTINGS_TAG("ups_cell_min",       GetUPSVoltCellMinStr) \
-  XJSON_SETTINGS_TAG("ups_cell_max",       GetUPSVoltCellMaxStr) \
-  XJSON_SETTINGS_TAG("bat_prod",           GetDataSetAKBStr) \
-  XJSON_SETTINGS_TAG("bat_exp",            GetLifeTimeAKBStr) \
-  XJSON_SETTINGS_TAG("bat_cap",            GetCapacityNominalAKBStr) \
-  XJSON_SETTINGS_TAG("bat_charge",         GetVoltageAKBNominalStr) \
-  XJSON_SETTINGS_TAG("ups_max_power",      GetUPSPowerStr) \
-  XJSON_SETTINGS_TAG("mainvolt_high",      GetVACAlarmHighRangeStr) \
-  XJSON_SETTINGS_TAG("mainvolt_low",       GetVACAlarmLowRangeStr) \
-  XJSON_SETTINGS_TAG("mainvolt_hist",      GetVACAlarmHisteStr) \
-  XJSON_SETTINGS_TAG("temp_high",          GetTemperatureAlarmHighRangeStr) \
-  XJSON_SETTINGS_TAG("temp_low",           GetTemperatureAlarmLowRangeStr) \
-  XJSON_SETTINGS_TAG("temp_hist",          GetTemperatureAlarmHisteStr) \
-  XJSON_SETTINGS_TAG("loadvolt_high",      GetLoadAlarmHighRangeStr) \
-  XJSON_SETTINGS_TAG("loadvolt_hist",      GetLoadAlarmHisteStr) \
-  XJSON_SETTINGS_TAG("netsettings_changed",GetWebReinitFlag) \
+  XJSON_SETTINGS_TAG("read_community",     GetReadCommunity,                    SetReadCommunity) \
+  XJSON_SETTINGS_TAG("write_community",    GetWriteCommunity,                   SetWriteCommunity) \
+  XJSON_SETTINGS_TAG("managerIP",          GetManagerIp,                        SetManagerIp) \
+  XJSON_SETTINGS_TAG("managerIP2",         GetManagerIp2,                       SetManagerIp2) \
+  XJSON_SETTINGS_TAG("managerIP3",         GetManagerIp3,                       SetManagerIp3) \
+  XJSON_SETTINGS_TAG("managerIP4",         GetManagerIp4,                       SetManagerIp4) \
+  XJSON_SETTINGS_TAG("managerIP5",         GetManagerIp5,                       SetManagerIp5) \
+  XJSON_SETTINGS_TAG("ipaddr",             GetIpStr,                            SetIPStr) \
+  XJSON_SETTINGS_TAG("gw",                 GetGatewayStr,                       SetGatewayStr) \
+  XJSON_SETTINGS_TAG("mask",               GetMaskStr,                          SetMaskStr) \
+  XJSON_SETTINGS_TAG("dhcp",               GetDhcpStateStr,                     SetDhcpStateStr) \
+  XJSON_SETTINGS_TAG("tn_port",            GetTelnetPortStr,                    SetTelnetPortStr) \
+  XJSON_SETTINGS_TAG("tn_enabled",         GetTelnetEnableStateStr,             SetTelnetEnableStateStr) \
+  XJSON_SETTINGS_TAG("ssh_port",           GetSSHPortStr,                       SetSSHPortStr) \
+  XJSON_SETTINGS_TAG("ssh_enabled",        GetSSHEnableStateStr,                SetSSHEnableStateStr) \
+  XJSON_SETTINGS_TAG("wtl_ip1",            GetWhiteList1STR,                    SetWhiteList1STR) \
+  XJSON_SETTINGS_TAG("wtl_ip2",            GetWhiteList2STR,                    SetWhiteList2STR) \
+  XJSON_SETTINGS_TAG("wtl_ip3",            GetWhiteList3STR,                    SetWhiteList3STR) \
+  XJSON_SETTINGS_TAG("wtl_ip4",            GetWhiteList4STR,                    SetWhiteList4STR) \
+  XJSON_SETTINGS_TAG("wtl_ip5",            GetWhiteList5STR,                    SetWhiteList5STR) \
+  XJSON_SETTINGS_TAG("date",               GetDateStr,                          SetDateStr) \
+  XJSON_SETTINGS_TAG("time",               GetTimeStr,                          SetTimeWebStr) \
+  XJSON_SETTINGS_TAG("ntp",                GetSntpStateStr,                     SetSntpStateStr) \
+  XJSON_SETTINGS_TAG("ntpservip",          GetSntpServerIpStr,                  SetSntpServerIpStr) \
+  XJSON_SETTINGS_TAG("utc",                GetSntpTimeZoneStr,                  SetSntpTimeZoneStr) \
+  XJSON_SETTINGS_TAG("utm",                GetUnixTimeStr,                      SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("lastsynctime",       GetSntpLastDataStr,                  SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("ups_cell_min",       GetUPSVoltCellMinStr,                SetUPSVoltCellMinStr) \
+  XJSON_SETTINGS_TAG("ups_cell_max",       GetUPSVoltCellMaxStr,                SetUPSVoltCellMaxStr) \
+  XJSON_SETTINGS_TAG("bat_prod",           GetDataSetAKBStr,                    SetDataSetAKBStr) \
+  XJSON_SETTINGS_TAG("bat_exp",            GetLifeTimeAKBStr,                   SetLifeTimeAKBStr) \
+  XJSON_SETTINGS_TAG("bat_cap",            GetCapacityNominalAKBStr,            SetCapacityNominalAKBStr) \
+  XJSON_SETTINGS_TAG("bat_charge",         GetVoltageAKBNominalStr,             SetVoltageAKBNominalStr) \
+  XJSON_SETTINGS_TAG("ups_max_power",      GetUPSPowerStr,                      SetUPSPowerStr) \
+  XJSON_SETTINGS_TAG("mainvolt_high",      GetVACAlarmHighRangeStr,             SetVACAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("mainvolt_low",       GetVACAlarmLowRangeStr,              SetVACAlarmLowRangeStr) \
+  XJSON_SETTINGS_TAG("mainvolt_hist",      GetVACAlarmHisteStr,                 SetVACAlarmHisteStr) \
+  XJSON_SETTINGS_TAG("temp_high",          GetTemperatureAlarmHighRangeStr,     SetTemperatureAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("temp_low",           GetTemperatureAlarmLowRangeStr,      SetTemperatureAlarmLowRangeStr) \
+  XJSON_SETTINGS_TAG("temp_hist",          GetTemperatureAlarmHisteStr,         SetTemperatureAlarmHisteStr) \
+  XJSON_SETTINGS_TAG("loadvolt_high",      GetLoadAlarmHighRangeStr,            SetLoadAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("loadvolt_hist",      GetLoadAlarmHisteStr,                SetLoadAlarmHistStr) \
+  XJSON_SETTINGS_TAG("netsettings_changed",GetWebReinitFlag,                    SetEmptyFuncStr) \
 
 #define WEB_PARAMS_TAGS_TABLE \
   XJSON_PARAMS_TAG("AC",                 GetInputVoltageStr) \

config/board_bt6710.h

@@ -97,38 +97,38 @@ XSETTING( ALARM_MNGR_t, sAlarmManager, SETTINGS_SetAlarmManagerDef, ALL_DEFAULT
 #define MAX_IRQ_HANDLERS 4
 
 #define WEB_SETTINGS_TAGS_TABLE \
-  XJSON_SETTINGS_TAG("read_community",     GetReadCommunity) \
-  XJSON_SETTINGS_TAG("write_community",    GetWriteCommunity) \
-  XJSON_SETTINGS_TAG("managerIP",          GetManagerIp) \
-  XJSON_SETTINGS_TAG("managerIP2",         GetManagerIp2) \
-  XJSON_SETTINGS_TAG("managerIP3",         GetManagerIp3) \
-  XJSON_SETTINGS_TAG("managerIP4",         GetManagerIp4) \
-  XJSON_SETTINGS_TAG("managerIP5",         GetManagerIp5) \
-  XJSON_SETTINGS_TAG("di1",                GetDINTypeActStr) \
-  XJSON_SETTINGS_TAG("ro1",                GetROTypeActStr) \
-  XJSON_SETTINGS_TAG("ro2",                GetROTypeActStr) \
-  XJSON_SETTINGS_TAG("ipaddr",             GetIpStr) \
-  XJSON_SETTINGS_TAG("gw",                 GetGatewayStr) \
-  XJSON_SETTINGS_TAG("mask",               GetMaskStr) \
-  XJSON_SETTINGS_TAG("dhcp",               GetDhcpStateStr) \
-  XJSON_SETTINGS_TAG("date",               GetDateStr) \
-  XJSON_SETTINGS_TAG("time",               GetTimeStr) \
-  XJSON_SETTINGS_TAG("ntp",                GetSntpStateStr) \
-  XJSON_SETTINGS_TAG("ntpservip",          GetSntpServerIpStr) \
-  XJSON_SETTINGS_TAG("utc",                GetSntpTimeZoneStr) \
-  XJSON_SETTINGS_TAG("utm",                GetUnixTimeStr) \
-  XJSON_SETTINGS_TAG("lastsynctime",       GetSntpLastDataStr) \
-  XJSON_SETTINGS_TAG("ups_cell_min",       GetUPSVoltCellMinStr) \
-  XJSON_SETTINGS_TAG("ups_cell_max",       GetUPSVoltCellMaxStr) \
-  XJSON_SETTINGS_TAG("mainvolt_high",      GetVACAlarmHighRangeStr) \
-  XJSON_SETTINGS_TAG("mainvolt_low",       GetVACAlarmLowRangeStr) \
-  XJSON_SETTINGS_TAG("mainvolt_hist",      GetVACAlarmHisteStr) \
-  XJSON_SETTINGS_TAG("temp_high",          GetTemperatureAlarmHighRangeStr) \
-  XJSON_SETTINGS_TAG("temp_low",           GetTemperatureAlarmLowRangeStr) \
-  XJSON_SETTINGS_TAG("temp_hist",          GetTemperatureAlarmHisteStr) \
-  XJSON_SETTINGS_TAG("loadvolt_high",      GetLoadAlarmHighRangeStr) \
-  XJSON_SETTINGS_TAG("loadvolt_hist",      GetLoadAlarmHisteStr) \
-  XJSON_SETTINGS_TAG("netsettings_changed",GetWebReinitFlag) \
+  XJSON_SETTINGS_TAG("read_community",     GetReadCommunity,                          SetReadCommunity) \
+  XJSON_SETTINGS_TAG("write_community",    GetWriteCommunity,                         SetWriteCommunity) \
+  XJSON_SETTINGS_TAG("managerIP",          GetManagerIp,                              SetManagerIp) \
+  XJSON_SETTINGS_TAG("managerIP2",         GetManagerIp2,                             SetManagerIp2) \
+  XJSON_SETTINGS_TAG("managerIP3",         GetManagerIp3,                             SetManagerIp3) \
+  XJSON_SETTINGS_TAG("managerIP4",         GetManagerIp4,                             SetManagerIp4) \
+  XJSON_SETTINGS_TAG("managerIP5",         GetManagerIp5,                             SetManagerIp5) \
+  XJSON_SETTINGS_TAG("di1",                GetDINTypeActStr,                          SetDINTypeActStr) \
+  XJSON_SETTINGS_TAG("ro1",                GetROTypeActStr,                           SetROTypeActStr) \
+  XJSON_SETTINGS_TAG("ro2",                GetROTypeActStr,                           SetROTypeActStr) \
+  XJSON_SETTINGS_TAG("ipaddr",             GetIpStr,                                  SetIPStr) \
+  XJSON_SETTINGS_TAG("gw",                 GetGatewayStr,                             SetGatewayStr) \
+  XJSON_SETTINGS_TAG("mask",               GetMaskStr,                                SetMaskStr) \
+  XJSON_SETTINGS_TAG("dhcp",               GetDhcpStateStr,                           SetDhcpStateStr) \
+  XJSON_SETTINGS_TAG("date",               GetDateStr,                                SetDateStr) \
+  XJSON_SETTINGS_TAG("time",               GetTimeStr,                                SetTimeWebStr) \
+  XJSON_SETTINGS_TAG("ntp",                GetSntpStateStr,                           SetSntpStateStr) \
+  XJSON_SETTINGS_TAG("ntpservip",          GetSntpServerIpStr,                        SetSntpServerIpStr) \
+  XJSON_SETTINGS_TAG("utc",                GetSntpTimeZoneStr,                        SetSntpTimeZoneStr) \
+  XJSON_SETTINGS_TAG("utm",                GetUnixTimeStr,                            SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("lastsynctime",       GetSntpLastDataStr,                        SetEmptyFuncStr) \
+  XJSON_SETTINGS_TAG("ups_cell_min",       GetUPSVoltCellMinStr,                      SetUPSVoltCellMinStr) \
+  XJSON_SETTINGS_TAG("ups_cell_max",       GetUPSVoltCellMaxStr,                      SetUPSVoltCellMaxStr) \
+  XJSON_SETTINGS_TAG("mainvolt_high",      GetVACAlarmHighRangeStr,                   SetVACAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("mainvolt_low",       GetVACAlarmLowRangeStr,                    SetVACAlarmLowRangeStr) \
+  XJSON_SETTINGS_TAG("mainvolt_hist",      GetVACAlarmHisteStr,                       SetVACAlarmHisteStr) \
+  XJSON_SETTINGS_TAG("temp_high",          GetTemperatureAlarmHighRangeStr,           SetTemperatureAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("temp_low",           GetTemperatureAlarmLowRangeStr,            SetTemperatureAlarmLowRangeStr) \
+  XJSON_SETTINGS_TAG("temp_hist",          GetTemperatureAlarmHisteStr,               SetTemperatureAlarmHisteStr) \
+  XJSON_SETTINGS_TAG("loadvolt_high",      GetLoadAlarmHighRangeStr,                  SetLoadAlarmHighRangeStr) \
+  XJSON_SETTINGS_TAG("loadvolt_hist",      GetLoadAlarmHisteStr,                      SetLoadAlarmHistStr) \
+  XJSON_SETTINGS_TAG("netsettings_changed",GetWebReinitFlag,                          SetEmptyFuncStr) \
 
 #define WEB_PARAMS_TAGS_TABLE \
   XJSON_PARAMS_TAG("AC",                 GetInputVoltageStr) \

modules/Ethernet/private_mib_bt6709.c

@@ -719,9 +719,6 @@ static snmp_err_t signal_set_value(struct snmp_node_instance *instance, u16_t le
             if (sSettings.sSNTP.sntpEnable != enable_old_sntp) {
                 SETTINGS_Save();
                 log_event_data(LOG_SETTING_SAVE, "Администратор (SNMP)");
-                SNTP_Init();
-                //vTaskDelay(7000);
-                SNTP_Poll();
             }
             break;
         case 40:

modules/HTTP_Server/http_server.c

@@ -915,7 +915,6 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
     uint8_t valueLen = 0;
     const uint8_t len = MAX_WEB_PARAM_LEN;
     char value[MAX_WEB_PARAM_LEN];
-    char str[MAX_WEB_PARAM_LEN];
 
     (void)lenBuf;
 
@@ -923,225 +922,9 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
 
     //ClearParamString(buf);
 
-    memset(value, 0, len);
-    memset(str, 0, MAX_WEB_PARAM_LEN);
-
-    /* SNMP */
-    GetParamValue(buf, "read_community=", value, &valueLen);
-    SetReadCommunity(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "write_community=", value, &valueLen);
-    SetWriteCommunity(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "managerIP=", value, &valueLen);
-    SetManagerIp(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "managerIP2=", value, &valueLen);
-    SetManagerIp2(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "managerIP3=", value, &valueLen);
-    SetManagerIp3(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "managerIP4=", value, &valueLen);
-    SetManagerIp4(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "managerIP5=", value, &valueLen);
-    SetManagerIp5(value);
-    memset(value, 0, len);
-
-#ifdef HARDWARE_BT6709
-    /* White list */
-    const char *white_list_set[] = {
-        "wtl_ip1=",
-        "wtl_ip2=",
-        "wtl_ip3=",
-        "wtl_ip4=",
-        "wtl_ip5=",
-    };
-    for (uint8_t i = 0; i < MAX_WHITE_LIST; i++) {
-        GetParamValue(buf, white_list_set[i], value, &valueLen);
-        memset(str, 0, len);
-        url_decode(str, sizeof(str), value);
-        SetWhiteListSTR(str, i);
-        memset(value, 0, len);
-    }
-
-#endif
-
-    /* Сетевые параметры */
-    GetParamValue(buf, "dhcp=", value, &valueLen);
-    SetDhcpStateStr(value);
-
-    if (strncmp(value, "on", 2) != 0) { // Если dhcp off устанавливаем параметры
-        memset(value, 0, len);
-
-        GetParamValue(buf, "ipaddr=", value, &valueLen);
-        SetIPStr(value);
-        memset(value, 0, len);
-
-        GetParamValue(buf, "gw=", value, &valueLen);
-        SetGatewayStr(value);
-        memset(value, 0, len);
-
-        GetParamValue(buf, "mask=", value, &valueLen);
-        SetMaskStr(value);
-        memset(value, 0, len);
-    }
-    memset(value, 0, len);
-
-
-#if defined HARDWARE_BT6707 || HARDWARE_BT6709
-    /* Сетевые параметры */
-    GetParamValue(buf, "tn_enabled=", value, &valueLen);
-    SetTelnetEnableStateStr(value);
-    if (strncmp(value, "on", 2) == 0) {
-        memset(value, 0, len);
-
-        GetParamValue(buf, "tn_port=", value, &valueLen);
-        SetTelnetPortStr(value);
-        memset(value, 0, len);
-    }
-    memset(value, 0, len);
-#if defined HARDWARE_BT6709
-    GetParamValue(buf, "ssh_enabled=", value, &valueLen);
-    SetSSHEnableStateStr(value);
-    if (strncmp(value, "on", 2) == 0) {
-        memset(value, 0, len);
-
-        GetParamValue(buf, "ssh_port=", value, &valueLen);
-        SetSSHPortStr(value);
-        memset(value, 0, len);
-    }
-    memset(value, 0, len);
-#endif // HARDWARE_BT6709
-#endif // HARDWARE_BT6707 || HARDWARE_BT6709
-#ifndef HARDWARE_BT6709
-    // Параметры реле и сухих контактов
-    GetParamValue(buf, "di1=", value, &valueLen);
-    SetDINTypeActStr(value, 0);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "ro1=", value, &valueLen);
-    SetROTypeActStr(value, 0);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "ro2=", value, &valueLen);
-    SetROTypeActStr(value, 1);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "ro3=", value, &valueLen);
-    SetROTypeActStr(value, 2);
-    memset(value, 0, len);
-#endif
-
-    GetParamValue(buf, "utc=", value, &valueLen);
-    SetSntpTimeZoneStr(value);
-    memset(value, 0, len);
-
-    // Параметры даты и времени
-    GetParamValue(buf, "ntp=", value, &valueLen);
-
-    if (strncmp(value, "1", 1) == 0) { // Если ntp on устанавливаем параметры
-        bool old_sntp = false;
-        bool enable_old_sntp = sSettings.sSNTP.sntpEnable;
-        memset(str, 0, len);
-        GetParamValue(buf, "ntpservip=", str, &valueLen);
-        if (strncmp(str, sSettings.sSNTP.ip, valueLen)) {
-            old_sntp = true;
-        }
-        SetSntpServerIpStr(str);
-        SetSntpStateStr(value);
-        if (sSettings.sSNTP.sntpEnable != enable_old_sntp) {
-            old_sntp = true;
-        }
-        if (old_sntp) {
-            SNTP_Init();
-            //vTaskDelay(7000);
-            SNTP_Poll();
-        }
-        memset(value, 0, len);
-        memset(str, 0, len);
-    } else if (strncmp(value, "0", 1) == 0) {
-        SetSntpStateStr(value);
-        memset(value, 0, len);
-        GetParamValue(buf, "date=", value, &valueLen);
-        SetDateStr(value);
-        memset(value, 0, len);
-        GetParamValue(buf, "time=", value, &valueLen);
-        memset(str, 0, len);
-        url_decode(str, sizeof(str), value);
-        SetTimeStr(str);
-        memset(value, 0, len);
-        memset(str, 0, len);
-    }
-
-    GetParamValue(buf, "ups_cell_min=", value, &valueLen);
-    SetUPSVoltCellMinStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "ups_cell_max=", value, &valueLen);
-    SetUPSVoltCellMaxStr(value);
-    memset(value, 0, len);
-
-#ifdef HARDWARE_BT6709
-    GetParamValue(buf, "bat_prod=", value, &valueLen);
-    SetDataSetAKBStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "bat_exp=", value, &valueLen);
-    SetLifeTimeAKBStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "bat_cap=", value, &valueLen);
-    SetCapacityNominalAKBStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "bat_charge=", value, &valueLen);
-    SetVoltageAKBNominalStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "ups_max_power=", value, &valueLen);
-    SetUPSPowerStr(value);
-    memset(value, 0, len);
-#endif
-
-    GetParamValue(buf, "mainvolt_high=", value, &valueLen);
-    SetVACAlarmHighRangeStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "mainvolt_low=", value, &valueLen);
-    SetVACAlarmLowRangeStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "mainvolt_hist=", value, &valueLen);
-    SetVACAlarmHisteStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "temp_high=", value, &valueLen);
-    SetTemperatureAlarmHighRangeStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "temp_low=", value, &valueLen);
-    SetTemperatureAlarmLowRangeStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "temp_hist=", value, &valueLen);
-    SetTemperatureAlarmHisteStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "loadvolt_high=", value, &valueLen);
-    SetLoadAlarmHighRangeStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "loadvolt_hist=", value, &valueLen);
-    SetLoadAlarmHistStr(value);
-    memset(value, 0, len);
+#define XJSON_SETTINGS_TAG(tag, get_param, set_param) JSON_SET_PARAM(tag, set_param, buf);
+		WEB_SETTINGS_TAGS_TABLE
+#undef XJSON_SETTINGS_CREATE
 
     /* Если параметры WEB изменились выставляем флаг, сохраняем настройки и перезагружаемся */
     if (GetStateWebReinit() == true) {

modules/HTTP_Server/my_ssl_server.c

@@ -1130,7 +1130,7 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
     uint8_t valueLen = 0;
     const uint8_t len = MAX_WEB_PARAM_LEN;
     char value[MAX_WEB_PARAM_LEN];
-    char str[MAX_WEB_PARAM_LEN];
+   
 
     (void)lenBuf;
 
@@ -1138,170 +1138,9 @@ void HTTP_SetSettings(char *buf, uint16_t lenBuf)
 
     //ClearParamString(buf);
 
-    memset(value, 0, len);
-    memset(str, 0, MAX_WEB_PARAM_LEN);
-
-    /* SNMP */
-    GetParamValue(buf, "read_community=", value, &valueLen);
-    SetReadCommunity(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "write_community=", value, &valueLen);
-    SetWriteCommunity(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "managerIP=", value, &valueLen);
-    SetManagerIp(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "managerIP2=", value, &valueLen);
-    SetManagerIp2(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "managerIP3=", value, &valueLen);
-    SetManagerIp3(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "managerIP4=", value, &valueLen);
-    SetManagerIp4(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "managerIP5=", value, &valueLen);
-    SetManagerIp5(value);
-    memset(value, 0, len);
-
-    /* Сетевые параметры */
-    GetParamValue(buf, "dhcp=", value, &valueLen);
-    SetDhcpStateStr(value);
-
-    if (strncmp(value, "on", 2) != 0) { // Если dhcp off устанавливаем параметры
-        memset(value, 0, len);
-
-        GetParamValue(buf, "ipaddr=", value, &valueLen);
-        SetIPStr(value);
-        memset(value, 0, len);
-
-        GetParamValue(buf, "gw=", value, &valueLen);
-        SetGatewayStr(value);
-        memset(value, 0, len);
-
-        GetParamValue(buf, "mask=", value, &valueLen);
-        SetMaskStr(value);
-        memset(value, 0, len);
-    }
-    memset(value, 0, len);
-
-    GetParamValue(buf, "swauth=", value, &valueLen);
-    SetAuthEnableStateStr(value);
-
-    if (strncmp(value, "on", 2) == 0) {
-        /* параметры RADIUS*/
-        memset(value, 0, len);
-        GetParamValue(buf, "rs_enabled=", value, &valueLen);
-        SetRDSEnableStateStr(value);
-
-        if (strncmp(value, "on", 2) == 0) { // Если raddius off устанавливаем параметры
-            memset(value, 0, len);
-            GetParamValue(buf, "rs_server=", value, &valueLen);
-            SetRDSIpStr(value);
-            memset(value, 0, len);
-
-            GetParamValue(buf, "rs_port=", value, &valueLen);
-            SetRDSPortStr(value);
-            memset(value, 0, len);
-
-            GetParamValue(buf, "rs_pwd=", value, &valueLen);
-            SetRDSPasswordkStr(value);
-            memset(value, 0, len);
-
-            GetParamValue(buf, "rs_key=", value, &valueLen);
-            SetRDSKeyAccesstStr(value);
-            memset(value, 0, len);
-        }
-    }
-    memset(value, 0, len);
-
-    // Параметры реле и сухих контактов
-    GetParamValue(buf, "di1=", value, &valueLen);
-    SetDINTypeActStr(value, 0);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "ro1=", value, &valueLen);
-    SetROTypeActStr(value, 0);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "ro2=", value, &valueLen);
-    SetROTypeActStr(value, 1);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "utc=", value, &valueLen);
-    SetSntpTimeZoneStr(value);
-    memset(value, 0, len);
-
-    // Параметры даты и времени
-    GetParamValue(buf, "ntp=", value, &valueLen);
-
-    if (strncmp(value, "1", 1) == 0) { // Если ntp on устанавливаем параметры
-        bool old_sntp = false;
-        bool enable_old_sntp = sSettings.sSNTP.sntpEnable;
-        memset(str, 0, len);
-        GetParamValue(buf, "ntpservip=", str, &valueLen);
-        if (strncmp(str, sSettings.sSNTP.ip, valueLen)) {
-            old_sntp = true;
-        }
-        SetSntpServerIpStr(str);
-        SetSntpStateStr(value);
-        if (sSettings.sSNTP.sntpEnable != enable_old_sntp) {
-            old_sntp = true;
-        }
-        if (old_sntp) {
-            SNTP_Init();
-            //vTaskDelay(7000);
-            SNTP_Poll();
-        }
-        memset(value, 0, len);
-        memset(str, 0, len);
-    } else if (strncmp(value, "0", 1) == 0) {
-        SetSntpStateStr(value);
-        memset(value, 0, len);
-        GetParamValue(buf, "date=", value, &valueLen);
-        SetDateStr(value);
-        memset(value, 0, len);
-        GetParamValue(buf, "time=", value, &valueLen);
-        memset(str, 0, len);
-        url_decode(str, sizeof(str), value);
-        SetTimeStr(str);
-        memset(value, 0, len);
-        memset(str, 0, len);
-    }
-
-    GetParamValue(buf, "ups_cell_min=", value, &valueLen);
-    SetUPSVoltCellMinStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "ups_cell_max=", value, &valueLen);
-    SetUPSVoltCellMaxStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "temp_high=", value, &valueLen);
-    SetTemperatureAlarmHighRangeStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "temp_low=", value, &valueLen);
-    SetTemperatureAlarmLowRangeStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "temp_hist=", value, &valueLen);
-    SetTemperatureAlarmHisteStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "loadvolt_high=", value, &valueLen);
-    SetLoadAlarmHighRangeStr(value);
-    memset(value, 0, len);
-
-    GetParamValue(buf, "loadvolt_hist=", value, &valueLen);
-    SetLoadAlarmHistStr(value);
-    memset(value, 0, len);
+#define XJSON_SETTINGS_TAG(tag, get_param, set_param) JSON_SET_PARAM(tag, set_param, buf);
+		WEB_SETTINGS_TAGS_TABLE
+#undef XJSON_SETTINGS_CREATE
 
     /* Если параметры WEB изменились выставляем флаг, сохраняем настройки и перезагружаемся */
     if (GetStateWebReinit() == true) {

modules/HTTP_Server/web_params_api.c

@@ -97,7 +97,7 @@ char *HTTP_GetSettingsPage(uint32_t reqNum, char *bufIn, char *bufOut, uint16_t
     strcpy(bufOut, "HTTP/1.0 200 OK\r\nContent-Type:text/html\r\n\r\n");
 
     settings_param = cJSON_CreateObject();
-#define XJSON_SETTINGS_TAG(tag, get_param) JSON_ADD_TAG(tag, get_param, settings_param);
+#define XJSON_SETTINGS_TAG(tag, get_param, set_param) JSON_ADD_TAG(tag, get_param, settings_param);
 		WEB_SETTINGS_TAGS_TABLE
 #undef XJSON_SETTINGS_CREATE
     if(cJSON_PrintPreallocated(settings_param, bufOut, SEND_BUF_MAX_LEN, 0)) {

modules/HTTP_Server/web_params_api.h

@@ -20,9 +20,33 @@
   do { \
     memset(str, 0, sizeof(str)); \
     get_param(str, &len); \
-    cJSON_AddStringToObject(cjson_param, tag, str); \
+    if (strncmp(tag, "tn_enabled", sizeof(tag)) == 0  \
+        || strncmp(tag, "ssh_enabled", sizeof(tag)) == 0 \
+        || strncmp(tag, "dhcp", sizeof(tag)) == 0 \
+        || strncmp(tag, "swauth", sizeof(tag)) == 0 \
+        || strncmp(tag, "rs_enabled", sizeof(tag)) == 0) { \
+      cJSON_AddNumberToObject(cjson_param, tag, atoi(str)); \
+    } else { \
+      cJSON_AddStringToObject(cjson_param, tag, str); \
+    } \
   } while (0);
 
+#define JSON_SET_PARAM(tag, set_param, buf) \
+    do { \
+        memset(value, 0, sizeof(value)); \
+        if (GetParamValue(buf, tag, value, &valueLen)) { \
+            set_param(value); \
+        } else { \
+          if (strncmp(tag, "tn_enabled", sizeof(tag)) == 0  \
+              || strncmp(tag, "ssh_enabled", sizeof(tag)) == 0 \
+              || strncmp(tag, "dhcp", sizeof(tag)) == 0 \
+              || strncmp(tag, "swauth", sizeof(tag)) == 0 \
+              || strncmp(tag, "rs_enabled", sizeof(tag)) == 0) { \
+            set_param(value); \
+          } \
+        } \
+    } while (0);
+
 /**
   * @brief  Заполнение JSON строки параметров
   */

modules/cli/CLI_Commands.c

@@ -930,9 +930,6 @@ static portBASE_TYPE prvTaskNTPCommand(cli_state_t *cli_state, int8_t *pcWriteBu
                 SetSntpStateStr("1");
                 if (sSettings.sSNTP.sntpEnable != enable_old_sntp) {
                     cli_save_config(cli_state);
-                    SNTP_Init();
-                    //vTaskDelay(7000);
-                    SNTP_Poll();
                 }
                 break;
             case ARG_NTP_DISABLE:
@@ -940,9 +937,6 @@ static portBASE_TYPE prvTaskNTPCommand(cli_state_t *cli_state, int8_t *pcWriteBu
                 SetSntpStateStr("0");
                 if (sSettings.sSNTP.sntpEnable != enable_old_sntp) {
                     cli_save_config(cli_state);
-                    SNTP_Init();
-                    //vTaskDelay(7000);
-                    SNTP_Poll();
                 }
                 break;
             case ARG_NTP_INFO:
@@ -999,9 +993,6 @@ static portBASE_TYPE prvTaskNTPCommand(cli_state_t *cli_state, int8_t *pcWriteBu
                         if (strncmp(str_temp, sSettings.sSNTP.ip, strlen(str_temp)) != 0) {
                             SetSntpServerIpStr(str_temp);
                             cli_save_config(cli_state);
-                            SNTP_Init();
-                            //vTaskDelay(7000);
-                            SNTP_Poll();
                         }
                     } else {
                         strncpy( ( char * ) pcWriteBuffer, ( const char * ) pcInvalidCommand, strlen( ( char * ) pcInvalidCommand ) );

modules/parameters.c

@@ -30,6 +30,8 @@
 //#include "d_inouts.h"
 #include "gpio.h"
 #include "round.h"
+#include "urlcode.h"
+#include "sntp_api.h"
 #ifdef PRINTF_STDLIB
 #include <stdio.h>
 #endif
@@ -573,6 +575,7 @@ void GetRO1TypeActStr(char *str, uint8_t *len)
     *len = strlen(str);
 }
 
+#ifdef HARDWARE_BT6707
 /**
   * @brief  Источник срабатывания реле
   */
@@ -581,6 +584,7 @@ void GetRO2TypeActStr(char *str, uint8_t *len)
     sprintf(str, "%d", sSettings.sInOuts.ro_type_source[DOUT3]);
     *len = strlen(str);
 }
+#endif
 
 /**
   * @brief  Состояние релейного выхода
@@ -1705,6 +1709,46 @@ void SetWhiteListSTR(char *str, uint8_t num)
     }
 }
 
+/**
+  * @brief  Первый диапазон доверительных хостов
+  */
+void SetWhiteList1STR(char *str)
+{
+  SetWhiteListSTR(str, 0);
+}
+
+/**
+  * @brief  Второй диапазон доверительных хостов
+  */
+void SetWhiteList2STR(char *str)
+{
+  SetWhiteListSTR(str, 1);
+}
+
+/**
+  * @brief  Третий диапазон доверительных хостов
+  */
+void SetWhiteList3STR(char *str)
+{
+  SetWhiteListSTR(str, 2);
+}
+
+/**
+  * @brief  Четвертый диапазон доверительных хостов
+  */
+void SetWhiteList4STR(char *str)
+{
+  SetWhiteListSTR(str, 3);
+}
+
+/**
+  * @brief  Пятый диапазон доверительных хостов
+  */
+void SetWhiteList5STR(char *str)
+{
+  SetWhiteListSTR(str, 4);
+}
+
 #endif
 
 // ************************************************************************** //
@@ -1968,6 +2012,34 @@ void SetTimeStr(char *str)
     TM_RTC_SetDateTimeString(str_data);
 }
 
+/**
+  * @brief  Время
+  */
+void SetTimeWebStr(char *str)
+{
+    char tmp_str[MAX_WEB_PARAM_LEN];
+    
+    memset(tmp_str, 0, sizeof(tmp_str));
+    url_decode(tmp_str, sizeof(tmp_str), str);
+
+    TM_RTC_t tmp_data;
+    char str_data[18];
+    char str_date[14];
+    uint8_t len;
+
+    memset(str_data, 0, 18);
+    memset(str_date, 0, 14);
+
+    TM_RTC_GetDateTime(&tmp_data, TM_RTC_Format_BIN);
+    sprintf(str_date, "%02i-%02i-%02i-01-", tmp_data.date, tmp_data.month, tmp_data.year);
+    len = strlen(str_date);
+    strncat(str_data, str_date, len);
+    strncat(str_data, tmp_str, 5);
+
+    //TM_RTC_SetDateTimeString(&str_data);
+    TM_RTC_SetDateTimeString(str_data);
+}
+
 // ************************************************************************** //
 //                             Параметры SNTP
 #ifndef BT6702_SERVICE
@@ -1976,11 +2048,19 @@ void SetTimeStr(char *str)
   */
 void SetSntpStateStr(char *str)
 {
+    bool enable_old_sntp = sSettings.sSNTP.sntpEnable;
     if (strncmp(str, "1", 1) == 0) {
         sSettings.sSNTP.sntpEnable = true;
     } else {
         sSettings.sSNTP.sntpEnable = false;
     }
+    if (sSettings.sSNTP.sntpEnable != enable_old_sntp) {
+#ifndef BT6702_SERVICE
+      SNTP_Init();
+#endif
+      //vTaskDelay(7000);
+      SNTP_Poll();
+    }
 }
 #endif
 
@@ -1989,7 +2069,14 @@ void SetSntpStateStr(char *str)
   */
 void SetSntpServerIpStr(char *str)
 {
+  if (strncmp(str, sSettings.sSNTP.ip, strlen(str)) != 0) {
     strcpy(sSettings.sSNTP.ip, str);
+#ifndef BT6702_SERVICE
+    SNTP_Init();
+#endif
+    //vTaskDelay(7000);
+    SNTP_Poll();
+  }
 }
 
 /**
@@ -2045,6 +2132,14 @@ void SetDINTypeActStr(char *str, uint8_t num)
     sSettings.sInOuts.din_type_act[num] = atoi(str);
 }
 
+/**
+  * @brief  Тип действий при срабатывание сухих контактов
+  */
+void SetDIN1TypeActStr(char *str)
+{
+    SetDINTypeActStr(str, 0);
+}
+
 /**
   * @brief  Источник срабатывания реле
   */
@@ -2061,6 +2156,30 @@ void SetROTypeActStr(char *str, uint8_t num)
     }
 }
 
+/**
+  * @brief  Источник срабатывания реле 1
+  */
+void SetRO1TypeActStr(char *str)
+{
+  SetROTypeActStr(str, 0);
+}
+
+/**
+  * @brief  Источник срабатывания реле 2
+  */
+void SetRO2TypeActStr(char *str)
+{
+  SetROTypeActStr(str, 1);
+}
+#ifdef HARDWARE_BT6707
+/**
+  * @brief  Источник срабатывания реле 3
+  */
+void SetRO3TypeActStr(char *str)
+{
+  SetROTypeActStr(str, 2);
+}
+#endif
 /**
   * @brief
   */
@@ -2300,4 +2419,10 @@ void SetLoadAlarmHistInt(float value)
     sSettings.sAlarmManager.load_range.hyst = value;
 }
 
+
+void SetEmptyFuncStr(char *str)
+{
+
+}
+
 /********************************* (C) РОТЕК **********************************/

modules/parameters.h

@@ -443,10 +443,12 @@ void GetRO0TypeActStr(char *str, uint8_t *len);
   */
 void GetRO1TypeActStr(char *str, uint8_t *len);
 
+#ifdef HARDWARE_BT6707
 /**
   * @brief  Источник срабатывания реле
   */
 void GetRO2TypeActStr(char *str, uint8_t *len);
+#endif
 
 /**
   * @brief  Состояние релейного выхода
@@ -726,6 +728,31 @@ void SetUDPDhcpStateStr(char *str);
   */
 void SetWhiteListSTR(char *str, uint8_t num);
 
+/**
+  * @brief  Первый диапазон доверительных хостов
+  */
+void SetWhiteList1STR(char *str);
+
+/**
+  * @brief  Второй диапазон доверительных хостов
+  */
+void SetWhiteList2STR(char *str);
+
+/**
+  * @brief  Третий диапазон доверительных хостов
+  */
+void SetWhiteList3STR(char *str);
+
+/**
+  * @brief  Четвертый диапазон доверительных хостов
+  */
+void SetWhiteList4STR(char *str);
+
+/**
+  * @brief  Пятый диапазон доверительных хостов
+  */
+void SetWhiteList5STR(char *str);
+
 #endif
 
 // ************************************************************************** //
@@ -852,6 +879,11 @@ void SetDateStr(char *str);
   */
 void SetTimeStr(char *str);
 
+/**
+  * @brief  Время
+  */
+void SetTimeWebStr(char *str);
+
 // ************************************************************************** //
 //                             Параметры SNTP
 
@@ -879,11 +911,33 @@ void SetSntpTimeZoneStr(char *str);
   */
 void SetDINTypeActStr(char *str, uint8_t num);
 
+/**
+  * @brief  Тип действий при срабатывание сухих контактов
+  */
+void SetDIN1TypeActStr(char *str);
+
 /**
   * @brief  Источник срабатывания реле
   */
 void SetROTypeActStr(char *str, uint8_t num);
 
+/**
+  * @brief  Источник срабатывания реле 1
+  */
+void SetRO1TypeActStr(char *str);
+
+/**
+  * @brief  Источник срабатывания реле 2
+  */
+void SetRO2TypeActStr(char *str);
+
+#ifdef HARDWARE_BT6707
+/**
+  * @brief  Источник срабатывания реле 3
+  */
+void SetRO3TypeActStr(char *str);
+#endif
+
 /**
   * @brief
   */
@@ -1026,6 +1080,8 @@ void SetLoadAlarmHistStr(char *str);
   */
 void SetLoadAlarmHistInt(float value);
 
+void SetEmptyFuncStr(char *str);
+
 
 #endif /* #ifndef PARAMETERS_H */