aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rw-r--r--src/fb.c87
-rw-r--r--src/fb.h53
-rw-r--r--src/main.c71
4 files changed, 179 insertions, 35 deletions
diff --git a/Makefile b/Makefile
index 3d82df9..35f6b25 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,8 @@ CH5xx_ble_firmware_library/StdPeriphDriver/CH58x_spi1.c \
CH5xx_ble_firmware_library/RVMSIS/core_riscv.c \
src/main.c \
src/leddrv.c \
-src/button.c
+src/button.c \
+src/fb.c \
# ASM sources
diff --git a/src/fb.c b/src/fb.c
new file mode 100644
index 0000000..7e5bf1f
--- /dev/null
+++ b/src/fb.c
@@ -0,0 +1,87 @@
+#include "fb.h"
+#include <memory.h>
+
+volatile static fb_t *current, *head, *tail;
+
+static void fb_add(fb_t *new, fb_t *prev, fb_t *next)
+{
+ next->prev = new;
+ new->next = next;
+ new->prev = prev;
+ prev->next = new;
+}
+
+fb_t *fblist_insert(fb_t *at, fb_t *new)
+{
+ fb_add(new, at, at->next);
+ return new;
+}
+
+fb_t *fblist_append(fb_t *new)
+{
+ fblist_insert(new, tail);
+ tail = new;
+ return new;
+}
+
+fb_t *fblist_gonext()
+{
+ current = current->next;
+ current->scroll = 0;
+ return current;
+}
+
+fb_t *fblist_goprev()
+{
+ current = current->prev;
+ current->scroll = 0;
+ return current;
+}
+
+fb_t *fblist_gohead()
+{
+ current = head;
+ current->scroll = 0;
+ return current;
+}
+
+fb_t *fblist_currentfb()
+{
+ return current;
+}
+
+static void list_del(fb_t *prev, fb_t *next)
+{
+ prev->next = next;
+ next->prev = prev;
+}
+
+fb_t *fblist_drop(fb_t *fb)
+{
+ list_del(fb->prev, fb->next);
+ return fb->next;
+}
+
+fb_t *fb_new(uint16_t width)
+{
+ fb_t *fb = malloc(sizeof(fb_t));
+ memset(fb, 0, sizeof(fb_t));
+
+ fb->width = width;
+ fb->buf = malloc(width * sizeof(uint16_t));
+ memset(fb->buf, 0, width * sizeof(uint16_t));
+
+ fb->modes = FIXED;
+
+ fb->next = fb;
+ fb->prev = fb;
+
+ return fb;
+}
+
+void fblist_init(uint16_t first_fb_width)
+{
+ current = fb_new(first_fb_width);
+ head = current;
+ tail = current;
+}
diff --git a/src/fb.h b/src/fb.h
new file mode 100644
index 0000000..4e5cb43
--- /dev/null
+++ b/src/fb.h
@@ -0,0 +1,53 @@
+#ifndef __FB_H__
+#define __FB_H__
+
+#include <stdint.h>
+#include <stdlib.h>
+
+enum ANIMATION_MODES {
+ LEFT = 0,
+ RIGHT,
+ UP,
+ DOWN,
+ FIXED,
+ SNOWFLAKE,
+ PICTURE,
+ ANIMATION,
+ LASER,
+};
+
+typedef struct fb_st {
+ uint16_t *buf;
+ uint16_t width;
+ uint8_t modes;
+ int is_flash;
+ int is_marquee;
+ // TODO: feat: Brightness for each fb
+ int brightness;
+ // TODO: feat: Timeout for each fb to switch to next fb
+ uint32_t timeout; // zero mean no timeout
+ uint16_t scroll;
+
+ struct fb_st *next;
+ struct fb_st *prev;
+} fb_t;
+
+fb_t *fb_new(uint16_t width);
+static inline void fb_free(fb_t *fb)
+{
+ free((fb)->buf);
+ free((fb));
+}
+
+fb_t *fblist_insert(fb_t *at, fb_t *new);
+fb_t *fblist_append(fb_t *new);
+fb_t *fblist_drop(fb_t *fb);
+
+fb_t *fblist_gonext();
+fb_t *fblist_goprev() ;
+fb_t *fblist_gohead();
+fb_t *fblist_currentfb();
+
+void fblist_init(uint16_t first_fb_width);
+
+#endif /* __FB_H__ */
diff --git a/src/main.c b/src/main.c
index c256cd1..ef4bfc7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3,10 +3,10 @@
#include "leddrv.h"
#include "button.h"
+#include "fb.h"
#define FB_WIDTH (LED_COLS * 4)
#define SCROLL_IRATIO (16)
-#define FB_NUM_SPARE (8)
#define SCAN_F (2000)
#define SCAN_T (FREQ_SYS / SCAN_F)
@@ -23,8 +23,6 @@ enum MODES {
};
#define BRIGHTNESS_LEVELS (4)
-uint16_t fb[FB_NUM_SPARE][FB_WIDTH];
-
uint8_t test_font[][11] = {
0x00, 0xFE, 0x66, 0x62, 0x68, 0x78, 0x68, 0x60, 0x60, 0xF0, 0x00, // F
0x00, 0x7C, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0xC6, 0x7C, 0x00, // O
@@ -49,9 +47,7 @@ void draw2fb(uint16_t *fb, int c, int col)
}
}
-volatile int fb_sel, fb_num;
volatile int mode, brightness;
-volatile uint64_t tick;
__HIGH_CODE
static void change_brightness()
@@ -67,9 +63,28 @@ static void change_mode()
}
__HIGH_CODE
-static void change_fb()
+static void fb_transition()
{
- NEXT_STATE(fb_sel, 0, fb_num);
+ fblist_gonext();
+}
+
+void draw_testfb()
+{
+
+ fb_t *curr_fb = fblist_currentfb();
+ curr_fb->modes = LEFT;
+
+ for (int i=0; i<8; i++) {
+ draw2fb(curr_fb->buf, i, 8 * (i + 4));
+ }
+
+ fb_t *fb_next = fb_new(8*12);
+ fblist_append(fb_next);
+ fb_next->modes = LEFT;
+
+ for (int i=4; i<12; i++) {
+ draw2fb(fb_next->buf, i % 8, 8 * (i + 1));
+ }
}
int main()
@@ -77,36 +92,21 @@ int main()
SetSysClock(CLK_SOURCE_PLL_60MHz);
led_init();
- draw2fb(fb[0], 0, 8*(5-1));
- draw2fb(fb[0], 1, 8*(6-1));
- draw2fb(fb[0], 2, 8*(7-1));
- draw2fb(fb[0], 3, 8*(8-1));
- draw2fb(fb[0], 4, 8*(9-1));
- draw2fb(fb[0], 5, 8*(10-1));
- draw2fb(fb[0], 6, 8*(11-1));
- draw2fb(fb[0], 7, 8*(12-1));
-
- draw2fb(fb[1], 4, 8*5);
- draw2fb(fb[1], 5, 8*6);
- draw2fb(fb[1], 6, 8*7);
- draw2fb(fb[1], 7, 8*8);
- draw2fb(fb[1], 0, 8*9);
- draw2fb(fb[1], 1, 8*10);
- draw2fb(fb[1], 2, 8*11);
- draw2fb(fb[1], 3, 8*12);
- fb_num = 2;
-
TMR0_TimerInit(SCAN_T / 2);
TMR0_ITCfg(ENABLE, TMR0_3_IT_CYC_END);
PFIC_EnableIRQ(TMR0_IRQn);
+ fblist_init(FB_WIDTH);
+
+ draw_testfb();
+
btn_init();
btn_onOnePress(KEY1, change_mode);
- btn_onOnePress(KEY2, change_fb);
+ btn_onOnePress(KEY2, fb_transition);
btn_onLongPress(KEY1, change_brightness);
while (1) {
- int i = 0;
+ uint32_t i = 0;
while (isPressed(KEY2)) {
i++;
if (i>10) {
@@ -121,16 +121,19 @@ __INTERRUPT
__HIGH_CODE
void TMR0_IRQHandler(void)
{
- static int i, scroll;
+ static int i;
if (TMR0_GetITFlag(TMR0_3_IT_CYC_END)) {
+ fb_t *fb = fblist_currentfb();
i += 1;
if (i >= LED_COLS) {
i = 0;
- scroll++;
- if (scroll >= (FB_WIDTH-LED_COLS)*SCROLL_IRATIO) {
- scroll = 0;
+ if ((fb->modes & 0x0f) == LEFT) {
+ fb->scroll++;
+ if (fb->scroll >= (fb->width-LED_COLS)*SCROLL_IRATIO) {
+ fb->scroll = 0;
+ }
}
}
@@ -139,8 +142,8 @@ void TMR0_IRQHandler(void)
leds_releaseall();
} else {
led_write2dcol(i/2,
- fb[fb_sel][i+scroll/SCROLL_IRATIO],
- fb[fb_sel][i+scroll/SCROLL_IRATIO+1]);
+ fb->buf[i+ fb->scroll/SCROLL_IRATIO],
+ fb->buf[i+ fb->scroll/SCROLL_IRATIO + 1]);
}
TMR0_ClearITFlag(TMR0_3_IT_CYC_END);