From 80dd01c515840a3ea931f902737e063dad414881 Mon Sep 17 00:00:00 2001
From: n2232 <n2232@013db118-44a6-b54f-8bf7-843cb86687b1>
Date: Tue, 15 Feb 2011 09:22:06 +0000
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E3=81=A7=E5=B9=B4=E3=81=AE?=
 =?UTF-8?q?=E6=AF=94=E8=BC=83=E3=82=92=E8=AA=A4=E3=81=A3=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=81=9F=E3=80=82(=E5=86=8D)?=
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@316 013db118-44a6-b54f-8bf7-843cb86687b1
---
 trunk/hoge.bin             | Bin 16387 -> 16387 bytes
 trunk/pedo_alg_thre_det2.c |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/trunk/hoge.bin b/trunk/hoge.bin
index c2f684ebd64dc31b6bbc6b6d534b6714d18177e4..efa2ea8316655c65938cad8c9bc6f298165a079a 100644
GIT binary patch
delta 430
zcmZo}U~Fz+OwY>5G2#7>0@ix1_ksyj`aoF6z_h3@Ox(`zfv=@su0M<qp*O<yLHKW=
z{EvPU3xg&$aBVz1jmNmo-^AeWdse~jnah`oyKM2l|J97?rvXri<qQMEa`*c`9U07u
z{Y}ykYKk}a@QN~VmG}!LE+{%M?{CuN^ZZ&98&rf0Ev$?TtV|3T7+|c;+ya4o>|6W~
zuVMPTWplFJF<!<ko3(TnamsJ;7v96tukh!?Px(Keng4>gO#Mngt|FMb`L$^Yi&}s0
zpT86N%M<<Xi>#mU$7#l&dz|ZM{85_lN9eur_xA?kA2$l68}?1^u##orPEYikyxMA;
zc&g8FGe_3KmSgvLzZ(55^ax=6D`xUGb#jHZt$eCazXR)h*`M<je%_S*`S-ec(tP=!
z=Z*d{6$S*bzD?bH#rh8;quJ(*wyPMq|1+@h2uaAPXc?GIo@$>mu|b3j<|_sU0K`Dw
A-T(jq

delta 482
zcmZo}U~Fz+OwY>5G2#7>0ycSV@q!7|`9N5w!L*bwOx)S;sjr=1kw1(Np|`>HLHHk`
z{BM2}3xg&$aBVz1jmLPBzlp)$_pE~5GnX$FcRAsI|En3(PXnM3%NYiS<?i=?Ix?7@
z@Ha_AQnR^-SCq-H!e20PLD7MEf0K?Kx_<ch=c2y92a{s>c^LTrF&O#)bu|GMGyplp
zKsCugH4_Wfg$ymM3=FMIj2IYTtj*j4fqd*I{12~T`g>w?vfMFV#uJ;hbQW>SpYRvn
z!_u$t=fh9=KcAWZg1AimN<gk6n7jG4X$gx@+TYdu<^8>X68-Oste^15X~v&>oa<-&
zQJU~a=)L*(_a^CveH(>t_Wt?kd|x^(hI!(B=4bC2zp>;p8rljmG6R({%>b(81)DH=
znbkJ&ET7|Mj;w_($L{fdHTqlV5y1La%;as><YH@E#;nO3tz{XrHlMft!^mj8`Hbx<
qMkxk19w7-i6)giZ1~DU#l!j?S8ZHTClQ>iyCO6uraKXIEzyJV?JobkG

diff --git a/trunk/pedo_alg_thre_det2.c b/trunk/pedo_alg_thre_det2.c
index c472b25..a3be680 100644
--- a/trunk/pedo_alg_thre_det2.c
+++ b/trunk/pedo_alg_thre_det2.c
@@ -500,10 +500,10 @@ static unsigned long my_sqrt(unsigned long x)
 ======================================================== */
 static u16 calc_hours_spend( u8 year )
 {
-	u8 temp_arg_year_bcd = btobcd( year );
+	u8 cal_log_latest_year = bcdtob( cal_log_latest.year_bcd );
 
 	// 同じ年の内
-    if( cal_log_latest.year_bcd == temp_arg_year_bcd )
+    if( cal_log_latest_year == year )
     {
         if( now_longhour > last_hour_fny )
         {
@@ -514,12 +514,12 @@ static u16 calc_hours_spend( u8 year )
 			return( 0 );  // 同じ時間帯(と、巻き戻り。　どうなっても知らない)
 		}
     }
-    else if( cal_log_latest.year_bcd == ( temp_arg_year_bcd -1 ) )
+    else if( cal_log_latest_year == ( year -1 ) )
     {
         // 年をまたいでいるとき
         return( ( ( 365 + ( is_firstyear(year) ? 1: 0 )) * 24 ) - last_hour_fny + now_longhour );
     }
-    else if( cal_log_latest.year_bcd < temp_arg_year_bcd )
+    else if( cal_log_latest_year < year )
     {
         // 数年放置
         return( PEDOMETER_LOG_SIZE +1 );