CPlusPlus/weather-info
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v.0.0.8 mv number_to_bitarray_msb in utils-mathematics

Browse Source
This commit is contained in:
tiijay
2025-11-05 17:23:42 +01:00
parent b7f5e924e0
commit 7bdd67f3c3
6 changed files with 66 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
lib/LedMatrix/src/LedMatrix.cpp
View File

@@ -12,7 +12,7 @@ LedMatrix::~LedMatrix()
// N entspricht Font-Height
template <size_t N>
uint8_t LedMatrix::charWidth(const uint16_t *charMatrix)
uint8_t LedMatrix::charWidth(const uint8_t *charMatrix)
{
uint16_t max_val = 0;
for (size_t i = 0; i < N; i++)
@@ -47,10 +47,10 @@ void LedMatrix::drawPixel(int x, int y, CRGB color)
uint8_t LedMatrix::drawChar(int x, int y, char c, CRGB color)
{
const uint16_t *fontData = getFontChar_16x16(c);
const u_int8_t char_width_pixel = charWidth<16>(fontData);
const u_int8_t font_height = fontHeight_16x16();
const u_int8_t font_width = 16;
const uint8_t *fontData = getFontChar_5x7(c);
const u_int8_t char_width_pixel = charWidth<7>(fontData);
const u_int8_t font_height = fontHeight_5x7();
const u_int8_t font_width = 5;
for (u_int8_t row = 0; row < font_height; row++)
{
@@ -88,29 +88,3 @@ void LedMatrix::drawText(int x, int y, const char *text, CRGB color)
cursorX += (chr_width + 1); // 5 pixels width + 1 pixel spacing
}
}
vector<uint16_t> LedMatrix::number_to_bitarray_msb(uint16_t number, int bits, boolean four_bits)
{
/** Convert 8/16-bit number to bit array (MSB first) */
std::vector<uint16_t> two_bytes;
two_bytes.reserve(bits);
for (int i = bits - 1; i >= 0; i--)
{
two_bytes.push_back((number >> i) & 1);
}
// Debug, Ausgabe des Bytes
Serial.printf("[0x%04X] ", number);
uint8_t idx = 0;
for (auto bit : two_bytes)
{
Serial.printf("%d", bit);
idx++;
if (four_bits && !(idx % 4))
Serial.printf(" ");
}
Serial.println();
return two_bytes;
}

8
lib/LedMatrix/src/LedMatrix.h
View File

@@ -7,9 +7,9 @@ using namespace std;
#include <FastLED.h>
#include <vector>
// #include <font_5x7.h>
#include <font_5x7.h>
// #include <font_8x8.h>
#include <font_16x16.h>
// #include <font_16x16.h>
class LedMatrix : public CFastLED
{
@@ -22,7 +22,7 @@ private:
vector<CRGB> leds; // Automatic memory management
template <size_t N>
uint8_t charWidth(const uint16_t *charMatrix);
uint8_t charWidth(const uint8_t *charMatrix);
public:
LedMatrix(uint8_t h = 64, uint8_t w = 64);
@@ -33,8 +33,6 @@ public:
uint8_t drawChar(int x, int y, char c, CRGB color);
// Draw text string
void drawText(int x, int y, const char *text, CRGB color);
vector<uint16_t> number_to_bitarray_msb(uint16_t number, int bits = 8, boolean four_bits = false);
};
#endif