lifning
/
pocket-reform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HID: fix more c typing problems

This commit is contained in:
Lukas F. Hartmann 2022-08-26 16:37:47 +02:00
parent ae0b1b2dcf
commit e9396f3cd3
3 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pocket-reform-keyboard-fw/pocket-hid/src/main.c
View File

@ -206,7 +206,7 @@ int main(void)
}*/ }*/
gfx_init(false); gfx_init(false);
gfx_poke_str(0, 0, "Hello Pocket!"); gfx_poke_cstr(0, 0, "Hello Pocket!");
gfx_flush(); gfx_flush();
while (1) { while (1) {

44
pocket-reform-keyboard-fw/pocket-hid/src/oled.c
View File

@ -12,13 +12,13 @@
#include <string.h> #include <string.h>
#include "font.c" #include "font.c"
int oledbrt = 0; uint8_t oledbrt = 0;
struct CharacterMatrix display; struct CharacterMatrix display;
// Write command sequence. // Write command sequence.
// Returns true on success. // Returns true on success.
static inline bool _send_cmd1(uint8_t cmd) { static inline bool _send_cmd1(uint8_t cmd) {
char buf[] = {0x00, cmd}; uint8_t buf[] = {0x00, cmd};
i2c_write_blocking(i2c0, SSD1306_ADDRESS, buf, 2, false); i2c_write_blocking(i2c0, SSD1306_ADDRESS, buf, 2, false);
return true; return true;
} }
@ -52,7 +52,7 @@ static void clear_display(void) {
send_cmd3(PageAddr, 0, (DisplayHeight / 8) - 1); send_cmd3(PageAddr, 0, (DisplayHeight / 8) - 1);
send_cmd3(ColumnAddr, 0, DisplayWidth - 1); send_cmd3(ColumnAddr, 0, DisplayWidth - 1);
char buf[1 + MatrixRows * DisplayWidth]; uint8_t buf[1 + MatrixRows * DisplayWidth];
buf[0] = 0x40; buf[0] = 0x40;
for (int i=0; i<MatrixRows * DisplayWidth; i++) { for (int i=0; i<MatrixRows * DisplayWidth; i++) {
@ -131,15 +131,15 @@ done:
} }
void gfx_clear(void) { void gfx_clear(void) {
for (int y=0; y<4; y++) { for (uint8_t y=0; y<4; y++) {
for (int x=0; x<21; x++) { for (uint8_t x=0; x<21; x++) {
gfx_poke(x,y,' '); gfx_poke(x, y, ' ');
} }
} }
gfx_clear_invert(); gfx_clear_invert();
} }
void gfx_contrast(int c) { void gfx_contrast(uint8_t c) {
send_cmd2(SetContrast, c); send_cmd2(SetContrast, c);
done: done:
return; return;
@ -164,7 +164,7 @@ void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c) {
if (c == '\n') { if (c == '\n') {
// Clear to end of line from the cursor and then move to the // Clear to end of line from the cursor and then move to the
// start of the next line // start of the next line
uint8_t cursor_col = (matrix->cursor - &matrix->display[0][0]) % MatrixCols; int cursor_col = (matrix->cursor - &matrix->display[0][0]) % MatrixCols;
while (cursor_col++ < MatrixCols) { while (cursor_col++ < MatrixCols) {
matrix_write_char_inner(matrix, ' '); matrix_write_char_inner(matrix, ' ');
@ -180,18 +180,23 @@ void gfx_poke(uint8_t x, uint8_t y, uint8_t c) {
} }
void gfx_poke_str(uint8_t x, uint8_t y, char* str) { void gfx_poke_str(uint8_t x, uint8_t y, char* str) {
int len = strlen(str); int len = (int)strlen(str);
if (len<1) return;
if (len>21) len = 21; if (len>21) len = 21;
// clip // clip
if (y<0 || y>3) return; if (y>3) return;
for (int xx=x; xx<x+len && xx<21; xx++) { for (int xx=x; xx<x+len && xx<21; xx++) {
if (xx>=0 && xx<21) { if (xx<21) {
display.display[y][xx] = (uint8_t)str[xx-x]; display.display[y][xx] = (uint8_t)str[xx-x];
} }
} }
} }
void gfx_poke_cstr(uint8_t x, uint8_t y, const char* str) {
gfx_poke_str(x, y, strdup(str));
}
void gfx_write_char(uint8_t c) { void gfx_write_char(uint8_t c) {
matrix_write_char(&display, c); matrix_write_char(&display, c);
} }
@ -240,16 +245,16 @@ void gfx_clear_screen(void) {
} }
void gfx_clear_invert(void) { void gfx_clear_invert(void) {
for (int y=0;y<4;y++) { for (int y=0; y<4; y++) {
for (int x=0;x<21;x++) { for (int x=0; x<21; x++) {
display.invert[y][x] = 0; display.invert[y][x] = 0;
} }
} }
} }
void gfx_invert_row(uint8_t y) { void gfx_invert_row(uint8_t y) {
if (y<0 || y>3) return; if (y>3) return;
for (int x=0;x<21;x++) { for (int x=0; x<21; x++) {
display.invert[y][x] = 1; display.invert[y][x] = 1;
} }
} }
@ -261,7 +266,7 @@ void matrix_render(struct CharacterMatrix *matrix) {
send_cmd3(PageAddr, 0, MatrixRows - 1); send_cmd3(PageAddr, 0, MatrixRows - 1);
send_cmd3(ColumnAddr, 0, (MatrixCols * FontWidth) - 1); send_cmd3(ColumnAddr, 0, (MatrixCols * FontWidth) - 1);
char buf[1 + MatrixRows * DisplayWidth]; uint8_t buf[1 + MatrixRows * DisplayWidth];
buf[0] = 0x40; buf[0] = 0x40;
int i = 1; int i = 1;
@ -310,7 +315,10 @@ void oled_brightness_inc(void) {
} }
void oled_brightness_dec(void) { void oled_brightness_dec(void) {
oledbrt-=10; if (oledbrt<10) {
if (oledbrt<0) oledbrt = 0; oledbrt = 0;
} else {
oledbrt-=10;
}
gfx_contrast(oledbrt); gfx_contrast(oledbrt);
} }

3
pocket-reform-keyboard-fw/pocket-hid/src/oled.h
View File

@ -70,6 +70,7 @@ struct CharacterMatrix {
void gfx_poke(uint8_t x, uint8_t y, uint8_t c); void gfx_poke(uint8_t x, uint8_t y, uint8_t c);
void gfx_poke_str(uint8_t x, uint8_t y, char* str); void gfx_poke_str(uint8_t x, uint8_t y, char* str);
void gfx_poke_cstr(uint8_t x, uint8_t y, const char* str);
void gfx_clear_invert(void); void gfx_clear_invert(void);
void gfx_invert_row(uint8_t y); void gfx_invert_row(uint8_t y);
bool gfx_init(bool rotate); bool gfx_init(bool rotate);
@ -82,7 +83,7 @@ void gfx_write_char(uint8_t c);
void gfx_write(const char *data); void gfx_write(const char *data);
void gfx_write_P(const char *data); void gfx_write_P(const char *data);
void gfx_clear_screen(void); void gfx_clear_screen(void);
void gfx_contrast(int c); void gfx_contrast(uint8_t c);
void matrix_clear(struct CharacterMatrix *matrix); void matrix_clear(struct CharacterMatrix *matrix);
void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c); void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c);