mirror of
https://github.com/rvtr/ctr_mcu.git
synced 2025-10-31 13:51:10 -04:00
歩数計ログの読み出し時、リトルエンディアンになっていなかったのを修正
Horizonリポジトリに0.Dとしてリリース 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
This commit is contained in:
parent
63580485f6
commit
25206d2ee7
@ -314,11 +314,11 @@ u8 hosu_read( )
|
|||||||
temp = pool[ p_record_buffer ];
|
temp = pool[ p_record_buffer ];
|
||||||
if( record_read_msb_lsb == 0 )
|
if( record_read_msb_lsb == 0 )
|
||||||
{
|
{
|
||||||
dat = (u8)(( temp >> 8 ) & 0x00FF );
|
dat = (u8)( temp & 0x00FF );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dat = (u8)( temp & 0x00FF );
|
dat = (u8)(( temp >> 8 ) & 0x00FF );
|
||||||
p_record_buffer -= 1;
|
p_record_buffer -= 1;
|
||||||
}
|
}
|
||||||
record_read_msb_lsb += 1;
|
record_read_msb_lsb += 1;
|
||||||
|
|||||||
@ -169,7 +169,7 @@ __interrupt void int_iic_ctr( )
|
|||||||
vreg_ctr_after_read( reg_adrs ); // 読んだらクリアなどの処理
|
vreg_ctr_after_read( reg_adrs ); // 読んだらクリアなどの処理
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{ // 受信
|
{ // 受信
|
||||||
trx_buf = IICA;
|
trx_buf = IICA;
|
||||||
vreg_ctr_write( reg_adrs, trx_buf );
|
vreg_ctr_write( reg_adrs, trx_buf );
|
||||||
WREL = 1;
|
WREL = 1;
|
||||||
|
|||||||
@ -156,8 +156,6 @@ err renge_task_immed_add( task_status* new_task ){
|
|||||||
if( tasks_immed[ i ] == TSK_IMM_EMPTY_ )
|
if( tasks_immed[ i ] == TSK_IMM_EMPTY_ )
|
||||||
{
|
{
|
||||||
tasks_immed[ i ] = new_task;
|
tasks_immed[ i ] = new_task;
|
||||||
DBG_LED_WIFI_2_off;
|
|
||||||
DBG_LED_WIFI_2_on;
|
|
||||||
return( ERR_SUCCESS );
|
return( ERR_SUCCESS );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -181,7 +179,6 @@ err renge_task_immed_run(){
|
|||||||
|
|
||||||
do{
|
do{
|
||||||
last_task_id = 0xFF;
|
last_task_id = 0xFF;
|
||||||
DBG_LED_WIFI_2_off;
|
|
||||||
for( list_id = 0; list_id < TASK_IMMED_RUN_LIST_MAX; list_id += 1 ){
|
for( list_id = 0; list_id < TASK_IMMED_RUN_LIST_MAX; list_id += 1 ){
|
||||||
if( tasks_immed[ list_id ] != TSK_IMM_EMPTY_ ){
|
if( tasks_immed[ list_id ] != TSK_IMM_EMPTY_ ){
|
||||||
#ifdef _renge_test_
|
#ifdef _renge_test_
|
||||||
@ -237,7 +234,6 @@ err renge_task_immed_run(){
|
|||||||
for( ; j < TASK_IMMED_RUN_LIST_MAX; j++ )
|
for( ; j < TASK_IMMED_RUN_LIST_MAX; j++ )
|
||||||
{
|
{
|
||||||
DI();
|
DI();
|
||||||
// DBG_LED_WIFI_2_on;
|
|
||||||
if( tasks_immed[ i ] == TSK_IMM_DELETED_ )
|
if( tasks_immed[ i ] == TSK_IMM_DELETED_ )
|
||||||
{
|
{
|
||||||
if( tasks_immed[ j ] == TSK_IMM_EMPTY_ )
|
if( tasks_immed[ j ] == TSK_IMM_EMPTY_ )
|
||||||
@ -258,7 +254,6 @@ err renge_task_immed_run(){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
// DBG_LED_WIFI_2_off;
|
|
||||||
EI();
|
EI();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -282,7 +277,6 @@ err renge_task_immed_run(){
|
|||||||
#endif
|
#endif
|
||||||
i += 1;
|
i += 1;
|
||||||
}
|
}
|
||||||
// DBG_LED_WIFI_2_off;
|
|
||||||
EI();
|
EI();
|
||||||
if( tasks_immed[ i ] == TSK_IMM_EMPTY_ )
|
if( tasks_immed[ i ] == TSK_IMM_EMPTY_ )
|
||||||
{
|
{
|
||||||
@ -294,7 +288,6 @@ err renge_task_immed_run(){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
DI();
|
DI();
|
||||||
// DBG_LED_WIFI_2_on;
|
|
||||||
|
|
||||||
// ここまでで完全に前詰めされている
|
// ここまでで完全に前詰めされている
|
||||||
for( j = 0; j < TASK_IMMED_RUN_LIST_MAX; j++ )
|
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_;
|
tasks_immed[ j ] = TSK_IMM_EMPTY_;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// DBG_LED_WIFI_2_off;
|
|
||||||
EI();
|
EI();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user