Index: scripts/factory_reset.sh
===================================================================
diff -u -r041be01bb59cfe463cc6fd834f296b7545e4ac64 -r9a8412f742caf6491cf888843155a32040de4c04
--- scripts/factory_reset.sh	(.../factory_reset.sh)	(revision 041be01bb59cfe463cc6fd834f296b7545e4ac64)
+++ scripts/factory_reset.sh	(.../factory_reset.sh)	(revision 9a8412f742caf6491cf888843155a32040de4c04)
@@ -39,7 +39,13 @@
 LOC_SETTINGS_CONF="/var/configurations/Settings/System.conf"
 LOC_SETTINGS_DFLT="/var/configurations/Settings/System.dflt"
 LOC_LOG_BASE_FOLDER="/media/sd-card/"
+LOC_TX_LOG_BASE_FOLDER="/var/configurations/treatment/"
+LOC_SCRIPTS=$HOME/scripts
+LOC_SCRIPTS_BRIGHTNESS=$LOC_SCRIPTS/brightness_set.sh
 
+DEFAULT_BRIGHTNESS_LEVEL=10
+
+
 TRUE=1
 FALSE=0
 function false() { echo $FALSE; }
@@ -152,48 +158,73 @@
 }
 
 function deleteWiFi() {
-    removeSingleFile    $LOC_WIFI_CONFIGURATION "WiFi configuration"    #delete WiFi
+    SCRIPTS=/home/$(whoami)/scripts
+    $SCRIPTS/wifi_disconnect_network.sh wlan0
 }
 
 function deleteBluetooth() {
-    clearFolderContent  $LOC_BLUETOOTH_DEVCACHE "Bluetooth cache"       #delete Bluetooth
+    SCRIPTS=/home/$(whoami)/scripts
+    $SCRIPTS/bluetooth_paired_clear.sh
 }
 
 function defaultSettings() {
     local _has_error_=$FALSE
 
     servicePasswordLine=$(grep -A1 "\[Service\]" "$LOC_SETTINGS_CONF" | grep Password)      # store the service password line
-    _has_error_=$( [[ "$servicePasswordLine" ]] && $(true) || $(false) )
+    _has_error_= [[ -z "$servicePasswordLine" ]]
     exitError $_has_error_ $ERR_CLEAN_SETTINGS_CONF_PASSNOTFOUND "Password not found in '$LOC_SETTINGS_CONF'"
 
-    cp $LOC_SETTINGS_DFLT $LOC_SETTINGS_CONF                                                # reset the settings to default settings
+    cp $LOC_SETTINGS_DFLT $LOC_SETTINGS_CONF                                           # reset the settings to default settings
     _has_error_=$?
-    exitError $_has_error_ $ERR_CLEAN_SETTINGS_CONF_OVERWRITE "Service settings overwrite filed"
+    exitError $_has_error_ $ERR_CLEAN_SETTINGS_CONF_OVERWRITE "Service settings overwrite failed"
 
-    sed -i "s/^.*Password.*$/$storedPassword/" $LOC_SETTINGS_CONF                           # keep  the             service password
+    sed -i "s/^.*Password.*$/$servicePasswordLine/" $LOC_SETTINGS_CONF                 # keep  the             service password
     _has_error_=$?
-    exitError $_has_error_ $ERR_CLEAN_SETTINGS_DFLT_RESTORE "Service password restore filed"
+    exitError $_has_error_ $ERR_CLEAN_SETTINGS_DFLT_RESTORE "Service password restore failed"
 }
 
+function defaultBrightness() {
+    $LOC_SCRIPTS_BRIGHTNESS $DEFAULT_BRIGHTNESS_LEVEL
+}
+
 function deleteLogFiles() {
-    # handling log deletion in a special manner: 
+    # handling log deletion in a special manner:
     #  - Log files generated today
     #     - are not deleted
     #     - not part of the checking whether deletion was successful
     #  - setting maxDepth to 2 due to path used is root level with sd-card/<log/service/etc> folders of logs
-    find "$LOC_LOG_BASE_FOLDER" -maxdepth 2 -type f -daystart -mtime +0 -exec rm -f {} +
+    # NOTE: find command always return true / non-zero! when using with exec
+    # TODO: Checking the file count should be fixed later
     
-    _has_error_=$?
+    # Remove the contents of the log folder
+    rm "$LOC_LOG_BASE_FOLDER"/log/*
+    _has_error_=!$?
     exitError $_has_error_ $ERR_REMOVE_CMD_FIL "Log file deletion"
+    
+    # Remove the contents of the service folder
+    rm "$LOC_LOG_BASE_FOLDER"/service/*
+    _has_error_=!$?
+    exitError $_has_error_ $ERR_REMOVE_CMD_FIL "Service file deletion"
 
     fileCount=$(find "$LOC_LOG_BASE_FOLDER" -maxdepth 2 -type f -daystart -mtime +0 | wc -l)
     _has_error_=$fileCount
     exitError $_has_error_ $ERR_REMOVE_DEL_FIL "Remained '$fileCount' file undeleted"
+
+    # Deleting treatment logs in encrypted partition:
+    find "$LOC_TX_LOG_BASE_FOLDER" -maxdepth 2 -type f | xargs rm
+
+    _has_error_=!$?
+    exitError $_has_error_ $ERR_REMOVE_CMD_FIL "Tx Log file deletion"
+
+    fileCount=$(find "$LOC_TX_LOG_BASE_FOLDER" -maxdepth 2 -type f | wc -l)
+    _has_error_=$fileCount
+    exitError $_has_error_ $ERR_REMOVE_DEL_FIL "Remained '$fileCount' file undeleted"
 }
 
 # delete WiFi settings
 # delete Bluetooth settings
 # settings.conf to default
+# brightness to default (10)
 # delete logs
 # keep partition password
 # keep service password
@@ -202,6 +233,7 @@
     deleteWiFi
     deleteBluetooth
     defaultSettings
+    defaultBrightness
     deleteLogFiles
 }