me/qmk_firmware
1
0
Fork 0
forked from mirror/qmk_firmware
Code Pull Requests Activity

add debug code for retry

Browse Source
This commit is contained in:
mtei
2018-07-23 15:31:29 +09:00
parent 3f4cef6c84
commit d6540fd530
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
keyboards/helix/rev2/split_scomm.c
View File

@@ -4,10 +4,14 @@
#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
uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0}; uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0}; uint8_t volatile serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH] = {0};
uint8_t volatile status0 = 0; uint8_t volatile status_com = 0;
uint8_t volatile status1 = 0;
#ifdef SERIAL_USE_MULTI_TRANSACTION #ifdef SERIAL_USE_MULTI_TRANSACTION
uint8_t slave_buffer_change_count = 0; uint8_t slave_buffer_change_count = 0;
uint8_t s_change_old = 0xff; uint8_t s_change_old = 0xff;
@@ -15,7 +19,7 @@ uint8_t s_change_old = 0xff;
#ifndef SERIAL_USE_MULTI_TRANSACTION #ifndef SERIAL_USE_MULTI_TRANSACTION
SSTD_t transactions[] = { SSTD_t transactions[] = {
{ (uint8_t *)&status0, { (uint8_t *)&status_com,
sizeof(serial_master_buffer), (uint8_t *)serial_master_buffer, sizeof(serial_master_buffer), (uint8_t *)serial_master_buffer,
sizeof(serial_slave_buffer), (uint8_t *)serial_slave_buffer sizeof(serial_slave_buffer), (uint8_t *)serial_slave_buffer
} }
@@ -25,19 +29,19 @@ SSTD_t transactions[] = {
SSTD_t transactions[] = { SSTD_t transactions[] = {
#define GET_SLAVE_STATUS 0 #define GET_SLAVE_STATUS 0
/* master buffer not changed, only recive slave_buffer_change_count */ /* master buffer not changed, only recive slave_buffer_change_count */
{ (uint8_t *)&status0, { (uint8_t *)&status_com,
0, NULL, 0, NULL,
sizeof(slave_buffer_change_count), &slave_buffer_change_count, sizeof(slave_buffer_change_count), &slave_buffer_change_count,
}, },
#define PUT_MASTER_GET_SLAVE_STATUS 1 #define PUT_MASTER_GET_SLAVE_STATUS 1
/* master buffer changed need send, and recive slave_buffer_change_count */ /* master buffer changed need send, and recive slave_buffer_change_count */
{ (uint8_t *)&status0, { (uint8_t *)&status_com,
sizeof(serial_master_buffer), (uint8_t *)serial_master_buffer, sizeof(serial_master_buffer), (uint8_t *)serial_master_buffer,
sizeof(slave_buffer_change_count), &slave_buffer_change_count, sizeof(slave_buffer_change_count), &slave_buffer_change_count,
}, },
#define GET_SLAVE_BUFFER 2 #define GET_SLAVE_BUFFER 2
/* recive serial_slave_buffer */ /* recive serial_slave_buffer */
{ (uint8_t *)&status0, { (uint8_t *)&status1,
0, NULL, 0, NULL,
sizeof(serial_slave_buffer), (uint8_t *)serial_slave_buffer sizeof(serial_slave_buffer), (uint8_t *)serial_slave_buffer
} }
@@ -72,9 +76,13 @@ int serial_update_buffers(int master_update)
else else
status = soft_serial_transaction(PUT_MASTER_GET_SLAVE_STATUS); status = soft_serial_transaction(PUT_MASTER_GET_SLAVE_STATUS);
need_retry = ( status == TRANSACTION_END ) ? 0 : 1; need_retry = ( status == TRANSACTION_END ) ? 0 : 1;
if( need_retry ) debug_retry_on(); else debug_retry_off();
return status; return status;
#else #else
return soft_serial_transaction(); int status;
status = soft_serial_transaction();
if( status != TRANSACTION_END ) debug_retry_on(); else debug_retry_off();
return status;
#endif #endif
} }
#endif /* USE_SERIAL */ #endif /* USE_SERIAL */

10
keyboards/helix/serial.h
View File

@@ -59,6 +59,7 @@ int soft_serial_get_and_clean_status(int sstd_index);
#define SERIAL_DEBUG_MODE_WATCH_SYNC 0x8 #define SERIAL_DEBUG_MODE_WATCH_SYNC 0x8
#define SERIAL_DEBUG_MODE_WATCH_IOCHG 0x10 #define SERIAL_DEBUG_MODE_WATCH_IOCHG 0x10
#define SERIAL_DEBUG_MODE_WATCH_PARITY 0x20 #define SERIAL_DEBUG_MODE_WATCH_PARITY 0x20
#define SERIAL_DEBUG_MODE_WATCH_RETRY 0x40
//#define SERIAL_DEBUG_MODE SERIAL_DEBUG_MODE_WATCH_OUTMODE //#define SERIAL_DEBUG_MODE SERIAL_DEBUG_MODE_WATCH_OUTMODE
//#define SERIAL_DEBUG_MODE SERIAL_DEBUG_MODE_WATCH_RCVSAMPLE //#define SERIAL_DEBUG_MODE SERIAL_DEBUG_MODE_WATCH_RCVSAMPLE
@@ -69,6 +70,7 @@ int soft_serial_get_and_clean_status(int sstd_index);
//#define SERIAL_DEBUG_MODE SERIAL_DEBUG_MODE_WATCH_IOCHG //#define SERIAL_DEBUG_MODE SERIAL_DEBUG_MODE_WATCH_IOCHG
//#define SERIAL_DEBUG_MODE (SERIAL_DEBUG_MODE_WATCH_IOCHG|SERIAL_DEBUG_MODE_WATCH_SYNC) //#define SERIAL_DEBUG_MODE (SERIAL_DEBUG_MODE_WATCH_IOCHG|SERIAL_DEBUG_MODE_WATCH_SYNC)
//#define SERIAL_DEBUG_MODE SERIAL_DEBUG_MODE_WATCH_PARITY //#define SERIAL_DEBUG_MODE SERIAL_DEBUG_MODE_WATCH_PARITY
//#define SERIAL_DEBUG_MODE SERIAL_DEBUG_MODE_WATCH_RETRY
// Helix keyboard unused port (for Logic analyzer or oscilloscope) // Helix keyboard unused port (for Logic analyzer or oscilloscope)
#ifdef SERIAL_DEBUG_MODE #ifdef SERIAL_DEBUG_MODE
@@ -129,6 +131,14 @@ int soft_serial_get_and_clean_status(int sstd_index);
#define debug_parity_off() #define debug_parity_off()
#endif #endif
#if SERIAL_DEBUG_MODE & SERIAL_DEBUG_MODE_WATCH_RETRY
#define debug_retry_on() SERIAL_DBGPIN_PORT |= SERIAL_DBGPIN_MASK
#define debug_retry_off() SERIAL_DBGPIN_PORT &= ~SERIAL_DBGPIN_MASK
#else
#define debug_retry_on()
#define debug_retry_off()
#endif
#define SYNC_DEBUG_MODE 0 #define SYNC_DEBUG_MODE 0
#if SYNC_DEBUG_MODE == 0 #if SYNC_DEBUG_MODE == 0
#define debug_dummy_delay_recv() #define debug_dummy_delay_recv()