From a8a7d059c9d15ec5b83021bbe49d022c10dbf9ff Mon Sep 17 00:00:00 2001 From: MrDave Date: Sat, 26 Jun 2021 21:59:43 -0600 Subject: [PATCH] Do not print webcontrol params to camera files --- src/conf.cpp | 3 ++- src/conf.hpp | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/conf.cpp b/src/conf.cpp index e845bba6..5ce947a7 100644 --- a/src/conf.cpp +++ b/src/conf.cpp @@ -3804,7 +3804,8 @@ void conf_parms_write(struct ctx_motapp *motapp) if ((config_parms[indx].parm_name != "camera") && (config_parms[indx].parm_name != "camera_dir") && (config_parms[indx].parm_name != "conf_filename") && - ((indx_cam == 0) || (parm_val != parm_main))) { + ((indx_cam == 0) || ((parm_val != parm_main) && + (config_parms[indx].parm_cat != PARM_CAT_13)))) { if (indx_next != (int)config_parms[indx].parm_cat) { fprintf(conffile,"\n%s",";*************************************************\n"); diff --git a/src/conf.hpp b/src/conf.hpp index 4a21ed61..5b693c3a 100644 --- a/src/conf.hpp +++ b/src/conf.hpp @@ -194,24 +194,24 @@ /* Categories for he edits and display on web interface*/ enum PARM_CAT{ - PARM_CAT_00 - ,PARM_CAT_01 - ,PARM_CAT_02 - ,PARM_CAT_03 - ,PARM_CAT_04 - ,PARM_CAT_05 - ,PARM_CAT_06 - ,PARM_CAT_07 - ,PARM_CAT_08 - ,PARM_CAT_09 - ,PARM_CAT_10 - ,PARM_CAT_11 - ,PARM_CAT_12 - ,PARM_CAT_13 - ,PARM_CAT_14 - ,PARM_CAT_15 - ,PARM_CAT_16 - ,PARM_CAT_17 + PARM_CAT_00 /* system */ + ,PARM_CAT_01 /* camera */ + ,PARM_CAT_02 /* source */ + ,PARM_CAT_03 /* image */ + ,PARM_CAT_04 /* overlay */ + ,PARM_CAT_05 /* method */ + ,PARM_CAT_06 /* masks */ + ,PARM_CAT_07 /* detect */ + ,PARM_CAT_08 /* scripts */ + ,PARM_CAT_09 /* picture */ + ,PARM_CAT_10 /* movies */ + ,PARM_CAT_11 /* timelapse */ + ,PARM_CAT_12 /* pipes */ + ,PARM_CAT_13 /* webcontrol */ + ,PARM_CAT_14 /* streams */ + ,PARM_CAT_15 /* database */ + ,PARM_CAT_16 /* sql */ + ,PARM_CAT_17 /* tracking */ ,PARM_CAT_MAX }; enum PARM_TYP{