mirrors/opensteno_qmk
1
0
Fork 0
mirror of https://github.com/openstenoproject/qmk synced 2024-11-11 11:09:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Helix serial.c re-adjust compiler depend value of delay (#4269)

Browse source 
* Helix serial.c add debug code

* re-adjust READ_WRITE_WIDTH_ADJUST values

* re-adjust READ_WRITE_START_ADJUST values

* re-adjust TID_SEND_ADJUST value

* Helix serial.c: remove debug code
This commit is contained in:
Takeshi ISHII 2018-10-29 02:12:44 +09:00 committed by Drashna Jaelre
parent c60a312ba9
commit 8517f8a660
2 changed files with 44 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
keyboards/helix/rev2/split_scomm.c
View file

@ -7,9 +7,6 @@
#include <stddef.h> #include <stddef.h>
#include <split_scomm.h> #include <split_scomm.h>
#include "serial.h" #include "serial.h"
#ifdef SERIAL_DEBUG_MODE
#include <avr/io.h>
#endif
#ifdef CONSOLE_ENABLE #ifdef CONSOLE_ENABLE
#include <print.h> #include <print.h>
#endif #endif

36
keyboards/helix/serial.c
View file

@ -136,38 +136,68 @@ int serial_update_buffers()
// 5: about 20kbps // 5: about 20kbps
#endif #endif
#if __GNUC__ < 6
#define TID_SEND_ADJUST 14
#else
#define TID_SEND_ADJUST 2 #define TID_SEND_ADJUST 2
#endif
#if SELECT_SOFT_SERIAL_SPEED == 0 #if SELECT_SOFT_SERIAL_SPEED == 0
// Very High speed // Very High speed
#define SERIAL_DELAY 4 // micro sec #define SERIAL_DELAY 4 // micro sec
#if __GNUC__ < 6
#define READ_WRITE_START_ADJUST 33 // cycles #define READ_WRITE_START_ADJUST 33 // cycles
#define READ_WRITE_WIDTH_ADJUST 6 // cycles #define READ_WRITE_WIDTH_ADJUST 3 // cycles
#else
#define READ_WRITE_START_ADJUST 34 // cycles
#define READ_WRITE_WIDTH_ADJUST 7 // cycles
#endif
#elif SELECT_SOFT_SERIAL_SPEED == 1 #elif SELECT_SOFT_SERIAL_SPEED == 1
// High speed // High speed
#define SERIAL_DELAY 6 // micro sec #define SERIAL_DELAY 6 // micro sec
#if __GNUC__ < 6
#define READ_WRITE_START_ADJUST 30 // cycles #define READ_WRITE_START_ADJUST 30 // cycles
#define READ_WRITE_WIDTH_ADJUST 3 // cycles
#else
#define READ_WRITE_START_ADJUST 33 // cycles
#define READ_WRITE_WIDTH_ADJUST 7 // cycles #define READ_WRITE_WIDTH_ADJUST 7 // cycles
#endif
#elif SELECT_SOFT_SERIAL_SPEED == 2 #elif SELECT_SOFT_SERIAL_SPEED == 2
// Middle speed // Middle speed
#define SERIAL_DELAY 12 // micro sec #define SERIAL_DELAY 12 // micro sec
#define READ_WRITE_START_ADJUST 30 // cycles #define READ_WRITE_START_ADJUST 30 // cycles
#if __GNUC__ < 6
#define READ_WRITE_WIDTH_ADJUST 3 // cycles
#else
#define READ_WRITE_WIDTH_ADJUST 7 // cycles #define READ_WRITE_WIDTH_ADJUST 7 // cycles
#endif
#elif SELECT_SOFT_SERIAL_SPEED == 3 #elif SELECT_SOFT_SERIAL_SPEED == 3
// Low speed // Low speed
#define SERIAL_DELAY 24 // micro sec #define SERIAL_DELAY 24 // micro sec
#define READ_WRITE_START_ADJUST 30 // cycles #define READ_WRITE_START_ADJUST 30 // cycles
#if __GNUC__ < 6
#define READ_WRITE_WIDTH_ADJUST 3 // cycles
#else
#define READ_WRITE_WIDTH_ADJUST 7 // cycles #define READ_WRITE_WIDTH_ADJUST 7 // cycles
#endif
#elif SELECT_SOFT_SERIAL_SPEED == 4 #elif SELECT_SOFT_SERIAL_SPEED == 4
// Very Low speed // Very Low speed
#define SERIAL_DELAY 36 // micro sec #define SERIAL_DELAY 36 // micro sec
#define READ_WRITE_START_ADJUST 30 // cycles #define READ_WRITE_START_ADJUST 30 // cycles
#if __GNUC__ < 6
#define READ_WRITE_WIDTH_ADJUST 3 // cycles
#else
#define READ_WRITE_WIDTH_ADJUST 7 // cycles #define READ_WRITE_WIDTH_ADJUST 7 // cycles
#endif
#elif SELECT_SOFT_SERIAL_SPEED == 5 #elif SELECT_SOFT_SERIAL_SPEED == 5
// Ultra Low speed // Ultra Low speed
#define SERIAL_DELAY 48 // micro sec #define SERIAL_DELAY 48 // micro sec
#define READ_WRITE_START_ADJUST 30 // cycles #define READ_WRITE_START_ADJUST 30 // cycles
#if __GNUC__ < 6
#define READ_WRITE_WIDTH_ADJUST 3 // cycles
#else
#define READ_WRITE_WIDTH_ADJUST 7 // cycles #define READ_WRITE_WIDTH_ADJUST 7 // cycles
#endif
#else #else
#error invalid SELECT_SOFT_SERIAL_SPEED value #error invalid SELECT_SOFT_SERIAL_SPEED value
#endif /* SELECT_SOFT_SERIAL_SPEED */ #endif /* SELECT_SOFT_SERIAL_SPEED */
@ -187,16 +217,19 @@ int serial_update_buffers()
static SSTD_t *Transaction_table = NULL; static SSTD_t *Transaction_table = NULL;
static uint8_t Transaction_table_size = 0; static uint8_t Transaction_table_size = 0;
inline static void serial_delay(void) ALWAYS_INLINE;
inline static inline static
void serial_delay(void) { void serial_delay(void) {
_delay_us(SERIAL_DELAY); _delay_us(SERIAL_DELAY);
} }
inline static void serial_delay_half1(void) ALWAYS_INLINE;
inline static inline static
void serial_delay_half1(void) { void serial_delay_half1(void) {
_delay_us(SERIAL_DELAY_HALF1); _delay_us(SERIAL_DELAY_HALF1);
} }
inline static void serial_delay_half2(void) ALWAYS_INLINE;
inline static inline static
void serial_delay_half2(void) { void serial_delay_half2(void) {
_delay_us(SERIAL_DELAY_HALF2); _delay_us(SERIAL_DELAY_HALF2);
@ -216,6 +249,7 @@ void serial_input_with_pullup(void) {
SERIAL_PIN_PORT |= SERIAL_PIN_MASK; SERIAL_PIN_PORT |= SERIAL_PIN_MASK;
} }
inline static uint8_t serial_read_pin(void) ALWAYS_INLINE;
inline static inline static
uint8_t serial_read_pin(void) { uint8_t serial_read_pin(void) {
return !!(SERIAL_PIN_INPUT & SERIAL_PIN_MASK); return !!(SERIAL_PIN_INPUT & SERIAL_PIN_MASK);