Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix up screen off timer of crkbd #4346

Merged
merged 7 commits into from
Nov 12, 2018
Merged

Fix up screen off timer of crkbd #4346

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3d175f2
fix about screen off timer
cincrement Oct 27, 2018
8ca457f
Revert "fix about screen off timer"
cincrement Oct 27, 2018
dd6aecb
Fix up screen off timer of crkbd
cincrement Oct 27, 2018
f0efb82
Fix up screen off timer of helix
cincrement Nov 4, 2018
877040d
Revert "Fix up screen off timer of helix"
cincrement Nov 4, 2018
e47b5ed
Improve internal processing of process_record_kb()
cincrement Nov 4, 2018
5c2ed34
Fix a indent
cincrement Nov 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions keyboards/crkbd/crkbd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
#include "crkbd.h"
#include "ssd1306.h"

bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
process_record_gfx(keycode,record);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can actually set it to:

return process_record_gfx(keycode,record) && process_record_user(keycode, record);

That may be a bit cleaner, here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the advice. I rewrote there. I didn't know how should I wrote there.

return process_record_user(keycode, record);
}
16 changes: 14 additions & 2 deletions keyboards/crkbd/ssd1306.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,17 @@ static const unsigned char font[] PROGMEM;
//static uint16_t last_battery_update;
//static uint32_t vbat;
//#define BatteryUpdateInterval 10000 /* milliseconds */
#define ScreenOffInterval 300000 /* milliseconds */

// 'last_flush' is declared as uint16_t,
// so this must be less than 65535
#define ScreenOffInterval 60000 /* milliseconds */
#if DEBUG_TO_SCREEN
static uint8_t displaying;
#endif
static uint16_t last_flush;

static bool force_dirty = true;

// Write command sequence.
// Returns true on success.
static inline bool _send_cmd1(uint8_t cmd) {
Expand Down Expand Up @@ -321,12 +326,19 @@ void iota_gfx_task_user(void) {
void iota_gfx_task(void) {
iota_gfx_task_user();

if (display.dirty) {
if (display.dirty|| force_dirty) {
iota_gfx_flush();
force_dirty = false;
drashna marked this conversation as resolved.
Show resolved Hide resolved
}

if (timer_elapsed(last_flush) > ScreenOffInterval) {
iota_gfx_off();
}
}

bool process_record_gfx(uint16_t keycode, keyrecord_t *record) {
force_dirty = true;
return true;
}

#endif
3 changes: 3 additions & 0 deletions keyboards/crkbd/ssd1306.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <stdbool.h>
#include <stdio.h>
#include "pincontrol.h"
#include "action.h"

enum ssd1306_cmds {
DisplayOff = 0xAE,
Expand Down Expand Up @@ -86,3 +87,5 @@ void matrix_write(struct CharacterMatrix *matrix, const char *data);
void matrix_write_ln(struct CharacterMatrix *matrix, const char *data);
void matrix_write_P(struct CharacterMatrix *matrix, const char *data);
void matrix_render(struct CharacterMatrix *matrix);

bool process_record_gfx(uint16_t keycode, keyrecord_t *record);