From 76a167bc8e733a3b4f15f145c5bccd6279587853 Mon Sep 17 00:00:00 2001
From: n2232 <n2232@013db118-44a6-b54f-8bf7-843cb86687b1>
Date: Tue, 15 Feb 2011 09:03:02 +0000
Subject: [PATCH] =?UTF-8?q?>=E6=AD=A9=E6=95=B0=E8=A8=88=E3=83=90=E3=82=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20>=E3=83=BB=E5=86=85=E9=83=A8=E3=81=A7?=
 =?UTF-8?q?=E5=B9=B4=E3=81=AE=E6=AF=94=E8=BC=83=E3=82=92=E8=AA=A4=E3=81=A3?=
 =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=9F=E3=80=822021=E5=B9=B4=E3=81=AB?=
 =?UTF-8?q?=E3=83=90=E3=82=B0=E3=81=8C=E7=99=BA=E8=A6=9A=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E5=9B=9E=E9=81=BF=E3=81=A7=E3=81=8D=E3=81=9F?=
 =?UTF-8?q?=20=E5=A4=89=E6=8F=9B=E3=81=AB=E4=BD=BF=E3=81=86=E9=96=A2?=
 =?UTF-8?q?=E6=95=B0=E3=81=8C=E5=8F=8D=E5=AF=BE=E3=81=A7=E3=81=97=E3=81=9F?=
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@315 013db118-44a6-b54f-8bf7-843cb86687b1
---
 trunk/hoge.bin             | Bin 16387 -> 16387 bytes
 trunk/pedo_alg_thre_det2.c |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/trunk/hoge.bin b/trunk/hoge.bin
index af3f6927453036f245c9992b3c74b2f5c392230a..c2f684ebd64dc31b6bbc6b6d534b6714d18177e4 100644
GIT binary patch
delta 226
zcmZo}U~Fz++z`oYJjvh0;O~1@!S0#Mmx{Zb@W21njOnKVP>AIW1H*Fn`#&8S%ue{5
zq#>!<+{3HHq;mN9=c2y92a{s>c^LTrF&O#)6*l<`CN=;$#Rum7O+I$$`ouzYAwvr*
z14AnlBL)T-Ycsb%ARqe)|HEsT{+`&JEO(5T@x*2=okg7TC;Wx?u=FeZ`S4Tz&u8Yp
zATCqC5|FD1=5Bs%TE@b-dUKMMGOGZCn2|?H!!#icmxQuO94ZczTkTW0U{)|N005an
BS@r+`

delta 179
zcmZo}U~Fz++z`oY+~jX!@b^8dVE4@BOT}Gw_}~9(#`MzwD8zDxfnmA({hy8uW;^^%
z(vZ|_?%`EpntX|0ePV-(kfDW@fq|8gDFXwHwV7KWkdJ+b|KT-Ee|Kz7mOIAFxMQ=H
z&LU3v9sa_5So#(IeE2E<=QHzP5SOW63CL9hb2q;>En{JvxH-v6nRW71`;>_d0$ead
G85jUo$43tU

diff --git a/trunk/pedo_alg_thre_det2.c b/trunk/pedo_alg_thre_det2.c
index c071dd1..c472b25 100644
--- a/trunk/pedo_alg_thre_det2.c
+++ b/trunk/pedo_alg_thre_det2.c
@@ -500,9 +500,9 @@ static unsigned long my_sqrt(unsigned long x)
 ======================================================== */
 static u16 calc_hours_spend( u8 year )
 {
-	u8 temp_arg_year_bcd = bcdtob( year );
+	u8 temp_arg_year_bcd = btobcd( year );
 
-		// 同じ年の内
+	// 同じ年の内
     if( cal_log_latest.year_bcd == temp_arg_year_bcd )
     {
         if( now_longhour > last_hour_fny )