fix: address review issues from MICRO_PIP migration

- 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:
2026-08-11 15:26:55 +03:00
parent 399ae3a20c
commit fd578ea927
6 changed files with 29 additions and 45 deletions
+28 -32
View File
@@ -21,77 +21,75 @@
#if !defined(PICO_SDK)
#if !defined(PICO_SDK)
// comment for use ascii instead of unicode symbols
#define USE_UNICODE
# define USE_UNICODE
using namespace PIScreenTypes;
PIScreenDrawer::PIScreenDrawer(PIVector<PIVector<Cell>> & c): cells(c) {
arts_[LineVertical] =
#ifdef USE_UNICODE
# ifdef USE_UNICODE
PIChar::fromUTF8("");
#else
# else
PIChar('|');
#endif
# endif
arts_[LineHorizontal] =
#ifdef USE_UNICODE
# ifdef USE_UNICODE
PIChar::fromUTF8("");
#else
# else
PIChar('-');
#endif
# endif
arts_[Cross] =
#ifdef USE_UNICODE
# ifdef USE_UNICODE
PIChar::fromUTF8("");
#else
# else
PIChar('+');
#endif
# endif
arts_[CornerTopLeft] =
#ifdef USE_UNICODE
# ifdef USE_UNICODE
PIChar::fromUTF8("");
#else
# else
PIChar('+');
#endif
# endif
arts_[CornerTopRight] =
#ifdef USE_UNICODE
# ifdef USE_UNICODE
PIChar::fromUTF8("");
#else
# else
PIChar('+');
#endif
# endif
arts_[CornerBottomLeft] =
#ifdef USE_UNICODE
# ifdef USE_UNICODE
PIChar::fromUTF8("");
#else
# else
PIChar('+');
#endif
# endif
arts_[CornerBottomRight] =
#ifdef USE_UNICODE
# ifdef USE_UNICODE
PIChar::fromUTF8("");
#else
# else
PIChar('+');
#endif
# endif
arts_[Unchecked] =
#ifdef USE_UNICODE
# ifdef USE_UNICODE
PIChar::fromUTF8("");
#else
# else
PIChar('O');
#endif
# endif
arts_[Checked] =
#ifdef USE_UNICODE
# ifdef USE_UNICODE
PIChar::fromUTF8("");
#else
# else
PIChar('0');
#endif
# endif
}
@@ -270,5 +268,3 @@ void PIScreenDrawer::drawText(int x, int y, const PIString & s, Color col_char,
}
#endif // !PICO_SDK
#endif // !PICO_SDK
-4
View File
@@ -23,8 +23,6 @@
#if !defined(PICO_SDK)
#if !defined(PICO_SDK)
using namespace PIScreenTypes;
@@ -261,5 +259,3 @@ void PIScreenTile::layout() {
}
#endif // !PICO_SDK
#endif // !PICO_SDK
-4
View File
@@ -23,8 +23,6 @@
#if !defined(PICO_SDK)
#if !defined(PICO_SDK)
using namespace PIScreenTypes;
@@ -698,5 +696,3 @@ void TileInput::reserCursor() {
}
#endif // !PICO_SDK
#endif // !PICO_SDK
-2
View File
@@ -184,8 +184,6 @@ public:
void wait(PIMutex &, std::function<bool()>) {}
bool waitFor(PIMutex &, PISystemTime) { 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 notifyAll() {}
};
-2
View File
@@ -44,7 +44,6 @@
class PIThread;
#ifndef PIP_NO_THREADS
# ifndef PIP_NO_THREADS
class PIIntrospectionThreads;
class PIP_EXPORT __PIThreadCollection: public PIObject {
@@ -75,7 +74,6 @@ public:
};
static __PIThreadCollection_Initializer__ __PIThreadCollection_initializer__;
# endif // PIP_NO_THREADS
//! \~english Callback executed by %PIThread with the current \a data() pointer.
//! \~russian Обратный вызов, который %PIThread выполняет с текущим указателем \a data().