From 25206d2ee767e17908fcb690da91ab1eadf2e252 Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Mon, 25 Jan 2010 11:28:42 +0000 Subject: [PATCH] =?UTF-8?q?=E6=AD=A9=E6=95=B0=E8=A8=88=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E3=81=AE=E8=AA=AD=E3=81=BF=E5=87=BA=E3=81=97=E6=99=82=E3=80=81?= =?UTF-8?q?=E3=83=AA=E3=83=88=E3=83=AB=E3=82=A8=E3=83=B3=E3=83=87=E3=82=A3?= =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=AE=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20Horizon=E3=83=AA=E3=83=9D=E3=82=B8=E3=83=88?= =?UTF-8?q?=E3=83=AA=E3=81=AB0.D=E3=81=A8=E3=81=97=E3=81=A6=E3=83=AA?= =?UTF-8?q?=E3=83=AA=E3=83=BC=E3=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@86 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/accero.c | 4 ++-- trunk/i2c_ctr.c | 2 +- trunk/renge/renge.c | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/trunk/accero.c b/trunk/accero.c index d0eacc5..65b6c52 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -314,11 +314,11 @@ u8 hosu_read( ) temp = pool[ p_record_buffer ]; if( record_read_msb_lsb == 0 ) { - dat = (u8)(( temp >> 8 ) & 0x00FF ); + dat = (u8)( temp & 0x00FF ); } else { - dat = (u8)( temp & 0x00FF ); + dat = (u8)(( temp >> 8 ) & 0x00FF ); p_record_buffer -= 1; } record_read_msb_lsb += 1; diff --git a/trunk/i2c_ctr.c b/trunk/i2c_ctr.c index 85aae20..944de0a 100644 --- a/trunk/i2c_ctr.c +++ b/trunk/i2c_ctr.c @@ -169,7 +169,7 @@ __interrupt void int_iic_ctr( ) vreg_ctr_after_read( reg_adrs ); // 読んだらクリアなどの処理 } else - { // 受信 + { // 受信 trx_buf = IICA; vreg_ctr_write( reg_adrs, trx_buf ); WREL = 1; diff --git a/trunk/renge/renge.c b/trunk/renge/renge.c index 4d3b5fa..a646dcd 100644 --- a/trunk/renge/renge.c +++ b/trunk/renge/renge.c @@ -156,8 +156,6 @@ err renge_task_immed_add( task_status* new_task ){ if( tasks_immed[ i ] == TSK_IMM_EMPTY_ ) { tasks_immed[ i ] = new_task; - DBG_LED_WIFI_2_off; - DBG_LED_WIFI_2_on; return( ERR_SUCCESS ); } } @@ -181,7 +179,6 @@ err renge_task_immed_run(){ do{ last_task_id = 0xFF; - DBG_LED_WIFI_2_off; for( list_id = 0; list_id < TASK_IMMED_RUN_LIST_MAX; list_id += 1 ){ if( tasks_immed[ list_id ] != TSK_IMM_EMPTY_ ){ #ifdef _renge_test_ @@ -237,7 +234,6 @@ err renge_task_immed_run(){ for( ; j < TASK_IMMED_RUN_LIST_MAX; j++ ) { DI(); -// DBG_LED_WIFI_2_on; if( tasks_immed[ i ] == TSK_IMM_DELETED_ ) { if( tasks_immed[ j ] == TSK_IMM_EMPTY_ ) @@ -258,7 +254,6 @@ err renge_task_immed_run(){ } } #endif -// DBG_LED_WIFI_2_off; EI(); break; } @@ -282,7 +277,6 @@ err renge_task_immed_run(){ #endif i += 1; } -// DBG_LED_WIFI_2_off; EI(); if( tasks_immed[ i ] == TSK_IMM_EMPTY_ ) { @@ -294,7 +288,6 @@ err renge_task_immed_run(){ } } DI(); -// DBG_LED_WIFI_2_on; // ここまでで完全に前詰めされている for( j = 0; j < TASK_IMMED_RUN_LIST_MAX; j++ ) @@ -320,7 +313,6 @@ err renge_task_immed_run(){ tasks_immed[ j ] = TSK_IMM_EMPTY_; } } -// DBG_LED_WIFI_2_off; EI(); } }