missing include

PIP_NO_SOCET

CMakeLists.txt

@@ -6,7 +6,7 @@ endif()
 project(PIP)
 set(PIP_MAJOR    5)
 set(PIP_MINOR    5)
-set(PIP_REVISION 1)
+set(PIP_REVISION 2)
 set(PIP_SUFFIX   )
 set(PIP_COMPANY  SHS)
 set(PIP_DOMAIN   org.SHS)
@@ -221,11 +221,18 @@ if (TESTS)
 	add_subdirectory(tests)
 endif()
 
-if(PIP_FREERTOS)
+if(PIP_MICRO)
-	add_definitions(-DPIP_FREERTOS)
+	add_definitions(-DMICRO_PIP)
 	set(ICU OFF)
 	set(LOCAL ON)
 endif()
+if(PIP_FREERTOS)
+	add_definitions(-DPIP_FREERTOS)
+endif()
+if(DEFINED PICO_BOARD)
+	add_definitions(-DPICO_SDK)
+	message(STATUS "Building PIP for Pi Pico SDK ${PICO_SDK_VERSION_STRING}")
+endif()
 
 # Check Bessel functions
 set(CMAKE_REQUIRED_INCLUDES math.h)
@@ -329,7 +336,7 @@ if ((NOT DEFINED SHSTKPROJECT) AND (DEFINED ANDROID_PLATFORM))
 	#message("${ANDROID_NDK}/sysroot/usr/include")
 endif()
 
-if(NOT PIP_FREERTOS)
+if(NOT PIP_MICRO)
 	if(WIN32)
 		if(${C_COMPILER} STREQUAL "cl.exe")
 		else()
@@ -350,7 +357,7 @@ if(NOT PIP_FREERTOS)
 	endif()
 endif()
 set(PIP_LIBS)
-if(PIP_FREERTOS)
+if(PIP_MICRO)
 	set(PIP_LIBS ${LIBS_MAIN})
 else()
 	foreach(LIB_ ${LIBS_MAIN})
@@ -364,11 +371,11 @@ if(WIN32)
 	endif()
 else()
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-	if(DEFINED ENV{QNX_HOST} OR PIP_FREERTOS)
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-32")
-	endif()
 endif()
 set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
+if(DEFINED ENV{QNX_HOST} OR PIP_MICRO)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth-32")
+endif()
 
 set(PCRE2_BUILD_PCRE2_8   OFF)
 set(PCRE2_BUILD_PCRE2_16  ON )
@@ -406,7 +413,7 @@ endif()
 
 
 if (NOT CROSSTOOLS)
-	if (NOT PIP_FREERTOS)
+	if (NOT PIP_MICRO)
 
 		if (PIP_BUILD_CONSOLE)
 			pip_module(console "" "PIP console support" "" "" "")
@@ -624,7 +631,7 @@ string(REPLACE ";" "," PIP_EXPORTS_STR "${PIP_EXPORTS}")
 target_compile_definitions(pip PRIVATE "PICODE_DEFINES=\"${PIP_EXPORTS_STR}\"")
 
 
-if(NOT PIP_FREERTOS)
+if(NOT PIP_MICRO)
 
 # Auxiliary
 	if (NOT CROSSTOOLS)
@@ -701,7 +708,7 @@ if(NOT LOCAL)
 		install(TARGETS ${PIP_MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif()
 else()
-	if(NOT PIP_FREERTOS)
+	if(NOT PIP_MICRO)
 		if(WIN32)
 			install(TARGETS ${PIP_MODULES} RUNTIME DESTINATION bin)
 			install(TARGETS ${PIP_MODULES} ARCHIVE DESTINATION lib)
@@ -729,7 +736,7 @@ endif()
 #
 # Build Documentation
 #
-if ((NOT PIP_FREERTOS) AND (NOT CROSSTOOLS))
+if ((NOT PIP_MICRO) AND (NOT CROSSTOOLS))
 	include(PIPDocumentation)
 	find_package(Doxygen)
 	if(DOXYGEN_FOUND)
@@ -798,7 +805,7 @@ message(" Type   : ${CMAKE_BUILD_TYPE}")
 if (NOT LOCAL)
 	message(" Install: \"${CMAKE_INSTALL_PREFIX}\"")
 else()
-	if(NOT PIP_FREERTOS)
+	if(NOT PIP_MICRO)
 		message(" Install: local \"bin\", \"lib\" and \"include\"")
 	endif()
 endif()
@@ -831,7 +838,7 @@ message(" Utilites:")
 foreach(_util ${PIP_UTILS_LIST})
 	message("  * ${_util}")
 endforeach()
-if(NOT PIP_FREERTOS)
+if(NOT PIP_MICRO)
 	message("")
 	message(" Using libraries:")
 	foreach(LIB_ ${LIBS_STATUS})

cmake/FindPIP.cmake

@@ -71,7 +71,7 @@ if (NOT BUILDING_PIP)
 			find_library(PTHREAD_LIBRARY pthread)
 			find_library(UTIL_LIBRARY util)
 			set(_PIP_ADD_LIBS_ ${PTHREAD_LIBRARY} ${UTIL_LIBRARY})
-			if((NOT DEFINED ENV{QNX_HOST}) AND (NOT APPLE) AND (NOT PIP_FREERTOS))
+			if((NOT DEFINED ENV{QNX_HOST}) AND (NOT APPLE) AND (NOT PIP_MICRO))
 				find_library(RT_LIBRARY rt)
 				list(APPEND _PIP_ADD_LIBS_ ${RT_LIBRARY})
 			endif()

esp-pip/CMakeLists.txt

@@ -17,6 +17,7 @@ list(APPEND COMPONENT_ADD_INCLUDEDIRS "../libs/main/thread")
 set(COMPONENT_PRIV_REQUIRES pthread lwip freertos vfs spi_flash libsodium)
 register_component()
 set(PIP_FREERTOS ON)
+set(PIP_MICRO ON)
 set(LIB OFF)
 set(INCLUDE_DIRS ${IDF_INCLUDE_DIRECTORIES})
 list(APPEND INCLUDE_DIRS $ENV{IDF_PATH}/components/newlib/platform_include)

lang/pip_ru.ts

@@ -622,6 +622,39 @@
         <translation>Ошибка: Режим ReadWrite не поддерживается, используйте WriteOnly или ReadOnly</translation>
     </message>
 </context>
+<context>
+    <name>PIUnitsMass</name>
+    <message>
+        <location filename="../libs/main/units/piunits_class_mass.cpp" line="35"/>
+        <source>g</source>
+        <translation>г</translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_mass.cpp" line="37"/>
+        <source>℥</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_mass.cpp" line="36"/>
+        <source>lb</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_mass.cpp" line="25"/>
+        <source>gram</source>
+        <translation>грамм</translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_mass.cpp" line="27"/>
+        <source>ounce</source>
+        <translation>унция</translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_mass.cpp" line="26"/>
+        <source>pound</source>
+        <translation>фунт</translation>
+    </message>
+</context>
 <context>
     <name>PIUnitsTime</name>
     <message>
@@ -815,15 +848,75 @@
 <context>
     <name>PIUnitsDistance</name>
     <message>
-        <location filename="../libs/main/units/piunits_class_distance.cpp" line="33"/>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="40"/>
+        <source>&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="44"/>
+        <source>Å</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="39"/>
         <source>m</source>
         <translation>м</translation>
     </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="45"/>
+        <source>au</source>
+        <translation>а. е.</translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="42"/>
+        <source>ft</source>
+        <translation>фут</translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="43"/>
+        <source>yd</source>
+        <translation>ярд</translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="27"/>
+        <source>mil</source>
+        <translation>мил</translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="28"/>
+        <source>foot</source>
+        <translation>фут</translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="26"/>
+        <source>inch</source>
+        <translation>дюйм</translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="41"/>
+        <source>thou</source>
+        <translation>мил</translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="29"/>
+        <source>yard</source>
+        <translation>ярд</translation>
+    </message>
     <message>
         <location filename="../libs/main/units/piunits_class_distance.cpp" line="25"/>
         <source>meter</source>
         <translation>метр</translation>
     </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="30"/>
+        <source>angstrom</source>
+        <translation>ангстрем</translation>
+    </message>
+    <message>
+        <location filename="../libs/main/units/piunits_class_distance.cpp" line="31"/>
+        <source>astronomical unit</source>
+        <translation>астрономическая единица</translation>
+    </message>
 </context>
 <context>
     <name>PIUnitsPressure</name>

libs/main/application/pisystemmonitor.cpp

@@ -178,6 +178,9 @@ PISystemTime uint64toST(uint64_t v) {
 void PISystemMonitor::run() {
 	cur_tm.clear();
 	tbid.clear();
+	ProcessStats tstat;
+	tstat.ID = pID_;
+#ifndef PIP_NO_THREADS
 	__PIThreadCollection * pitc = __PIThreadCollection::instance();
 	pitc->lock();
 	PIVector<PIThread *> tv = pitc->threads();
@@ -185,12 +188,10 @@ void PISystemMonitor::run() {
 		if (t->isPIObject()) tbid[t->tid()] = t->name();
 	pitc->unlock();
 	// piCout << tbid.keys().toType<uint>();
-	ProcessStats tstat;
+#  ifdef FREERTOS
-	tstat.ID = pID_;
-#ifdef MICRO_PIP
 	for (auto * t: tv)
 		if (t->isPIObject()) gatherThread(t->tid());
-#else
+#  else // FREERTOS
 #	ifndef WINDOWS
 	double delay_ms = delay_.toMilliseconds();
 	tbid[pID_]      = "main";
@@ -210,7 +211,7 @@ void PISystemMonitor::run() {
 	tstat.cpu_load_user   = 100.f * (PRIVATE->cpu_u_cur - PRIVATE->cpu_u_prev).toMilliseconds() / delay_ms;
 	cycle                 = 0;
 	// piCout << (PRIVATE->cpu_u_cur - PRIVATE->cpu_u_prev).toMilliseconds() / delay_ms;
-#	else
+#	  else  // MAC_OS
 	PRIVATE->file.seekToBegin();
 	PIString str = PIString::fromAscii(PRIVATE->file.readAll());
 	int si = str.find('(') + 1, fi = 0, cc = 1;
@@ -264,8 +265,8 @@ void PISystemMonitor::run() {
 		if (i.flags[PIFile::FileInfo::Dot] || i.flags[PIFile::FileInfo::DotDot]) continue;
 		gatherThread(i.name().toInt());
 	}
-#	endif
+#	  endif // MAC_OS
-#  else
+#	else    // WINDOWS
 	if (GetProcessMemoryInfo(PRIVATE->hProc, &PRIVATE->mem_cnt, sizeof(PRIVATE->mem_cnt)) != 0) {
 		tstat.physical_memsize = PRIVATE->mem_cnt.WorkingSetSize;
 	}
@@ -315,8 +316,9 @@ void PISystemMonitor::run() {
 		tstat.cpu_load_user   = 0.f;
 	}
 	PRIVATE->tm.reset();
-#  endif
+#	endif   // WINDOWS
-#endif
+#  endif     // FREERTOS
+#endif       // PIP_NO_THREADS
 
 	tstat.cpu_load_system = piClampf(tstat.cpu_load_system, 0.f, 100.f);
 	tstat.cpu_load_user   = piClampf(tstat.cpu_load_user, 0.f, 100.f);

libs/main/console/pikbdlistener.cpp

@@ -18,6 +18,8 @@
 */
 #include "pikbdlistener.h"
 
+#ifndef MICRO_PIP
+
 #  include "piincludes_p.h"
 #  include "piliterals.h"
 #  include "piwaitevent_p.h"
@@ -587,3 +589,5 @@ void PIKbdListener::setActive(bool yes) {
 #  endif
 	}
 }
+
+#endif // MICRO_PIP

libs/main/console/pikbdlistener.h

@@ -26,6 +26,10 @@
 #ifndef PIKBDLISTENER_H
 #define PIKBDLISTENER_H
 
+#include "pibase.h"
+
+#ifndef MICRO_PIP
+
 #  include "pithread.h"
 #  include "pitime.h"
 
@@ -305,4 +309,5 @@ REGISTER_PIVARIANTSIMPLE(PIKbdListener::KeyEvent)
 REGISTER_PIVARIANTSIMPLE(PIKbdListener::MouseEvent)
 REGISTER_PIVARIANTSIMPLE(PIKbdListener::WheelEvent)
 
+#endif // MICRO_PIP
 #endif // PIKBDLISTENER_H

libs/main/core/piobject.cpp

@@ -21,6 +21,7 @@
 
 #include "piconditionvar.h"
 #include "pithread.h"
+#include "pitime.h"
 #ifndef MICRO_PIP
 #  include "pifile.h"
 #  include "piiostream.h"

libs/main/core/piwaitevent_p.cpp

@@ -18,6 +18,7 @@
 */
 
 #include "piwaitevent_p.h"
+#ifndef MICRO_PIP
 #  ifdef WINDOWS
 // #  ifdef _WIN32_WINNT
 // #    undef _WIN32_WINNT
@@ -151,3 +152,5 @@ void * PIWaitEvent::getEvent() const {
 	return nullptr;
 #  endif
 }
+
+#endif // MICRO_PIP

libs/main/core/piwaitevent_p.h

@@ -20,6 +20,8 @@
 #ifndef PIWAITEVENT_P_H
 #define PIWAITEVENT_P_H
 
+#ifndef MICRO_PIP
+
 #  include "pibase.h"
 // clang-format off
 #ifdef WINDOWS
@@ -65,4 +67,5 @@ private:
 };
 
 
+#endif // MICRO_PIP
 #endif // PIWAITEVENT_P_H

libs/main/digest/pidigest_siphash_p.cpp

@@ -0,0 +1,58 @@
+/*
+	PIP - Platform Independent Primitives
+	Digest algorithms
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "pidigest_siphash_p.h"
+
+#include "3rd/SipHash/halfsiphash.h"
+#include "3rd/SipHash/siphash.h"
+#include "3rd/SipHash/vectors.h"
+
+
+PIByteArray SipHash::siphash(const PIByteArray & in, const PIByteArray & key, int out_bytes) {
+	PIByteArray ret(out_bytes);
+	static PIByteArray empty_key(16, 0);
+	if (key.isEmpty())
+		::siphash(in.data(), in.size(), empty_key.data(), ret.data(), ret.size());
+	else {
+		if (key.size() >= 16)
+			::siphash(in.data(), in.size(), key.data(), ret.data(), ret.size());
+		else {
+			auto skey = key.resized(16);
+			::siphash(in.data(), in.size(), skey.data(), ret.data(), ret.size());
+		}
+	}
+	return ret;
+}
+
+
+PIByteArray SipHash::halfsiphash(const PIByteArray & in, const PIByteArray & key, int out_bytes) {
+	PIByteArray ret(out_bytes);
+	static PIByteArray empty_key(8, 0);
+	if (key.isEmpty())
+		::halfsiphash(in.data(), in.size(), empty_key.data(), ret.data(), ret.size());
+	else {
+		if (key.size() >= 8)
+			::halfsiphash(in.data(), in.size(), key.data(), ret.data(), ret.size());
+		else {
+			auto skey = key.resized(8);
+			::halfsiphash(in.data(), in.size(), skey.data(), ret.data(), ret.size());
+		}
+	}
+	return ret;
+}

libs/main/digest/pidigest_siphash_p.h

@@ -0,0 +1,31 @@
+/*
+	PIP - Platform Independent Primitives
+	Digest algorithms
+	Ivan Pelipenko peri4ko@yandex.ru
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef pidigest_siphash_h
+#define pidigest_siphash_h
+
+#include "pibytearray.h"
+
+class SipHash {
+public:
+	static PIByteArray siphash(const PIByteArray & in, const PIByteArray & key, int out_bytes);
+	static PIByteArray halfsiphash(const PIByteArray & in, const PIByteArray & key, int out_bytes);
+};
+
+#endif

libs/main/introspection/piintrospection_server_p.cpp

@@ -19,6 +19,8 @@
 
 #include "piintrospection_server_p.h"
 
+#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
+
 #  include "pichunkstream.h"
 #  include "piinit.h"
 #  include "piobject.h"
@@ -170,3 +172,5 @@ void PIIntrospection::unpackObjects(PIByteArray & ba, PIVector<PIIntrospection::
 	objects.clear();
 	ba >> objects;
 }
+
+#endif // #if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)

libs/main/introspection/piintrospection_server_p.h

@@ -27,6 +27,7 @@
 #include "piintrospection_threads_p.h"
 #include "pisystemmonitor.h"
 
+#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
 
 class PIP_EXPORT PIIntrospection {
 public:
@@ -168,4 +169,5 @@ BINARY_STREAM_READ(PIIntrospection::ObjectInfo) {
 	return s;
 }
 
+#endif // #if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
 #endif // PIINTROSPECTION_SERVER_P_H

libs/main/introspection/piintrospection_threads_p.cpp

@@ -19,6 +19,7 @@
 
 #include "piintrospection_threads_p.h"
 
+#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
 
 PIIntrospectionThreads::ThreadInfo::ThreadInfo() {
 	id = delay = 0;
@@ -78,3 +79,5 @@ void PIIntrospectionThreads::threadRunDone(PIThread * t, ullong us) {
 	ThreadInfo & ti(threads[t]);
 	ti.run_us = (ti.run_us * 0.8) + (us * 0.2); /// WARNING
 }
+
+#endif // #if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)

libs/main/introspection/piintrospection_threads_p.h

@@ -20,6 +20,10 @@
 #ifndef PIINTROSPECTION_THREADS_P_H
 #define PIINTROSPECTION_THREADS_P_H
 
+#include "pibase.h"
+
+#if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
+
 #include "pimap.h"
 #include "pithread.h"
 
@@ -68,4 +72,5 @@ BINARY_STREAM_READ(PIIntrospectionThreads::ThreadInfo) {
 	return s;
 }
 
+#endif // #if defined(PIP_INTROSPECTION) && !defined(PIP_FORCE_NO_PIINTROSPECTION)
 #endif // PIINTROSPECTION_THREADS_P_H

libs/main/io_devices/pican.cpp

@@ -20,7 +20,7 @@
 
 #include "pipropertystorage.h"
 #include "piwaitevent_p.h"
-#if !defined(WINDOWS) && !defined(MAC_OS) && !defined(MICRO_PIP)
+#if !defined(WINDOWS) && !defined(MAC_OS) && !defined(PIP_NO_SOCKET)
 #  define PIP_CAN
 #endif
 #ifdef PIP_CAN
@@ -39,25 +39,29 @@
 
 REGISTER_DEVICE(PICAN)
 
-
+#ifdef PIP_CAN
 PRIVATE_DEFINITION_START(PICAN)
 	PIWaitEvent event;
 PRIVATE_DEFINITION_END(PICAN)
-
+#endif
 
 PICAN::PICAN(const PIString & path, PIIODevice::DeviceMode mode): PIIODevice(path, mode) {
 	setThreadedReadBufferSize(256);
 	setPath(path);
+#ifdef PIP_CAN
 	can_id = 0;
 	sock   = 0;
 	PRIVATE->event.create();
+#endif
 }
 
 
 PICAN::~PICAN() {
 	stopAndWait();
 	close();
+#ifdef PIP_CAN
 	PRIVATE->event.destroy();
+#endif
 }
 
 
@@ -164,7 +168,9 @@ int PICAN::readedCANID() const {
 
 
 void PICAN::interrupt() {
+#ifdef PIP_CAN
 	PRIVATE->event.interrupt();
+#endif
 }
 
 

libs/main/io_devices/piethernet.cpp

@@ -18,6 +18,8 @@
 */
 #include "piethernet.h"
 
+#ifndef PIP_NO_SOCKET
+
 #  include "piconfig.h"
 #  include "piconstchars.h"
 #  include "piincludes_p.h"
@@ -25,7 +27,7 @@
 #  include "pipropertystorage.h"
 #  include "pisysteminfo.h"
 #  include "pitranslator.h"
-// clang-format off
+
 #  ifdef QNX
 #	include <arpa/inet.h>
 #	include <fcntl.h>
@@ -49,21 +51,21 @@
 #  else
 #	ifdef WINDOWS
 #	  include <io.h>
-#    include <winsock2.h>
 #	  include <iphlpapi.h>
 #	  include <psapi.h>
+#	  include <winsock2.h>
 #	  include <ws2tcpip.h>
 #	  define ip_mreqn    ip_mreq
 #	  define imr_address imr_interface
 #	else
+#	  include <arpa/inet.h>
 #	  include <fcntl.h>
-#    include <sys/ioctl.h>
+#	  include <net/if.h>
+#	  include <netdb.h>
 #	  include <netinet/in.h>
 #	  include <netinet/tcp.h>
-#    include <arpa/inet.h>
+#	  include <sys/ioctl.h>
 #	  include <sys/socket.h>
-#    include <netdb.h>
-#    include <net/if.h>
 #	  if !defined(ANDROID) && !defined(LWIP)
 #		include <ifaddrs.h>
 #	  endif
@@ -72,7 +74,6 @@
 #	  endif
 #	endif
 #  endif
-// clang-format on
 #  include "piwaitevent_p.h"
 
 #  include <errno.h>
@@ -196,7 +197,7 @@ void PIEthernet::construct() {
 	setMulticastTTL(1);
 	server_thread_.setData(this);
 	server_thread_.setName("_S.tcpserver"_a);
-#ifdef MICRO_PIP
+#  ifdef LWIP
 	setThreadedReadBufferSize(512);
 #  else
 	setThreadedReadBufferSize(64_KiB);
@@ -1170,7 +1171,7 @@ PIEthernet::InterfaceList PIEthernet::interfaces() {
 	}
 	if (pAdapterInfo) HeapFree(GetProcessHeap(), 0, pAdapterInfo);
 #  else
-#  ifdef MICRO_PIP
+#	ifdef LWIP
 #	else
 #	  ifdef ANDROID
 	struct ifconf ifc;
@@ -1282,7 +1283,7 @@ PIEthernet::InterfaceList PIEthernet::interfaces() {
 
 
 PINetworkAddress PIEthernet::interfaceAddress(const PIString & interface_) {
-#if defined(WINDOWS) || defined(MICRO_PIP)
+#  if defined(WINDOWS) || defined(LWIP)
 	piCout << "[PIEthernet] Not implemented, use \"PIEthernet::allAddresses\" or \"PIEthernet::interfaces\" instead";
 	return PINetworkAddress();
 #  else
@@ -1486,3 +1487,5 @@ bool PIEthernet::ethIsWriteable(int sock) {
 	return ret == 0;
 #  endif
 }
+
+#endif // PIP_NO_SOCKET

libs/main/io_devices/piethernet.h

@@ -26,9 +26,12 @@
 #ifndef PIETHERNET_H
 #define PIETHERNET_H
 
+
 #include "piiodevice.h"
 #include "pinetworkaddress.h"
 
+#ifndef PIP_NO_SOCKET
+
 #  ifdef ANDROID
 struct
 #  else
@@ -536,4 +539,5 @@ inline bool operator!=(const PIEthernet::Interface & v0, const PIEthernet::Inter
 	return (v0.name != v1.name || v0.address != v1.address || v0.netmask != v1.netmask);
 }
 
+#endif // PIP_NO_SOCKET
 #endif // PIETHERNET_H

libs/main/io_devices/pifile.cpp

@@ -45,7 +45,7 @@
 #  include <utime.h>
 #endif
 #define S_IFHDN 0x40
-#if defined(QNX) || defined(ANDROID) || defined(FREERTOS)
+#if defined(QNX) || defined(ANDROID) || defined(MICRO_PIP)
 #  define _fopen_call_  fopen
 #  define _fseek_call_  fseek
 #  define _ftell_call_  ftell

libs/main/io_devices/piserial.cpp

@@ -19,6 +19,8 @@
 
 #include "piserial.h"
 
+#ifndef MICRO_PIP
+
 #  include "piconfig.h"
 #  include "pidir.h"
 #  include "piincludes_p.h"
@@ -29,9 +31,6 @@
 
 #  include <errno.h>
 
-#if defined(MICRO_PIP)
-#  define PISERIAL_NO_PINS
-#endif
 #  if defined(PISERIAL_NO_PINS) || defined(WINDOWS)
 #	define TIOCM_LE  1
 #	define TIOCM_DTR 4
@@ -1318,3 +1317,5 @@ void PISerial::threadedReadBufferSizeChanged() {
 	// piCoutObj << "a" << ss.xmit_fifo_size;
 #  endif
 }
+
+#endif // MICRO_PIP

libs/main/piplatform.h

@@ -51,8 +51,14 @@
 #ifdef PIP_FREERTOS
 #  define FREERTOS
 #endif
-#if defined(FREERTOS) || defined(PLATFORMIO)
+#ifdef MICRO_PIP
-#  define MICRO_PIP
+#  ifndef FREERTOS
+#	define PIP_NO_THREADS
+#  endif
+#  ifndef LWIP
+#	define PIP_NO_SOCKET
+#  endif
+#  define PISERIAL_NO_PINS
 #endif
 #ifndef WINDOWS
 #  ifndef QNX

libs/main/system/pihidevice.cpp

@@ -15,6 +15,8 @@
 #  include <unistd.h>
 #else
 // clang-format off
+#  undef _WIN32_WINNT
+#  define _WIN32_WINNT 0x0600
 #  include <windows.h>
 #  include <setupapi.h>
 extern "C" {

libs/main/types/pivariant.cpp

@@ -130,6 +130,18 @@ void PIVariant::setValueFromString(const PIString & v) {
 	case PIVariant::pivLDouble: {
 		setValue(v.toLDouble());
 	} break;
+	case PIVariant::pivComplexf: {
+		PIStringList sl = v.mid(1, v.size_s() - 2).split(';');
+		setValue(complexf(sl.size() > 0 ? sl[0].toFloat() : 0.f, sl.size() > 1 ? sl[1].toFloat() : 0.f));
+	}
+	case PIVariant::pivComplexd: {
+		PIStringList sl = v.mid(1, v.size_s() - 2).split(';');
+		setValue(complexd(sl.size() > 0 ? sl[0].toDouble() : 0., sl.size() > 1 ? sl[1].toDouble() : 0.));
+	}
+	case PIVariant::pivComplexld: {
+		PIStringList sl = v.mid(1, v.size_s() - 2).split(';');
+		setValue(complexld(sl.size() > 0 ? sl[0].toLDouble() : 0.L, sl.size() > 1 ? sl[1].toLDouble() : 0.L));
+	}
 	case PIVariant::pivTime: {
 		setValue(PITime::fromString(v));
 	} break;
@@ -242,6 +254,7 @@ PIVariant::Type PIVariant::typeFromName(const PIString & tname) {
 	if (s == "float") return PIVariant::pivFloat;
 	if (s == "double" || s == "real") return PIVariant::pivDouble;
 	if (s == "ldouble" || s == "longdouble") return PIVariant::pivLDouble;
+	if (s == "complexf" || s == "complex<float>") return PIVariant::pivComplexf;
 	if (s == "complexd" || s == "complex<double>") return PIVariant::pivComplexd;
 	if (s == "complexld" || s == "complex<ldouble>" || s == "complex<longdouble>") return PIVariant::pivComplexld;
 	if (s == "pibitarray" || s == "bitarray") return PIVariant::pivBitArray;
@@ -286,6 +299,7 @@ PIVariant::Type PIVariant::typeFromID(uint type_id) {
 	if (type_id == typeID<float>()) return PIVariant::pivFloat;
 	if (type_id == typeID<double>()) return PIVariant::pivDouble;
 	if (type_id == typeID<ldouble>()) return PIVariant::pivLDouble;
+	if (type_id == typeID<complexf>()) return PIVariant::pivComplexf;
 	if (type_id == typeID<complexd>()) return PIVariant::pivComplexd;
 	if (type_id == typeID<complexld>()) return PIVariant::pivComplexld;
 	if (type_id == typeID<PIBitArray>()) return PIVariant::pivBitArray;
@@ -336,6 +350,7 @@ uint PIVariant::typeIDFromType(Type type) {
 	case (PIVariant::pivFloat         ): return typeID<float                    >();
 	case (PIVariant::pivDouble        ): return typeID<double                   >();
 	case (PIVariant::pivLDouble       ): return typeID<ldouble                  >();
+	case (PIVariant::pivComplexf      ): return typeID<complexf                 >();
 	case (PIVariant::pivComplexd      ): return typeID<complexd                 >();
 	case (PIVariant::pivComplexld     ): return typeID<complexld                >();
 	case (PIVariant::pivBitArray      ): return typeID<PIBitArray               >();
@@ -451,6 +466,7 @@ PIString PIVariant::typeName(PIVariant::Type type) {
 	case PIVariant::pivFloat: return "Float";
 	case PIVariant::pivDouble: return "Double";
 	case PIVariant::pivLDouble: return "LDouble";
+	case PIVariant::pivComplexf: return "Complexf";
 	case PIVariant::pivComplexd: return "Complexd";
 	case PIVariant::pivComplexld: return "Complexld";
 	case PIVariant::pivBitArray: return "BitArray";
@@ -691,6 +707,21 @@ int PIVariant::toInt() const {
 		ba >> r;
 		return r;
 	}
+	case PIVariant::pivComplexf: {
+		complexf r;
+		ba >> r;
+		return r.real();
+	}
+	case PIVariant::pivComplexd: {
+		complexd r;
+		ba >> r;
+		return r.real();
+	}
+	case PIVariant::pivComplexld: {
+		complexld r;
+		ba >> r;
+		return r.real();
+	}
 	case PIVariant::pivString: {
 		PIString r;
 		ba >> r;
@@ -806,6 +837,21 @@ llong PIVariant::toLLong() const {
 		ba >> r;
 		return r;
 	}
+	case PIVariant::pivComplexf: {
+		complexf r;
+		ba >> r;
+		return r.real();
+	}
+	case PIVariant::pivComplexd: {
+		complexd r;
+		ba >> r;
+		return r.real();
+	}
+	case PIVariant::pivComplexld: {
+		complexld r;
+		ba >> r;
+		return r.real();
+	}
 	case PIVariant::pivString: {
 		PIString r;
 		ba >> r;
@@ -916,6 +962,21 @@ float PIVariant::toFloat() const {
 		ba >> r;
 		return r;
 	}
+	case PIVariant::pivComplexf: {
+		complexf r;
+		ba >> r;
+		return r.real();
+	}
+	case PIVariant::pivComplexd: {
+		complexd r;
+		ba >> r;
+		return r.real();
+	}
+	case PIVariant::pivComplexld: {
+		complexld r;
+		ba >> r;
+		return r.real();
+	}
 	case PIVariant::pivString: {
 		PIString r;
 		ba >> r;
@@ -1026,6 +1087,21 @@ double PIVariant::toDouble() const {
 		ba >> r;
 		return r;
 	}
+	case PIVariant::pivComplexf: {
+		complexf r;
+		ba >> r;
+		return r.real();
+	}
+	case PIVariant::pivComplexd: {
+		complexd r;
+		ba >> r;
+		return r.real();
+	}
+	case PIVariant::pivComplexld: {
+		complexld r;
+		ba >> r;
+		return r.real();
+	}
 	case PIVariant::pivString: {
 		PIString r;
 		ba >> r;
@@ -1136,6 +1212,21 @@ ldouble PIVariant::toLDouble() const {
 		ba >> r;
 		return r;
 	}
+	case PIVariant::pivComplexf: {
+		complexf r;
+		ba >> r;
+		return r.real();
+	}
+	case PIVariant::pivComplexd: {
+		complexd r;
+		ba >> r;
+		return r.real();
+	}
+	case PIVariant::pivComplexld: {
+		complexld r;
+		ba >> r;
+		return r.real();
+	}
 	case PIVariant::pivString: {
 		PIString r;
 		ba >> r;
@@ -1164,6 +1255,96 @@ ldouble PIVariant::toLDouble() const {
 }
 
 
+complexf PIVariant::toComplexF() const {
+	PIByteArray ba(_content);
+	switch (_type) {
+	case PIVariant::pivComplexf: {
+		complexf r;
+		ba >> r;
+		return r;
+	}
+	case PIVariant::pivComplexd: {
+		complexd r;
+		ba >> r;
+		return complexf(r.real(), r.imag());
+	}
+	case PIVariant::pivComplexld: {
+		complexld r;
+		ba >> r;
+		return complexf(r.real(), r.imag());
+	}
+	case PIVariant::pivMathVector: {
+		PIMathVectord r;
+		ba >> r;
+		return complexf(r.size() > 0 ? r[0] : 0., r.size() > 1 ? r[1] : 0.);
+	}
+	case PIVariant::pivCustom: return getAsValue<complexf>(*this);
+	default: return complexf(toFloat(), 0.f);
+	}
+	return complexf();
+}
+
+
+complexd PIVariant::toComplexD() const {
+	PIByteArray ba(_content);
+	switch (_type) {
+	case PIVariant::pivComplexf: {
+		complexf r;
+		ba >> r;
+		return complexd(r.real(), r.imag());
+	}
+	case PIVariant::pivComplexd: {
+		complexd r;
+		ba >> r;
+		return r;
+	}
+	case PIVariant::pivComplexld: {
+		complexld r;
+		ba >> r;
+		return complexd(r.real(), r.imag());
+	}
+	case PIVariant::pivMathVector: {
+		PIMathVectord r;
+		ba >> r;
+		return complexd(r.size() > 0 ? r[0] : 0., r.size() > 1 ? r[1] : 0.);
+	}
+	case PIVariant::pivCustom: return getAsValue<complexd>(*this);
+	default: return complexd(toDouble(), 0.f);
+	}
+	return complexd();
+}
+
+
+complexld PIVariant::toComplexLD() const {
+	PIByteArray ba(_content);
+	switch (_type) {
+	case PIVariant::pivComplexf: {
+		complexf r;
+		return complexld(r.real(), r.imag());
+		ba >> r;
+	}
+	case PIVariant::pivComplexd: {
+		complexd r;
+		ba >> r;
+		return complexld(r.real(), r.imag());
+	}
+	case PIVariant::pivComplexld: {
+		complexld r;
+		ba >> r;
+		return r;
+	}
+	case PIVariant::pivMathVector: {
+		PIMathVectord r;
+		ba >> r;
+		return complexld(r.size() > 0 ? r[0] : 0., r.size() > 1 ? r[1] : 0.);
+	}
+	case PIVariant::pivCustom: return getAsValue<complexld>(*this);
+	default: return complexld(toLDouble(), 0.f);
+	}
+	return complexld();
+}
+
+
 //! \~\brief
 //! \~english Returns variant content as time
 //! \~russian Возвращает содержимое как время
@@ -1418,6 +1599,21 @@ PIString PIVariant::toString() const {
 		ba >> r;
 		return PIString::fromNumber(r);
 	}
+	case PIVariant::pivComplexf: {
+		complexf r;
+		ba >> r;
+		return "(" + PIString::fromNumber(r.real()) + ";" + PIString::fromNumber(r.imag()) + ")";
+	}
+	case PIVariant::pivComplexd: {
+		complexd r;
+		ba >> r;
+		return "(" + PIString::fromNumber(r.real()) + ";" + PIString::fromNumber(r.imag()) + ")";
+	}
+	case PIVariant::pivComplexld: {
+		complexld r;
+		ba >> r;
+		return "(" + PIString::fromNumber(r.real()) + ";" + PIString::fromNumber(r.imag()) + ")";
+	}
 	case PIVariant::pivTime: {
 		PITime r;
 		ba >> r;
@@ -1910,21 +2106,45 @@ PINetworkAddress PIVariant::toNetworkAddress() const {
 //! Для остальных типов возвращает пустой PIMathVectord.
 //!
 PIMathVectord PIVariant::toMathVector() const {
+	PIMathVectord ret;
 	PIByteArray ba(_content);
-	if (_type == PIVariant::pivMathVector) {
+	if (_type == PIVariant::pivComplexf) {
-		PIMathVectord r;
+		complexf r;
 		ba >> r;
-		return r;
+		ret.resize(2);
+		ret[0] = r.real();
+		ret[1] = r.imag();
+		return ret;
+	}
+	if (_type == PIVariant::pivComplexd) {
+		complexd r;
+		ba >> r;
+		ret.resize(2);
+		ret[0] = r.real();
+		ret[1] = r.imag();
+		return ret;
+	}
+	if (_type == PIVariant::pivComplexld) {
+		complexld r;
+		ba >> r;
+		ret.resize(2);
+		ret[0] = r.real();
+		ret[1] = r.imag();
+		return ret;
+	}
+	if (_type == PIVariant::pivMathVector) {
+		ba >> ret;
+		return ret;
 	}
 	if (_type == PIVariant::pivPoint) {
 		PIPointd r;
 		ba >> r;
-		PIMathVectord ret(2);
+		ret.resize(2);
 		ret[0] = r.x;
 		ret[1] = r.y;
 		return ret;
 	}
-	return PIMathVectord();
+	return ret;
 }
 
 

libs/main/types/pivariant.h

@@ -260,6 +260,7 @@ public:
 		pivMathMatrix /** PIMathMatrix<double> */,
 		pivLine /** PILine<double> */,
 		pivNetworkAddress /** PINetworkAddress */,
+		pivComplexf /** complexf */,
 		pivCustom /** \~english Custom \~russian Свой тип */ = 0xFF
 	};
 
@@ -327,6 +328,18 @@ public:
 	//! \~russian Создает %PIVariant из вещественного числа.
 	PIVariant(const ldouble & v) { initType(v); }
 
+	//! \~english Constructs %PIVariant from complex number.
+	//! \~russian Создает %PIVariant из комплексного числа.
+	PIVariant(const complexf & v) { initType(v); }
+
+	//! \~english Constructs %PIVariant from complex number.
+	//! \~russian Создает %PIVariant из комплексного числа.
+	PIVariant(const complexd & v) { initType(v); }
+
+	//! \~english Constructs %PIVariant from complex number.
+	//! \~russian Создает %PIVariant из комплексного числа.
+	PIVariant(const complexld & v) { initType(v); }
+
 	//! \~english Constructs %PIVariant from bit array.
 	//! \~russian Создает %PIVariant из массива битов.
 	PIVariant(const PIBitArray & v) { initType(v); }
@@ -456,6 +469,18 @@ public:
 	//! \~russian Устанавливает значение и тип из вещественного числа
 	void setValue(const ldouble & v) { initType(v); }
 
+	//! \~english Set variant content and type to complex
+	//! \~russian Устанавливает значение и тип из комплексного числа
+	void setValue(const complexf & v) { initType(v); }
+
+	//! \~english Set variant content and type to complex
+	//! \~russian Устанавливает значение и тип из комплексного числа
+	void setValue(const complexd & v) { initType(v); }
+
+	//! \~english Set variant content and type to complex
+	//! \~russian Устанавливает значение и тип из комплексного числа
+	void setValue(const complexld & v) { initType(v); }
+
 	//! \~english Set variant content and type to bit array
 	//! \~russian Устанавливает значение и тип из массива битов
 	void setValue(const PIBitArray & v) { initType(v); }
@@ -545,6 +570,9 @@ public:
 	float toFloat() const;
 	double toDouble() const;
 	ldouble toLDouble() const;
+	complexf toComplexF() const;
+	complexd toComplexD() const;
+	complexld toComplexLD() const;
 	PITime toTime() const;
 	PIDate toDate() const;
 	PIDateTime toDateTime() const;
@@ -680,6 +708,27 @@ public:
 		return *this;
 	}
 
+	//! \~english Assign operator.
+	//! \~russian Оператор присваивания.
+	PIVariant & operator=(const complexf & v) {
+		setValue(v);
+		return *this;
+	}
+
+	//! \~english Assign operator.
+	//! \~russian Оператор присваивания.
+	PIVariant & operator=(const complexd & v) {
+		setValue(v);
+		return *this;
+	}
+
+	//! \~english Assign operator.
+	//! \~russian Оператор присваивания.
+	PIVariant & operator=(const complexld & v) {
+		setValue(v);
+		return *this;
+	}
+
 	//! \~english Assign operator.
 	//! \~russian Оператор присваивания.
 	PIVariant & operator=(const PIBitArray & v) {
@@ -994,6 +1043,9 @@ template<> inline ullong PIVariant::value() const {return (ullong)toLLong();}
 template<> inline float PIVariant::value() const {return toFloat();}
 template<> inline double PIVariant::value() const {return toDouble();}
 template<> inline ldouble PIVariant::value() const {return toLDouble();}
+template<> inline complexf PIVariant::value() const {return  toComplexF();}
+template<> inline complexd PIVariant::value() const {return  toComplexD();}
+template<> inline complexld PIVariant::value() const {return toComplexLD();}
 template<> inline void* PIVariant::value() const {return (void*)toLLong();}
 template<> inline const char* PIVariant::value() const {return toString().data();}
 template<> inline PITime PIVariant::value() const {return toTime();}
@@ -1027,6 +1079,9 @@ template<> inline PIVariant PIVariant::fromValue(const ullong & v) {return PIVar
 template<> inline PIVariant PIVariant::fromValue(const float & v) {return PIVariant(v);}
 template<> inline PIVariant PIVariant::fromValue(const double & v) {return PIVariant(v);}
 template<> inline PIVariant PIVariant::fromValue(const ldouble & v) {return PIVariant(v);}
+template<> inline PIVariant PIVariant::fromValue(const complexf & v) {return PIVariant(v);}
+template<> inline PIVariant PIVariant::fromValue(const complexd & v) {return PIVariant(v);}
+template<> inline PIVariant PIVariant::fromValue(const complexld & v) {return PIVariant(v);}
 template<> inline PIVariant PIVariant::fromValue(const PIBitArray & v) {return PIVariant(v);}
 template<> inline PIVariant PIVariant::fromValue(const PIByteArray & v) {return PIVariant(v);}
 template<> inline PIVariant PIVariant::fromValue(const PIString & v) {return PIVariant(v);}
@@ -1060,6 +1115,9 @@ template<> inline PIVariant::Type PIVariant::getType<ullong>() {return PIVariant
 template<> inline PIVariant::Type PIVariant::getType<float>() {return PIVariant::pivFloat;}
 template<> inline PIVariant::Type PIVariant::getType<double>() {return PIVariant::pivDouble;}
 template<> inline PIVariant::Type PIVariant::getType<ldouble>() {return PIVariant::pivLDouble;}
+template<> inline PIVariant::Type PIVariant::getType<complexf>() {return PIVariant:: pivComplexf;}
+template<> inline PIVariant::Type PIVariant::getType<complexd>() {return PIVariant:: pivComplexd;}
+template<> inline PIVariant::Type PIVariant::getType<complexld>() {return PIVariant::pivComplexld;}
 template<> inline PIVariant::Type PIVariant::getType<PIBitArray>() {return PIVariant::pivBitArray;}
 template<> inline PIVariant::Type PIVariant::getType<PIByteArray>() {return PIVariant::pivByteArray;}
 template<> inline PIVariant::Type PIVariant::getType<PIString>() {return PIVariant::pivString;}
@@ -1093,6 +1151,9 @@ REGISTER_VARIANT(ullong)
 REGISTER_VARIANT(float)
 REGISTER_VARIANT(double)
 REGISTER_VARIANT(ldouble)
+REGISTER_VARIANT(complexf)
+REGISTER_VARIANT(complexd)
+REGISTER_VARIANT(complexld)
 REGISTER_VARIANT(PIBitArray)
 REGISTER_VARIANT(PIByteArray)
 REGISTER_VARIANT(PIString)

libs/main/units/piunits.h

@@ -29,6 +29,7 @@
 #include "piunits_class_angle.h"
 #include "piunits_class_distance.h"
 #include "piunits_class_information.h"
+#include "piunits_class_mass.h"
 #include "piunits_class_pressure.h"
 #include "piunits_class_temperature.h"
 #include "piunits_class_time.h"

libs/main/units/piunits_class_distance.cpp

@@ -23,6 +23,12 @@
 PIString PIUnits::Class::Distance::name(int type) const {
 	switch (type) {
 	case Meter: return "meter"_tr("PIUnitsDistance");
+	case Inch: return "inch"_tr("PIUnitsDistance");
+	case Mil: return "mil"_tr("PIUnitsDistance");
+	case Foot: return "foot"_tr("PIUnitsDistance");
+	case Yard: return "yard"_tr("PIUnitsDistance");
+	case Angstrom: return "angstrom"_tr("PIUnitsDistance");
+	case AstronomicalUnit: return "astronomical unit"_tr("PIUnitsDistance");
 	}
 	return Class::Internal::unknown;
 }
@@ -31,16 +37,42 @@ PIString PIUnits::Class::Distance::name(int type) const {
 PIString PIUnits::Class::Distance::unit(int type) const {
 	switch (type) {
 	case Meter: return "m"_tr("PIUnitsDistance");
+	case Inch: return "\""_tr("PIUnitsDistance");
+	case Mil: return "thou"_tr("PIUnitsDistance");
+	case Foot: return "ft"_tr("PIUnitsDistance");
+	case Yard: return "yd"_tr("PIUnitsDistance");
+	case Angstrom: return "Å"_tr("PIUnitsDistance");
+	case AstronomicalUnit: return "au"_tr("PIUnitsDistance");
 	}
 	return Class::Internal::unknown;
 }
 
 
 double PIUnits::Class::Distance::convert(double v, int from, int to) const {
-	switch (to) {
+	static constexpr double inch_to_m              = 0.254;
-	case Meter: return v;
+	static constexpr double mil_to_m               = 0.254 * 1E-3;
+	static constexpr double foot_to_m              = 0.3048;
+	static constexpr double yard_to_m              = 0.9144;
+	static constexpr double angstrom_to_m          = 1E-10;
+	static constexpr double astronomical_unit_to_m = 149597870700.;
+	double m                                       = v;
+	switch (from) {
+	case Inch: m *= inch_to_m; break;
+	case Mil: m *= mil_to_m; break;
+	case Foot: m *= foot_to_m; break;
+	case Yard: m *= yard_to_m; break;
+	case Angstrom: m *= angstrom_to_m; break;
+	case AstronomicalUnit: m *= astronomical_unit_to_m; break;
 	}
-	return v;
+	switch (to) {
+	case Inch: m /= inch_to_m; break;
+	case Mil: m /= mil_to_m; break;
+	case Foot: m /= foot_to_m; break;
+	case Yard: m /= yard_to_m; break;
+	case Angstrom: m /= angstrom_to_m; break;
+	case AstronomicalUnit: m /= astronomical_unit_to_m; break;
+	}
+	return m;
 }
 
 
@@ -50,12 +82,12 @@ PIString PIUnits::Class::Distance::valueToString(double v, char format, int prec
 
 
 bool PIUnits::Class::Distance::supportPrefixes(int type) const {
-	return true;
+	return type == Meter;
 }
 
 
 bool PIUnits::Class::Distance::supportPrefixesNon3(int type) const {
-	return true;
+	return type == Meter;
 }
 
 

libs/main/units/piunits_class_distance.h

@@ -31,6 +31,14 @@
 DECLARE_UNIT_CLASS_BEGIN(Distance, 0x600)
 	enum {
 		Meter = typeStart,
+		Inch,
+		Mil,
+		Foot,
+		Yard,
+
+		Angstrom,
+		AstronomicalUnit,
+
 		_LastType,
 	};
 DECLARE_UNIT_CLASS_END(Distance)

libs/main/units/piunits_class_mass.cpp

@@ -0,0 +1,81 @@
+/*
+    PIP - Platform Independent Primitives
+	Mass units
+    Ivan Pelipenko peri4ko@yandex.ru
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "piunits_class_mass.h"
+
+
+PIString PIUnits::Class::Mass::name(int type) const {
+	switch (type) {
+	case Gram: return "gram"_tr("PIUnitsMass");
+	case Pound: return "pound"_tr("PIUnitsMass");
+	case Ounce: return "ounce"_tr("PIUnitsMass");
+	}
+	return Class::Internal::unknown;
+}
+
+
+PIString PIUnits::Class::Mass::unit(int type) const {
+	switch (type) {
+	case Gram: return "g"_tr("PIUnitsMass");
+	case Pound: return "lb"_tr("PIUnitsMass");
+	case Ounce: return "℥"_tr("PIUnitsMass");
+	}
+	return Class::Internal::unknown;
+}
+
+
+double PIUnits::Class::Mass::convert(double v, int from, int to) const {
+	static constexpr double pound_to_g = 453.59237;
+	static constexpr double ounce_to_g = 28.349523125;
+	double g                           = v;
+	switch (from) {
+	case Pound: g *= pound_to_g; break;
+	case Ounce: g *= ounce_to_g; break;
+	}
+	switch (to) {
+	case Pound: g /= pound_to_g; break;
+	case Ounce: g /= ounce_to_g; break;
+	}
+	return g;
+}
+
+
+PIString PIUnits::Class::Mass::valueToString(double v, char format, int prec) const {
+	return PIString::fromNumber(v, format, prec);
+}
+
+
+bool PIUnits::Class::Mass::supportPrefixes(int type) const {
+	return type == Gram;
+}
+
+
+bool PIUnits::Class::Mass::supportPrefixesNon3(int type) const {
+	return false;
+}
+
+
+bool PIUnits::Class::Mass::supportPrefixesGreater(int type) const {
+	return ClassBase::supportPrefixesGreater(type);
+}
+
+
+bool PIUnits::Class::Mass::supportPrefixesSmaller(int type) const {
+	return ClassBase::supportPrefixesSmaller(type);
+}

libs/main/units/piunits_class_mass.h

@@ -0,0 +1,40 @@
+/*! \file piunits_class_distance.h
+ * \ingroup Core
+ * \~\brief
+ * \~english Mass units
+ * \~russian Единицы измерения массы
+ */
+/*
+    PIP - Platform Independent Primitives
+	Mass units
+    Ivan Pelipenko peri4ko@yandex.ru
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PIUNITS_CLASS_MASS_H
+#define PIUNITS_CLASS_MASS_H
+
+#include "piunits_base.h"
+
+DECLARE_UNIT_CLASS_BEGIN(Mass, 0x700)
+	enum {
+		Gram = typeStart,
+		Pound,
+		Ounce,
+		_LastType,
+	};
+DECLARE_UNIT_CLASS_END(Mass)
+
+#endif