mirror of
https://github.com/meshtastic/firmware.git
synced 2026-01-17 07:17:32 +00:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
39 lines
1.3 KiB
C++
39 lines
1.3 KiB
C++
#pragma once
|
|
#include "DebugConfiguration.h"
|
|
#include <algorithm>
|
|
#include <cstdarg>
|
|
#include <iterator>
|
|
#include <stdint.h>
|
|
|
|
/// C++ v17+ clamp function, limits a given value to a range defined by lo and hi
|
|
template <class T> constexpr const T &clamp(const T &v, const T &lo, const T &hi)
|
|
{
|
|
return (v < lo) ? lo : (hi < v) ? hi : v;
|
|
}
|
|
|
|
#if HAS_SCREEN
|
|
#define IF_SCREEN(X) \
|
|
if (screen) { \
|
|
X; \
|
|
}
|
|
#else
|
|
#define IF_SCREEN(...)
|
|
#endif
|
|
|
|
#if (defined(ARCH_PORTDUINO) && !defined(STRNSTR))
|
|
#define STRNSTR
|
|
#include <string.h>
|
|
char *strnstr(const char *s, const char *find, size_t slen);
|
|
#endif
|
|
|
|
void printBytes(const char *label, const uint8_t *p, size_t numbytes);
|
|
|
|
// is the memory region filled with a single character?
|
|
bool memfll(const uint8_t *mem, uint8_t find, size_t numbytes);
|
|
|
|
bool isOneOf(int item, int count, ...);
|
|
|
|
const std::string vformat(const char *const zcFormat, ...);
|
|
|
|
#define IS_ONE_OF(item, ...) isOneOf(item, sizeof((int[]){__VA_ARGS__}) / sizeof(int), __VA_ARGS__)
|