SHS/pip
4
3
Fork 0
Code Issues 16 Pull Requests 2 Actions Releases Wiki Activity

fix: address review issues from MICRO_PIP migration

Browse Source 
- piconditionvar.h: remove phantom wait(lk, timeout) stubs not in real class
- pithread.h: remove duplicate #ifndef PIP_NO_THREADS guard
- piscreendrawer/tile/tiles.cpp: remove duplicate #if !defined(PICO_SDK)
- cmake/FindPIP.cmake: replace PIP_MICRO with PIP_EMBEDDED
This commit is contained in:
andrey
2026-08-11 15:26:55 +03:00
parent 399ae3a20c
commit fd578ea927
6 changed files with 29 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/FindPIP.cmake
+1 -1
View File
@@ -72,7 +72,7 @@ if (NOT BUILDING_PIP)
find_library(PTHREAD_LIBRARY pthread) find_library(PTHREAD_LIBRARY pthread)
find_library(UTIL_LIBRARY util) find_library(UTIL_LIBRARY util)
set(_PIP_ADD_LIBS_ ${PTHREAD_LIBRARY} ${UTIL_LIBRARY}) set(_PIP_ADD_LIBS_ ${PTHREAD_LIBRARY} ${UTIL_LIBRARY})
if((NOT DEFINED ENV{QNX_HOST}) AND (NOT APPLE) AND (NOT PIP_MICRO)) if((NOT DEFINED ENV{QNX_HOST}) AND (NOT APPLE) AND (NOT PIP_EMBEDDED))
find_library(RT_LIBRARY rt) find_library(RT_LIBRARY rt)
list(APPEND _PIP_ADD_LIBS_ ${RT_LIBRARY}) list(APPEND _PIP_ADD_LIBS_ ${RT_LIBRARY})
endif() endif()
libs/console/piscreendrawer.cpp
-4
View File
@@ -21,8 +21,6 @@
#if !defined(PICO_SDK) #if !defined(PICO_SDK)
#if !defined(PICO_SDK)
// comment for use ascii instead of unicode symbols // comment for use ascii instead of unicode symbols
# define USE_UNICODE # define USE_UNICODE
@@ -270,5 +268,3 @@ void PIScreenDrawer::drawText(int x, int y, const PIString & s, Color col_char,
} }
#endif // !PICO_SDK #endif // !PICO_SDK
#endif // !PICO_SDK
libs/console/piscreentile.cpp
-4
View File
@@ -23,8 +23,6 @@
#if !defined(PICO_SDK) #if !defined(PICO_SDK)
#if !defined(PICO_SDK)
using namespace PIScreenTypes; using namespace PIScreenTypes;
@@ -261,5 +259,3 @@ void PIScreenTile::layout() {
} }
#endif // !PICO_SDK #endif // !PICO_SDK
#endif // !PICO_SDK
libs/console/piscreentiles.cpp
-4
View File
@@ -23,8 +23,6 @@
#if !defined(PICO_SDK) #if !defined(PICO_SDK)
#if !defined(PICO_SDK)
using namespace PIScreenTypes; using namespace PIScreenTypes;
@@ -698,5 +696,3 @@ void TileInput::reserCursor() {
} }
#endif // !PICO_SDK #endif // !PICO_SDK
#endif // !PICO_SDK
libs/main/thread/piconditionvar.h
-2
View File
@@ -184,8 +184,6 @@ public:
void wait(PIMutex &, std::function<bool()>) {} void wait(PIMutex &, std::function<bool()>) {}
bool waitFor(PIMutex &, PISystemTime) { return false; } bool waitFor(PIMutex &, PISystemTime) { return false; }
bool waitFor(PIMutex &, PISystemTime, std::function<bool()>) { return false; } bool waitFor(PIMutex &, PISystemTime, std::function<bool()>) { return false; }
bool wait(PIMutex &, PISystemTime) { return true; }
bool wait(PIMutex &, ullong) { return true; }
void notifyOne() {} void notifyOne() {}
void notifyAll() {} void notifyAll() {}
}; };
libs/main/thread/pithread.h
-2
View File
@@ -43,7 +43,6 @@
class PIThread; class PIThread;
#ifndef PIP_NO_THREADS
#ifndef PIP_NO_THREADS #ifndef PIP_NO_THREADS
class PIIntrospectionThreads; class PIIntrospectionThreads;
@@ -75,7 +74,6 @@ public:
}; };
static __PIThreadCollection_Initializer__ __PIThreadCollection_initializer__; static __PIThreadCollection_Initializer__ __PIThreadCollection_initializer__;
# endif // PIP_NO_THREADS
//! \~english Callback executed by %PIThread with the current \a data() pointer. //! \~english Callback executed by %PIThread with the current \a data() pointer.
//! \~russian Обратный вызов, который %PIThread выполняет с текущим указателем \a data(). //! \~russian Обратный вызов, который %PIThread выполняет с текущим указателем \a data().