From 8ca457fc254f5b2d52bb8aa5075401d331fb72ea Mon Sep 17 00:00:00 2001 From: comaid Date: Sat, 27 Oct 2018 19:09:19 +0900 Subject: [PATCH] Revert "fix about screen off timer" This reverts commit 3d175f2340c14250a71af78afec5a1e890d9f4e7. --- keyboards/crkbd/.vscode/c_cpp_properties.json | 21 ------------------- keyboards/crkbd/crkbd.c | 6 ------ keyboards/crkbd/ssd1306.c | 16 ++------------ keyboards/crkbd/ssd1306.h | 3 --- 4 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 keyboards/crkbd/.vscode/c_cpp_properties.json diff --git a/keyboards/crkbd/.vscode/c_cpp_properties.json b/keyboards/crkbd/.vscode/c_cpp_properties.json deleted file mode 100644 index 46dce25eae2..00000000000 --- a/keyboards/crkbd/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "configurations": [ - { - "name": "Win32", - "includePath": [ - "${workspaceFolder}/**" - ], - "defines": [ - "_DEBUG", - "UNICODE", - "_UNICODE" - ], - "windowsSdkVersion": "10.0.16299.0", - "compilerPath": "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.13.26128/bin/Hostx64/x64/cl.exe", - "cStandard": "c11", - "cppStandard": "c++17", - "intelliSenseMode": "msvc-x64" - } - ], - "version": 4 -} \ No newline at end of file diff --git a/keyboards/crkbd/crkbd.c b/keyboards/crkbd/crkbd.c index 0fd1564404e..5e8ba8bacf4 100644 --- a/keyboards/crkbd/crkbd.c +++ b/keyboards/crkbd/crkbd.c @@ -1,7 +1 @@ #include "crkbd.h" -#include "ssd1306.h" - -bool process_record_kb(uint16_t keycode, keyrecord_t *record) { - process_record_gfx(keycode,record); - return process_record_user(keycode, record); -} \ No newline at end of file diff --git a/keyboards/crkbd/ssd1306.c b/keyboards/crkbd/ssd1306.c index 33ffb7e2917..205ce67a9e0 100644 --- a/keyboards/crkbd/ssd1306.c +++ b/keyboards/crkbd/ssd1306.c @@ -24,17 +24,12 @@ static const unsigned char font[] PROGMEM; //static uint16_t last_battery_update; //static uint32_t vbat; //#define BatteryUpdateInterval 10000 /* milliseconds */ - -// 'last_flush' is declared as uint16_t, -// so this must be less than 65535 -#define ScreenOffInterval 60000 /* milliseconds */ +#define ScreenOffInterval 300000 /* 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) { @@ -326,19 +321,12 @@ void iota_gfx_task_user(void) { void iota_gfx_task(void) { iota_gfx_task_user(); - if (display.dirty || force_dirty) { + if (display.dirty) { iota_gfx_flush(); - force_dirty = false; } 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 diff --git a/keyboards/crkbd/ssd1306.h b/keyboards/crkbd/ssd1306.h index 71daf06ff48..76dd6a2a72d 100644 --- a/keyboards/crkbd/ssd1306.h +++ b/keyboards/crkbd/ssd1306.h @@ -3,7 +3,6 @@ #include #include #include "pincontrol.h" -#include "action.h" enum ssd1306_cmds { DisplayOff = 0xAE, @@ -87,5 +86,3 @@ 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);