summaryrefslogtreecommitdiff
path: root/keyboards/helix/rev2
diff options
context:
space:
mode:
authorTakeshi ISHII <2170248+mtei@users.noreply.github.com>2018-10-23 03:38:05 +0900
committerDrashna Jaelre <drashna@live.com>2018-10-22 11:38:05 -0700
commit4665e4ffffcdfc6fe6f498928963adc64f6fefd7 (patch)
tree84965f640896bdbf28977eb98abeeded509a614d /keyboards/helix/rev2
parentfbc6bd82664f7286e358e14da6c7945aa061ee3b (diff)
Keyboard: Helix serial.c, split_scom.c bug fix and update (#4191)
* helix/serial.c add support PD1,PD3,PE6 and configuration simplify * Add comment about ATmega32U4 I2C * Add compile time check for ATmega32U4 I2C * change TAB code to 8 SPACE code * Helix serial.c PORTD,PD0 test. OK OK PD0 - PD1 OK PD2 - PD3 - PE6 * Helix serial.c PORTD,PD1 test. OK OK PD0 OK PD1 OK PD2 - PD3 - PE6 * Helix serial.c PORTD,PD3 test. OK OK PD0 OK PD1 OK PD2 OK PD3 - PE6 * Helix serial.c PORTE,PD6 test. OK OK PD0 OK PD1 OK PD2 OK PD3 OK PE6 * Helix serial.c: PD0,PD1,PD3,PE6 all test end * Helix serial.c: rename SOFT_SERIAL_PORT to SOFT_SERIAL_PIN * Helix serial.c add debug code * Helix serial.c: add transaction ID range check * Helix serial.c debug code update * Helix serial.c debug code update * Helix serial.c: Strict checking of the value of tid. * adjust the delay of serial.c * Helix serial.c: remove debug code * remove EXTRAFLAGS += -DCONSOLE_ENABLE from five_rows/rules.mk tmk_core/common.mk has >ifeq ($(strip $(CONSOLE_ENABLE)), yes) > TMK_COMMON_DEFS += -DCONSOLE_ENABLE * Fix error handling in split_scomm.c * add some comment to serial.c * add some comment about SELECT_SOFT_SERIAL_SPEED
Diffstat (limited to 'keyboards/helix/rev2')
-rw-r--r--keyboards/helix/rev2/keymaps/five_rows/rules.mk4
-rw-r--r--keyboards/helix/rev2/serial_config.h15
-rw-r--r--keyboards/helix/rev2/split_scomm.c48
3 files changed, 39 insertions, 28 deletions
diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
index 63106df764..f771c94c9c 100644
--- a/keyboards/helix/rev2/keymaps/five_rows/rules.mk
+++ b/keyboards/helix/rev2/keymaps/five_rows/rules.mk
@@ -122,10 +122,6 @@ ifeq ($(strip $(Link_Time_Optimization)),yes)
EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization
endif
-ifeq ($(strip $(CONSOLE_ENABLE)),yes)
- EXTRAFLAGS += -DCONSOLE_ENABLE
-endif
-
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
diff --git a/keyboards/helix/rev2/serial_config.h b/keyboards/helix/rev2/serial_config.h
index 8d7e628378..37135213d5 100644
--- a/keyboards/helix/rev2/serial_config.h
+++ b/keyboards/helix/rev2/serial_config.h
@@ -1,15 +1,8 @@
-#ifndef SOFT_SERIAL_CONFIG_H
-#define SOFT_SERIAL_CONFIG_H
+//// #error rev2 serial config
+#ifndef SOFT_SERIAL_PIN
/* Soft Serial defines */
-#define SERIAL_PIN_DDR DDRD
-#define SERIAL_PIN_PORT PORTD
-#define SERIAL_PIN_INPUT PIND
-#define SERIAL_PIN_MASK _BV(PD2)
-#define SERIAL_PIN_INTERRUPT INT2_vect
+#define SOFT_SERIAL_PIN D2
#define SERIAL_USE_MULTI_TRANSACTION
-
-//// #error rev2 serial config
-
-#endif /* SOFT_SERIAL_CONFIG_H */
+#endif
diff --git a/keyboards/helix/rev2/split_scomm.c b/keyboards/helix/rev2/split_scomm.c
index 9719eb22ea..50d233ce9a 100644
--- a/keyboards/helix/rev2/split_scomm.c
+++ b/keyboards/helix/rev2/split_scomm.c
@@ -10,6 +10,9 @@
#ifdef SERIAL_DEBUG_MODE
#include <avr/io.h>
#endif
+#ifdef CONSOLE_ENABLE
+ #include <print.h>
+#endif
uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0};
@@ -17,6 +20,7 @@ uint8_t volatile status_com = 0;
uint8_t volatile status1 = 0;
uint8_t slave_buffer_change_count = 0;
uint8_t s_change_old = 0xff;
+uint8_t s_change_new = 0xff;
SSTD_t transactions[] = {
#define GET_SLAVE_STATUS 0
@@ -41,12 +45,12 @@ SSTD_t transactions[] = {
void serial_master_init(void)
{
- soft_serial_initiator_init(transactions);
+ soft_serial_initiator_init(transactions, TID_LIMIT(transactions));
}
void serial_slave_init(void)
{
- soft_serial_target_init(transactions);
+ soft_serial_target_init(transactions, TID_LIMIT(transactions));
}
// 0 => no error
@@ -54,19 +58,37 @@ void serial_slave_init(void)
// 2 => checksum error
int serial_update_buffers(int master_update)
{
- int status;
+ int status, smatstatus;
static int need_retry = 0;
- if( s_change_old != slave_buffer_change_count ) {
- status = soft_serial_transaction(GET_SLAVE_BUFFER);
- if( status == TRANSACTION_END )
- s_change_old = slave_buffer_change_count;
+
+ if( s_change_old != s_change_new ) {
+ smatstatus = soft_serial_transaction(GET_SLAVE_BUFFER);
+ if( smatstatus == TRANSACTION_END ) {
+ s_change_old = s_change_new;
+#ifdef CONSOLE_ENABLE
+ uprintf("slave matrix = %b %b %b %b %b\n",
+ serial_slave_buffer[0], serial_slave_buffer[1],
+ serial_slave_buffer[2], serial_slave_buffer[3],
+ serial_slave_buffer[4] );
+#endif
+ }
+ } else {
+ // serial_slave_buffer dosen't change
+ smatstatus = TRANSACTION_END; // dummy status
+ }
+
+ if( !master_update && !need_retry) {
+ status = soft_serial_transaction(GET_SLAVE_STATUS);
+ } else {
+ status = soft_serial_transaction(PUT_MASTER_GET_SLAVE_STATUS);
+ }
+ if( status == TRANSACTION_END ) {
+ s_change_new = slave_buffer_change_count;
+ need_retry = 0;
+ } else {
+ need_retry = 1;
}
- if( !master_update && !need_retry)
- status = soft_serial_transaction(GET_SLAVE_STATUS);
- else
- status = soft_serial_transaction(PUT_MASTER_GET_SLAVE_STATUS);
- need_retry = ( status == TRANSACTION_END ) ? 0 : 1;
- return status;
+ return smatstatus;
}
#endif // SERIAL_USE_MULTI_TRANSACTION