From 3f44a18051f190c8c72976868352f8d474cc69be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20=C5=98=C3=ADha?= <cedel@centrum.cz>
Date: Tue, 18 Jul 2023 18:10:13 +0200
Subject: [PATCH] little code cleanup

---
 SCPI_manual/smartpower3_scpi_manual.pdf | Bin 41122 -> 41099 bytes
 SCPI_manual/smartpower3_scpi_manual.tex |   6 ------
 smartpower3/component.h                 |   1 -
 smartpower3/inputmanager.h              |   3 +--
 smartpower3/meas_channel.cpp            |   5 -----
 smartpower3/scpimanager.cpp             |   2 --
 smartpower3/scpimanager.h               |  11 +----------
 smartpower3/screenmanager.h             |   2 --
 smartpower3/screens/networkscreen.h     |   5 -----
 smartpower3/screens/settingscreen.cpp   |   1 -
 smartpower3/screens/settingscreen.h     |   7 -------
 smartpower3/settings.cpp                |   6 ------
 smartpower3/smartpower3.h               |   3 ---
 smartpower3/smartpower3.ino             |   2 --
 smartpower3/wifimanager.h               |   2 --
 15 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/SCPI_manual/smartpower3_scpi_manual.pdf b/SCPI_manual/smartpower3_scpi_manual.pdf
index 3efbd3d42aa314e0baf0e84043b1c0057be03ae8..ece7272e462f1d4ba0cbe5a76bb349f6c34ba532 100644
GIT binary patch
delta 6009
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
J)eSTV{s(&XTBQI0

delta 6010
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
SA`u8wSd@r^Ls3hK=zjneFLeI^

diff --git a/SCPI_manual/smartpower3_scpi_manual.tex b/SCPI_manual/smartpower3_scpi_manual.tex
index ed11d81..965c573 100644
--- a/SCPI_manual/smartpower3_scpi_manual.tex
+++ b/SCPI_manual/smartpower3_scpi_manual.tex
@@ -1,6 +1,5 @@
 \documentclass[a4paper,10pt]{article}
 \usepackage[left=2.5cm,right=2.5cm,top=2cm]{geometry}
-%\usepackage[T1]{fontenc}
 \usepackage{fontenc}
 \usepackage{lmodern}
 \usepackage[utf8]{inputenc}
@@ -17,8 +16,6 @@
 \usepackage{textcomp}
 \usepackage{listings}
 \usepackage{hyperref}
-%\usepackage{glossaries}
-%\usepackage{parskip}
 
 \title{Hardkernel SmartPower3 SCPI manual}
 \author{Lukáš Říha}
@@ -343,9 +340,6 @@ \section{Commands}
 		    \begin{description}
 		        This query returns the output states of channel \verb!#!. Returns 0 or 1.
 		    \end{description}
-
-		%/*{ "SYSTem:COMMunication:TCPIP:CONTROL?", SCPI_SystemCommTcpipControlQ, 0 },*/
-    
     \end{enumerate}
 \end{enumerate}
 
diff --git a/smartpower3/component.h b/smartpower3/component.h
index 8232cc7..3ffbf64 100644
--- a/smartpower3/component.h
+++ b/smartpower3/component.h
@@ -46,7 +46,6 @@ class Component
 	void setTextColor(uint16_t fg_color, uint16_t bg_color);
 	void loadFont(const uint8_t font[]);
 	void unloadFont(void);
-	//void clearAndDrawWithFont(const uint8_t font[], String string_to_draw);
 	void clearAndDrawWithColoredFont(const uint8_t font[], uint16_t fg_color, const char* string_to_draw);
 	void clearAndDrawWithFont(const uint8_t font[], const char* string_to_draw);
 private:
diff --git a/smartpower3/inputmanager.h b/smartpower3/inputmanager.h
index 596a28d..ee99794 100644
--- a/smartpower3/inputmanager.h
+++ b/smartpower3/inputmanager.h
@@ -1,6 +1,6 @@
 #include <ESP32Encoder.h>
 #include <Arduino.h>
-//#include <FunctionalInterrupt.h>
+
 
 #define DEBOUNCE_TIME 100
 #define LONG_PRESS_TIME 3000
@@ -8,7 +8,6 @@
 void countEncoder(void *val);
 void initEncoder(void *param);
 
-
 struct dial_t {
 	int8_t cnt;
 	int8_t direct;
diff --git a/smartpower3/meas_channel.cpp b/smartpower3/meas_channel.cpp
index ce4a682..fa56651 100644
--- a/smartpower3/meas_channel.cpp
+++ b/smartpower3/meas_channel.cpp
@@ -81,11 +81,6 @@ void MeasChannels::sample()
 		A = A * 100 / 65536;
 		A = A / rsense * 1000000;
 
-/*		Serial.printf("%6.10f\n\r", V);
-		Serial.printf("%6.10f\n\r", A);
-		Serial.printf("%d\n\r", static_cast<uint16_t>(V));
-		Serial.printf("%d\n\r", static_cast<uint16_t>(A));*/
-
 		switch (i) {
 			case 0:
 				channel0->update(V, A);
diff --git a/smartpower3/scpimanager.cpp b/smartpower3/scpimanager.cpp
index aafd4ff..b809bf3 100644
--- a/smartpower3/scpimanager.cpp
+++ b/smartpower3/scpimanager.cpp
@@ -264,9 +264,7 @@ scpi_result_t SCPIManager::DMM_MeasureUnitDcQ(scpi_t *context, scpi_unit_t allow
 {
 	const uint8_t max_param_count = 3;
 	UserContext *user_ctx = static_cast<UserContext *>(context->user_context);
-	//Settings *settings = user_ctx->settings;
 	MeasChannels *channels = user_ctx->measuring_channels;
-	//ScreenManager *sm = user_ctx->screen_manager;
 	scpi_number_t expected_value;
 	scpi_number_t resolution;
 	scpi_parameter_t working_param;
diff --git a/smartpower3/scpimanager.h b/smartpower3/scpimanager.h
index 6bf0675..4227aaa 100644
--- a/smartpower3/scpimanager.h
+++ b/smartpower3/scpimanager.h
@@ -134,7 +134,6 @@ class SCPIManager
 		{ "*OPC", SCPI_CoreOpc, 0 },
 		{ "*OPC?", SCPI_CoreOpcQ, 0 },
 //TODO: Check if reset is complete or needs rework
-		//{ "*RST", SCPI_CoreRst, 0 },
 		{ "*RST", Reset, 0 },
 		{ "*SRE", SCPI_CoreSre, 0 },
 		{ "*SRE?", SCPI_CoreSreQ, 0 },
@@ -163,7 +162,7 @@ class SCPIManager
 		{"SYSTem:COMMunicate:NETwork:GATE?", SCPI_NetworkGateQ, 0 },
 		// This command sets the Gateway IP address of the Ethernet module of the power supply.
 		// The Gateway IP defaults to 0.0.0.0 in absence of a DHCP server.
-	    // Gateway IP address is represented with 4 bytes each having a range of 0-255 separated by dots
+		// Gateway IP address is represented with 4 bytes each having a range of 0-255 separated by dots
 		{"SYSTem:COMMunicate:NETwork:SUBNet", SCPI_NetworkSubnet, 0 },
 		{"SYSTem:COMMunicate:NETwork:SUBNet?", SCPI_NetworkSubnetQ, 0 },
 		// This command sets the subnet IP Mask address of the Ethernet module of the power supply.
@@ -195,12 +194,6 @@ class SCPIManager
 		{"SYSTem:COMMunicate:Serial:FEED", SCPI_SerialFeed, 0},
 		{"SYSTem:COMMunicate:Serial:FEED?", SCPI_SerialFeedQ, 0},
 
-		//{"[SYSTem][:COMMunicate]:SERial:FEED", SCPI_SocketPortQ, 0 }
-		//{"[SYSTem][:COMMunicate]:SERial:FEED?", SCPI_SocketPortQ, 0 }
-		//{"[SYSTem][:COMMunicate]:SOCKet:FEED", SCPI_SocketPort, 0 },
-		//{"[SYSTem][:COMMunicate]:SOCKet:FEED?", SCPI_SocketPortQ, 0 },
-
-
 		//{"STATus:OPERation?", scpi_stub_callback, 0},
 		//{"STATus:OPERation:EVENt?", scpi_stub_callback, 0},
 		//{"STATus:OPERation:CONDition?", scpi_stub_callback, 0},
@@ -227,8 +220,6 @@ class SCPIManager
 		{ "OUTPut#[:STATe]", Output_TurnOnOff, 0 },
 		{ "OUTPut#[:STATe]?", Output_TurnOnOffQ, 0 },
 
-		/*{ "SYSTem:COMMunication:TCPIP:CONTROL?", SCPI_SystemCommTcpipControlQ, 0 },*/
-
 		SCPI_CMD_LIST_END
 	};
 };
diff --git a/smartpower3/screenmanager.h b/smartpower3/screenmanager.h
index 9418510..7636b57 100644
--- a/smartpower3/screenmanager.h
+++ b/smartpower3/screenmanager.h
@@ -73,5 +73,3 @@ class ScreenManager
 	Screen *screens[LAST_SCREEN_COUNT] = {};
 	bool show_next_screen = false;
 };
-
-//ScreenManager screen_manager;
diff --git a/smartpower3/screens/networkscreen.h b/smartpower3/screens/networkscreen.h
index e985cd5..c2bfad3 100644
--- a/smartpower3/screens/networkscreen.h
+++ b/smartpower3/screens/networkscreen.h
@@ -23,10 +23,6 @@ enum network_screen_state_setting {
 	STATE_NETWORK_WIFI_ICON = 1,
 	STATE_NETWORK_LOGGING_ICON,
 	STATE_NETWORK_DHCP,
-//	STATE_NETWORK_MODE,
-//	STATE_LOG_INTERVAL,
-//	STATE_BAUD_RATE,
-//	STATE_BL,
 };
 
 
@@ -51,7 +47,6 @@ class NetworkScreen : public Screen
 	void drawGatewayIpaddr(const char* ipaddr);
 	void drawSubnetMask(const char* ipaddr);
 	void drawDnsServers(const char* ipaddr_dns1, const char* ipaddr_dns2);
-	//void drawMode(device_operation_mode default_mode = OPERATION_MODE_DEFAULT);
 
 	void onEnter(void);
 	void debug(void);
diff --git a/smartpower3/screens/settingscreen.cpp b/smartpower3/screens/settingscreen.cpp
index b3485dc..5b72600 100644
--- a/smartpower3/screens/settingscreen.cpp
+++ b/smartpower3/screens/settingscreen.cpp
@@ -504,7 +504,6 @@ void SettingScreen::changeOperationMode(device_operation_mode operation_mode)
 {
 	drawMode(operation_mode);
 	operation_mode_edit = operation_mode;
-	//changeOperationMode(operation_mode);
 }
 
 void SettingScreen::selectBLLevel(uint16_t rectangle_color)
diff --git a/smartpower3/screens/settingscreen.h b/smartpower3/screens/settingscreen.h
index 638896b..1fa3f25 100644
--- a/smartpower3/screens/settingscreen.h
+++ b/smartpower3/screens/settingscreen.h
@@ -27,9 +27,6 @@
 #define X_IPADDR 226
 #define X_SSID 172
 
-/*#define LINE_SPACING 42
-#define RIGHT_POSITION_X 460*/
-
 
 enum setting_screen_mode_t {
 	SETTING_SETTING = 0,
@@ -39,7 +36,6 @@ enum setting_screen_mode_t {
 	SETTING_SETTING_OPERATION_MODE,
 };
 
-
 enum screen_state_setting {
 	STATE_SETTING_WIFI_ICON = 1,
 	STATE_SETTING_LOGGING_ICON,
@@ -106,7 +102,6 @@ class SettingScreen : public Screen
 	void drawSerialBaud(uint32_t serial_baud);
 	void drawSerialLoggingEnabled(bool is_enabled=true);
 	void drawWifiLoggingEnabled(bool is_enabled=true);
-	//void popUp(void);
 
 	void drawUDPIpaddr(const char* ipaddr);
 	void drawUDPport(uint16_t port);
@@ -119,7 +114,6 @@ class SettingScreen : public Screen
 	void debug(void);
 private:
 	setting_screen_mode_t mode = SETTING_SETTING;
-	//TFT_eSprite *popup;
 	uint16_t x;
 	uint16_t y;
 	uint8_t backlight_level_preset = 0;
@@ -133,7 +127,6 @@ class SettingScreen : public Screen
 	uint32_t serial_baud_edit = 0;
 	device_operation_mode operation_mode;
 	device_operation_mode operation_mode_edit;
-	//device_operation_mode operation_mode = OPERATION_MODE_DEFAULT;
 	Component *com_serial_baud;
 	Component *com_log_interval;
 	Component *com_ssid;
diff --git a/smartpower3/settings.cpp b/smartpower3/settings.cpp
index 30b557e..567e73c 100644
--- a/smartpower3/settings.cpp
+++ b/smartpower3/settings.cpp
@@ -26,20 +26,14 @@ void Settings::init()
 	this->serial_baud_rate = this->getSerialBaudRate(true);
 	// Logging related
 	this->logging_enabled = this->isLoggingEnabled(true);
-	//this->log_interval_index = this->getLogIntervalIndex(true);
 	this->log_interval = this->getLogInterval(true);
 	this->wifi_ipv4_udp_logging_server_ip_address = this->getWifiIpv4UdpLoggingServerIpAddress(true);
 	this->wifi_ipv4_udp_logging_server_port = this->getWifiIpv4UdpLoggingServerPort(true);
 	// WiFI related
 	this->wifi_enabled = this->isWifiEnabled(true);
 	this->mac_address = this->getMacAddress();
-	//this->wifi_use_ipv4 = true;
-	//bool wifi_use_ipv6 = false;
 	this->wifi_access_point_ssid = this->getWifiAccessPointSsid(true);
 	this->wifi_password = this->getWifiPassword(true);
-//TODO: add settings/checking CREDENTIALS_STATE
-	/*this->wifi_credentials_checked = this->isWifiCredentialsChecked();
-	this->wifi_ipv4_connect_automatically = true;*/
 	this->wifi_ipv4_dhcp_enabled = this->isWifiIpv4DhcpEnabled(true);
 	this->wifi_ipv4_static_ip = this->getWifiIpv4StaticIp(true);
 	this->wifi_ipv4_gateway_address = this->getWifiIpv4GatewayAddress(true);
diff --git a/smartpower3/smartpower3.h b/smartpower3/smartpower3.h
index 4420274..6b23d6e 100644
--- a/smartpower3/smartpower3.h
+++ b/smartpower3/smartpower3.h
@@ -1,6 +1,5 @@
 #include <meas_channel.h>
 #include <Microchip_PAC193x.h>
-//#include <screenmanager.h>
 #include "inputmanager.h"
 #include "settings.h"
 #include "wifimanager.h"
@@ -44,5 +43,3 @@ TaskHandle_t screen_handle;
 TaskHandle_t input_handle;
 TaskHandle_t button_handle;
 TaskHandle_t log_handle;
-//TaskHandle_t encoder_handle;
-
diff --git a/smartpower3/smartpower3.ino b/smartpower3/smartpower3.ino
index ef5a7fd..463b456 100644
--- a/smartpower3/smartpower3.ino
+++ b/smartpower3/smartpower3.ino
@@ -299,13 +299,11 @@ void loop() {
 		screen_manager.dimmingLED(1);
 	}
 #ifdef TASK_STACK_HIGH_WATERMARK_SERIAL_PRINT
-	//Serial.printf("Loop: %u\n\r", uxTaskGetStackHighWaterMark(NULL));
 	Serial.printf("WiFi task: %u\n\r", uxTaskGetStackHighWaterMark(wifi_handle));
 	Serial.printf("Screen task: %u\n\r", uxTaskGetStackHighWaterMark(screen_handle));
 	Serial.printf("Button task: %u\n\r", uxTaskGetStackHighWaterMark(button_handle));
 	Serial.printf("Input task: %u\n\r", uxTaskGetStackHighWaterMark(input_handle));
 	Serial.printf("Log task: %u\n\r", uxTaskGetStackHighWaterMark(log_handle));
-	//Serial.printf("Encoder task: %u\n\r", uxTaskGetStackHighWaterMark(encoder_handle));
 #endif
 #ifdef HEAP_INFO_SERIAL_PRINT
 	heap_caps_print_heap_info(MALLOC_CAP_8BIT);
diff --git a/smartpower3/wifimanager.h b/smartpower3/wifimanager.h
index c76a063..d2633b0 100644
--- a/smartpower3/wifimanager.h
+++ b/smartpower3/wifimanager.h
@@ -50,9 +50,7 @@ class WiFiManager
 	void apDisconnectAndTurnWiFiOff(void);
 	void apInfo(void);
 	String apInfoSaved(void);
-	//char* apInfoSaved(void);
 	String apInfoConnected(void);
-	//char apInfoConnected(void);
 	void udpServerInfo();
 	void udpServerForget(void);
 	void switchWiFiConnection(void);