[iot/goam] Improved placement of icons

3 files changed, 30 insertions, 11 deletions

diff --git a/Year 3/Internet of things/goam/main/Kconfig.projbuild b/Year 3/Internet of things/goam/main/Kconfig.projbuild
index 4ad0b48..41f20dd 100644
--- a/Year 3/Internet of things/goam/main/Kconfig.projbuild
+++ b/Year 3/Internet of things/goam/main/Kconfig.projbuild
@@ -9,18 +9,18 @@ menu "GoAm configurations"
 				int "Column on which the camera icon will be shown, takes two columns"
 				range 1 16
 				default 1
-			config WIFI_COLUMN
-				int "Column on which the wifi icon will be shown, takes two columns"
+			config RESOLUTION_COLUMN
+				int "Column on which the resolution icon will be shown, takes one column"
 				range 1 16
-				default 4
+				default 3
 			config SAVEIMAGE_COLUMN
 				int "Column on which the save image setting icon will be shown, takes one column"
 				range 1 16
-				default 7
-			config RESOLUTION_COLUMN
-				int "Column on which the resolution icon will be shown, takes one column"
+				default 5
+			config WIFI_COLUMN
+				int "Column on which the wifi icon will be shown, takes two columns"
 				range 1 16
-				default 8
+				default 15
 		endmenu
 		config DISPLAY_IP_ROW
 			int "Row on which the IP will be shown, takes the entire row"
diff --git a/Year 3/Internet of things/goam/sdkconfig b/Year 3/Internet of things/goam/sdkconfig
index c85ef81..90f1d7f 100644
--- a/Year 3/Internet of things/goam/sdkconfig
+++ b/Year 3/Internet of things/goam/sdkconfig
@@ -353,9 +353,9 @@ CONFIG_DISPLAY_ICONS_ROW=1
 # Icons row layout
 #
 CONFIG_CAMERA_COLUMN=1
-CONFIG_WIFI_COLUMN=4
-CONFIG_SAVEIMAGE_COLUMN=7
-CONFIG_RESOLUTION_COLUMN=8
+CONFIG_RESOLUTION_COLUMN=3
+CONFIG_SAVEIMAGE_COLUMN=5
+CONFIG_WIFI_COLUMN=15
 # end of Icons row layout
 
 CONFIG_DISPLAY_IP_ROW=2
diff --git a/Year 3/Internet of things/goam/sdkconfig.old b/Year 3/Internet of things/goam/sdkconfig.old
index 5c940da..e1c97ef 100644
--- a/Year 3/Internet of things/goam/sdkconfig.old
+++ b/Year 3/Internet of things/goam/sdkconfig.old
@@ -345,6 +345,25 @@ CONFIG_PARTITION_TABLE_MD5=y
 #
 
 #
+# Display layout
+#
+CONFIG_DISPLAY_ICONS_ROW=1
+
+#
+# Icons row layout
+#
+CONFIG_CAMERA_COLUMN=1
+CONFIG_RESOLUTION_COLUMN=8
+CONFIG_SAVEIMAGE_COLUMN=7
+CONFIG_WIFI_COLUMN=4
+# end of Icons row layout
+
+CONFIG_DISPLAY_IP_ROW=2
+CONFIG_DISPLAY_SSID_ROW=3
+# end of Display layout
+# end of GoAm configurations
+
+#
 # Compiler options
 #
 # CONFIG_COMPILER_OPTIMIZATION_DEFAULT is not set
@@ -610,7 +629,7 @@ CONFIG_HTTPD_MAX_URI_LEN=512
 CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
 CONFIG_HTTPD_PURGE_BUF_LEN=32
 # CONFIG_HTTPD_LOG_PURGE_DATA is not set
-# CONFIG_HTTPD_WS_SUPPORT is not set
+CONFIG_HTTPD_WS_SUPPORT=y
 # CONFIG_HTTPD_QUEUE_WORK_BLOCKING is not set
 # end of HTTP Server