diff --git a/Makefile b/Makefile index 30884d1..09f9dfa 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ CFLAGS=-Wall -mmcu=$(MCU) -std=gnu99 -I $(TOOLCHAIN_PREFIX)/include -O3 -g0 LDFLAGS=-mmcu=$(MCU) -L $(TOOLCHAIN_PREFIX)/include -$(ARTIFACT).elf: main.o led.o time.o PontCoopScheduler.o displayDriver.o canvas.o displayTest.o displayTest2.o displayTest3.o displayTest4.o +$(ARTIFACT).elf: main.o led.o time.o PontCoopScheduler.o displayDriver.o canvas.o displayTest.o displayTest2.o displayTest3.o $(CC) -o $@ $(LDFLAGS) $^ $(OBJDUMP) -D $(ARTIFACT).elf > $(ARTIFACT).txt diff --git a/PontCoopScheduler.h b/PontCoopScheduler.h index 1ab47c1..b47ef04 100644 --- a/PontCoopScheduler.h +++ b/PontCoopScheduler.h @@ -13,7 +13,7 @@ -#define MAX_NUM_OF_TASKS 4 +#define MAX_NUM_OF_TASKS 2 typedef struct { diff --git a/canvas.c b/canvas.c index 5835465..32d9825 100644 --- a/canvas.c +++ b/canvas.c @@ -20,6 +20,14 @@ void canvasInit() { displayDriverTransferCanvas(); } +void canvasClear() { + memset(canvas.canvas, 0x80, canvas.size); +} + +void canvasSetAll(uint8_t color) { + memset(canvas.canvas, color + 0x80, canvas.size); +} + canvas_t *canvasGet() { return &canvas; } diff --git a/canvas.h b/canvas.h index 0ebef3b..92b2f38 100644 --- a/canvas.h +++ b/canvas.h @@ -15,6 +15,8 @@ typedef struct { } canvas_t; void canvasInit(); +void canvasClear(); +void canvasSetAll(uint8_t color); canvas_t *canvasGet(); void canvasShow(); void canvasSetPixel(uint8_t column, uint8_t row, uint8_t color); diff --git a/led.c b/led.c index 2c28ac3..5cfc7d3 100644 --- a/led.c +++ b/led.c @@ -12,6 +12,10 @@ void ledGreenOff() { P1OUT &= ~BIT0; } +void ledGreenToggle() { + P1OUT ^= BIT0; +} + void ledBlueOn() { P1OUT |= BIT1; } @@ -20,6 +24,10 @@ void ledBlueOff() { P1OUT &= ~BIT1; } +void ledBlueToggle() { + P1OUT ^= BIT1; +} + void ledExec(void *args) { static uint16_t i = 0; @@ -41,7 +49,7 @@ void ledInit() { ledBlueOff(); - schAdd(ledExec, NULL, 0, 500); +// schAdd(ledExec, NULL, 0, 500); } diff --git a/led.h b/led.h index 3c7a8e0..207797e 100644 --- a/led.h +++ b/led.h @@ -4,8 +4,10 @@ void ledBlueOff(); void ledBlueOn(); +void ledBlueToggle(); void ledGreenOff(); void ledGreenOn(); +void ledGreenToggle(); void ledInit(); void ledExec(); diff --git a/main.c b/main.c index 2bca538..2aa0f8b 100644 --- a/main.c +++ b/main.c @@ -11,7 +11,6 @@ #include "displayTest.h" #include "displayTest2.h" #include "displayTest3.h" -#include "displayTest4.h" int main() {