diff --git a/demo/oled/page.c b/demo/oled/page.c new file mode 100644 index 0000000..ef4bae3 --- /dev/null +++ b/demo/oled/page.c @@ -0,0 +1,73 @@ +#include "page.h" +#include "list.h" + +uint8_t pageid = 0, cur = 1, cnt = 0; + +static List_t list; +Page_L_t mainp = {0, 3, 0, 0, mainpage}; +Page_L_t ap = {1, 2, 0, 0, pageA}; +Page_L_t bp = {2, 2, 0, 0, pageB}; +Page_L_t cp = {3, 2, 0, 0, pageC}; + +void pageinit() { + list_init(&list); + list_insert(&list, &mainp); + list_insert(&list, &ap); + list_insert(&list, &bp); + list_insert(&list, &cp); +} + +int compare_page(const void *s1, const void *s2) { + Page_L_t *data1 = (Page_L_t *) s1; + uint8_t *data2 = (uint8_t *) s2; + + return (data1->id - *data2); +} + +Page_L_t pagesearch(uint8_t id) { + Page_L_t *ret; + ret = list_search(&list, &id, compare_page); + return *ret; +} + +void pagecur(OLED_T *dev) { + if (cnt % 2) { + if (cur > 0 && cur <= pagesearch(pageid).next)OLED_ShowString(dev, 26, cur * 12, ">", 12); + else + cur = 1; + } + cnt++; +} + +void mainpage(OLED_T *dev) { + OLED_CLS(dev); + OLED_ShowString(dev, 32, 0, "Main Page", 12); + OLED_ShowString(dev, 36, 12, "1.PageA", 12); + OLED_ShowString(dev, 36, 24, "2.PageB", 12); + OLED_ShowString(dev, 36, 36, "3.PageC", 12); + pagecur(dev); +} + +void pageA(OLED_T *dev) { + OLED_CLS(dev); + OLED_ShowString(dev, 32, 0, " A Page", 12); + OLED_ShowString(dev, 36, 12, "1.contx", 12); + OLED_ShowString(dev, 36, 24, " back", 12); + pagecur(dev); +} + +void pageB(OLED_T *dev) { + OLED_CLS(dev); + OLED_ShowString(dev, 32, 0, " B Page", 12); + OLED_ShowString(dev, 36, 12, "1.contx", 12); + OLED_ShowString(dev, 36, 24, " back", 12); + pagecur(dev); +} + +void pageC(OLED_T *dev) { + OLED_CLS(dev); + OLED_ShowString(dev, 32, 0, " C Page", 12); + OLED_ShowString(dev, 36, 12, "1.contx", 12); + OLED_ShowString(dev, 36, 24, " back", 12); + pagecur(dev); +} \ No newline at end of file diff --git a/demo/oled/page.h b/demo/oled/page.h new file mode 100644 index 0000000..b23fd8b --- /dev/null +++ b/demo/oled/page.h @@ -0,0 +1,30 @@ +#ifndef HW_LIB_PAGE_H +#define HW_LIB_PAGE_H + +#include "oled.h" + +typedef void (*Page_t)(OLED_T *dev); + +extern uint8_t pageid, cur, cnt; + +typedef struct Page_L { + uint8_t id; + uint8_t next; + uint8_t back; + uint8_t enter; + Page_t page; +} Page_L_t; + +void pageinit(); + +Page_L_t pagesearch(uint8_t id); + +void mainpage(OLED_T *dev); + +void pageA(OLED_T *dev); + +void pageB(OLED_T *dev); + +void pageC(OLED_T *dev); + +#endif //HW_LIB_PAGE_H diff --git a/demo/oled/test.c b/demo/oled/test.c index c4d34ca..54a70e2 100644 --- a/demo/oled/test.c +++ b/demo/oled/test.c @@ -1,13 +1,14 @@ #include -#include "oled.h" #include "log.h" -#include "tool.h" #include "t_oled.h" + #include "sim_oled.h" #include #include #include "key.h" #include "sim_key.h" +#include "page.h" + uint8_t Cmd(uint8_t *data, size_t l) { // Buf_Print("Cmd", data, l, 16); } @@ -27,22 +28,38 @@ uint8_t oledbuf[8][128] = {0}; void Key_Call_E(Key_t *key) { switch (key->event) { case KEY_PRESS_DOWN: - LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "PressTheEvent"); +// LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "PressTheEvent"); break;// 按下事件 case KEY_PRESS_UP: - LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "BounceIncident"); +// LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "BounceIncident"); break;// 弹起事件 case KEY_PRESS_REPEAT: LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "RepeatThePressEvent"); break;// 重复按下事件 case KEY_SINGLE_CLICK: LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "ClickEvent"); + if (key->key_id == SIM_KEY_UP)cur--; + if (key->key_id == SIM_KEY_DOWN)cur++; + if (key->key_id == SIM_KEY_LEFT)pageid--; + if (key->key_id == SIM_KEY_RIGHT)pageid++; + if (key->key_id == SIM_KEY_ENABLE) { + switch (pageid) { + case 0: + pageid = cur; + break; + case 1: + case 2: + case 3: + if (cur == 2)pageid = 0; + break; + } + } break;// 单击事件 case KEY_DOUBLE_CLICK: LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "DoubleClickTheEvent"); break;// 双击事件 case KEY_LONG_PRESS_START: - LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "LongPressToStartTheEvent"); +// LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "LongPressToStartTheEvent"); break;// 长按开始事件 case KEY_LONG_PRESS_HOLD: LOGT("KEY", "ID:%d EVENT:%s", key->key_id, "LongPressToHoldTheEvent"); @@ -83,34 +100,37 @@ void Get_Key(void *pVoid) { _endthread(); } +OLED_T oled = { + .height=64, + .width=128, + .state=IDLE, + .buf=oledbuf, + .cmd=Cmd, + .data=Data, + .call=Refresh_Call, +}; + void Test_OLED() { SIM_OLED_INIT(128, 64, CYAN, 0x0, 5, 0); - OLED_T oled = { - .height=64, - .width=128, - .state=IDLE, - .buf=oledbuf, - .cmd=Cmd, - .data=Data, - .call=Refresh_Call, - }; + OLED_Init(&oled); OLED_CLS(&oled); // OLED_DrawRect(&oled, 0, 0, 127, 63); - OLED_ShowString(&oled, 32, 0, "Main Page", 12); - OLED_ShowString(&oled, 36, 12, "1.PageA", 12); - OLED_ShowString(&oled, 36, 24, "2.PageB", 12); - OLED_ShowString(&oled, 36, 36, "3.PageC", 12); + mainpage(&oled); + SIM_OLED_START(); int s = 0; char buf[30]; _beginthread(Get_Key, 0, NULL); + pageinit(); while (1) { - sprintf(buf, "DATA:%d", s); - OLED_ShowString(&oled, 2, 51, buf, 12); + if (pageid > 3)pageid = 0; + pagesearch(pageid).page(&oled); +// sprintf(buf, "DATA:%d", s); +// OLED_ShowString(&oled, 2, 51, buf, 12); OLED_Refresh(&oled); s++; - Sleep(500); + Sleep(200); } SIM_OLED_STOP(); } \ No newline at end of file diff --git a/lib/inc/oled/oled.h b/lib/inc/oled/oled.h index 303c562..47f81e5 100644 --- a/lib/inc/oled/oled.h +++ b/lib/inc/oled/oled.h @@ -82,23 +82,7 @@ struct OLED_Dev { // 2, 0xA4, 0xA6, // 整个显示打开 // 1, 0xAF // 打开显示 //}; -const uint8_t initCmd[] = { - 0xAE, // 关闭显示 - 0xD5, 0x80, // 设置显示时钟分频比/振荡器频率 - 0xA8, 0x3F, // 设置多路复用比率 - 0xD3, 0x00, // 设置显示偏移 - 0x40, 0x00, // 设置显示起始行 - 0x8D, 0x14, // 电荷泵设置 - 0x20, 0x00, // 设置内存寻址模式 - 0xA0, // 设置段重映射 - 0xC0, // 设置COM输出扫描方向 - 0xDA, 0x12, // 设置COM引脚硬件配置 - 0x81, 0xCF, // 设置对比度控制 - 0xD9, 0xF1, // 设置预充电周期 - 0xDB, 0x20, // 设置VCOMH取消电平 - 0xA4, 0xA6, // 整个显示打开 - 0xAF // 打开显示 -}; + /** * @brief OLED初始化 @@ -229,6 +213,32 @@ void OLED_ShowChar(OLED_T *dev, uint8_t x, uint8_t y, uint8_t chr, uint8_t size1 */ void OLED_ShowString(OLED_T *dev, uint8_t x, uint8_t y, uint8_t *chr, uint8_t size1); +/** + * @brief 在OLED屏幕上显示数字 + * @param dev: [输入] OLED设备指针 + * @param x: [输入] 数字显示的起始横坐标 + * @param y: [输入] 数字显示的起始纵坐标 + * @param num: [输入] 要显示的数字 + * @param len: [输入] 数字长度 + * @param size1: [输入] 字体大小 + * @return void + * @example OLED_ShowNum(&oled_dev, 0, 0, 12345, 5, 12); +**/ +void OLED_ShowNum(OLED_T *dev, uint8_t x, uint8_t y, uint32_t num, uint8_t len, uint8_t size1); + +/** + * @brief 在OLED屏幕上显示图片 + * @param dev: [输入] OLED设备指针 + * @param x0: [输入] 图片左上角横坐标 + * @param y0: [输入] 图片左上角纵坐标 + * @param x1: [输入] 图片右下角横坐标 + * @param y1: [输入] 图片右下角纵坐标 + * @param bmp: [输入] 图片数据数组指针 + * @return void + * @example OLED_ShowPic(&oled_dev, 0, 0, 127, 63, bmp_data); +**/ +void OLED_ShowPic(OLED_T *dev, uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t *bmp); + /** * @brief 设置显示起始坐标 * @param dev: [输入] OLED设备指针 diff --git a/lib/src/oled/oled.cpp b/lib/src/oled/oled.cpp index 93f830e..88d39f4 100644 --- a/lib/src/oled/oled.cpp +++ b/lib/src/oled/oled.cpp @@ -3,6 +3,24 @@ #define BUFPOINT(x, y) (*(dev->buf + x + (y * dev->width))) +const uint8_t initCmd[] = { + 0xAE, // 关闭显示 + 0xD5, 0x80, // 设置显示时钟分频比/振荡器频率 + 0xA8, 0x3F, // 设置多路复用比率 + 0xD3, 0x00, // 设置显示偏移 + 0x40, 0x00, // 设置显示起始行 + 0x8D, 0x14, // 电荷泵设置 + 0x20, 0x00, // 设置内存寻址模式 + 0xA0, // 设置段重映射 + 0xC0, // 设置COM输出扫描方向 + 0xDA, 0x12, // 设置COM引脚硬件配置 + 0x81, 0xCF, // 设置对比度控制 + 0xD9, 0xF1, // 设置预充电周期 + 0xDB, 0x20, // 设置VCOMH取消电平 + 0xA4, 0xA6, // 整个显示打开 + 0xAF // 打开显示 +}; + void OLED_Init(OLED_T *dev) { uint8_t *cmdIndex = (uint8_t *) initCmd; // uint8_t count, temp; @@ -190,6 +208,35 @@ void OLED_ShowString(OLED_T *dev, uint8_t x, uint8_t y, uint8_t *chr, uint8_t si } } +uint32_t OLED_Pow(uint8_t m, uint8_t n) { + uint32_t result = 1; + while (n--) { + result *= m; + } + return result; +} + +void OLED_ShowNum(OLED_T *dev, uint8_t x, uint8_t y, uint32_t num, uint8_t len, uint8_t size1) { + uint8_t t, temp; + for (t = 0; t < len; t++) { + temp = (num / OLED_Pow(10, len - t - 1)) % 10; + if (temp == 0) { + OLED_ShowChar(dev, x + (size1 / 2) * t, y, '0', size1); + } else { + OLED_ShowChar(dev, x + (size1 / 2) * t, y, temp + '0', size1); + } + } +} + +void OLED_ShowPic(OLED_T *dev, uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t *bmp) { + uint8_t y = 0; + if (y % 8 == 0)y = 0; + else y += 1; + for (y = y0; y < y1; y++) { + OLED_SPos(dev, x0, y); + dev->data(bmp + y * (x1 - x0), x1 - x0); + } +} void OLED_Fill(OLED_T *dev, uint8_t data) { uint8_t x, y; for (y = 0; y < (dev->height >> 3); y++) { diff --git a/main.c b/main.c index 271bbd3..01b01f3 100644 --- a/main.c +++ b/main.c @@ -9,7 +9,6 @@ #include "t_key.h" #include "t_oled.h" #include "tool.h" -#include #include int main() {