Got rid of (most of) all of the warnings.

This commit is contained in:
Fabian Schlenz 2019-05-30 11:26:13 +02:00
parent 711d028e90
commit 0d3896ca0d
9 changed files with 8 additions and 9 deletions

View File

@ -4,7 +4,7 @@
#include "Effect.h"
typedef struct {
char* name;
const char* name;
Effect* effect;
} EffectEntry;

View File

@ -11,7 +11,7 @@ class AnimationEffect : public Effect {
int frame = 0;
CRGB background_color;
int xOffset, yOffset;
long frameSince = 0;
unsigned long frameSince = 0;
public:
AnimationEffect(AnimationData *anim);
AnimationEffect(AnimationData *anim, CRGB background_color);

View File

@ -7,7 +7,7 @@
class CycleEffect : public Effect {
private:
Effect* effect;
long effectSince = 0;
unsigned long effectSince = 0;
public:
void changeEffect();

View File

@ -11,9 +11,9 @@ class MatrixEffectColumn {
int x, y;
int length;
Window* window;
int speed;
uint16_t speed;
boolean running;
long last_move = 0;
unsigned long last_move = 0;
public:
MatrixEffectColumn();
MatrixEffectColumn(Window* win, int xPos);

View File

@ -8,7 +8,7 @@ void BellEffect::loop() {
for (int y = 0; y < 16; y++) {
for (int x = 0; x < 2; x++) {
for (int z = 0; z < 8; z++) {
leds[XYsafe(x * 8 + z, y)] = sprite_bell[y * 2 + x] >> (7 - z) & 1 ^ invert ? color_on : color_off;
leds[XYsafe(x * 8 + z, y)] = (sprite_bell[y * 2 + x] >> (7 - z) & 1) ^ invert ? color_on : color_off;
}
}
}

View File

@ -11,7 +11,7 @@ void BigClockEffect::drawNumber(uint8_t number, int x, int y, CRGB color) {
}
void BigClockEffect::drawText(char *text, int x, int y, CRGB color) {
for (int i = 0; i < strlen(text); i++) {
for (uint8_t i = 0; i < strlen(text); i++) {
drawSprite(font_char(numbers4x7, text[i]), x + i * 4, y, color);
}
}

View File

@ -1,4 +1,3 @@
#include <FastLED.h>
#include "my_fastled.h"
CRGB leds[LED_COUNT];

View File

@ -20,7 +20,7 @@ void drawDigit(Window window, unsigned char* font, int w, int h, int x, int y, i
}
void drawText(Window window, char *font, int w, int h, char *text, int x, int y, CRGB color) {
for (int i = 0; i < strlen(text); i++) {
for (uint16_t i = 0; i < strlen(text); i++) {
drawChar(window, font5x7, 5, 7, x+i*(w+1), y, text[i], color);
}
}