From c010d52b9b0f98326cbe494d3fbc252167cc8fc9 Mon Sep 17 00:00:00 2001 From: huangruiqiao Date: Sat, 12 Apr 2025 10:05:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=A5=BC=E5=B7=A5=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E7=BC=96=E8=AF=91=E9=80=9A=E8=BF=87=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E9=87=8D=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../developed/debug/inc/dbversion.h | 4 +- .../developed/debug/inc/debug_log_ap.h | 2 +- .../apps/at_command/GCC/FeatCustom_ec718s.inc | 2 +- .../ap/apps/at_command/GCC/Makefile | 2 +- ....0_spo2wrnet_for_GH3228T_cd023f - 副本.c | 511 ++++++++++++++++++ .../at_command/src/gps/adaptation/icoe_adap.c | 2 +- .../at_command/src/gps/adaptation/icoe_adap.h | 5 +- .../ap/apps/at_command/src/gps/icoe_gps.h | 5 +- .../ap/apps/at_command/src/gps/icoe_load_fw.c | 27 +- .../ap/apps/at_command/src/gps/icoe_xmodem.c | 2 +- .../ap/apps/at_command/src/gps_uart_read.c | 13 +- .../src/ppg/gh3x2x_demo_algo_config.h | 2 +- .../src/ppg/gh3x2x_demo_algo_hook.c | 4 +- .../apps/at_command/src/ppg/gh_demo_config.h | 4 +- .../ap/apps/at_command/src/ppg/gh_demo_hook.c | 8 +- .../ap/apps/at_command/src/ppg/gh_demo_user.c | 16 +- .../ap/apps/at_command/src/sk_main.c | 5 +- .../ap/apps/at_command/src/sk_ppg.c | 132 +++-- ec_fullsdk/PLAT/tools/UpdateDBPattern.txt | 12 + ec_fullsdk/PLAT/tools/comdb_cust_lib.txt | 6 +- 20 files changed, 648 insertions(+), 116 deletions(-) create mode 100644 ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/goodix_pv_v2.1.0.0_spo2wrnet_for_GH3228T_cd023f - 副本.c create mode 100644 ec_fullsdk/PLAT/tools/UpdateDBPattern.txt diff --git a/ec_fullsdk/PLAT/middleware/developed/debug/inc/dbversion.h b/ec_fullsdk/PLAT/middleware/developed/debug/inc/dbversion.h index 9a5c77a..ddf7d39 100644 --- a/ec_fullsdk/PLAT/middleware/developed/debug/inc/dbversion.h +++ b/ec_fullsdk/PLAT/middleware/developed/debug/inc/dbversion.h @@ -1,8 +1,8 @@ #if !defined _DB_VERSION_H #define _DB_VERSION_H -//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Fri Apr 11 09:44:03 2025 +//The file was automatically generated by the PrePass Application Ver 2.2.81.216, Sat Apr 12 09:57:39 2025 -#define DB_VERSION_UNIQ_ID "0x161a2577" +#define DB_VERSION_UNIQ_ID "0x6f8b5996" #endif //_DB_VERSION_H diff --git a/ec_fullsdk/PLAT/middleware/developed/debug/inc/debug_log_ap.h b/ec_fullsdk/PLAT/middleware/developed/debug/inc/debug_log_ap.h index 8146ea3..a30d84b 100644 --- a/ec_fullsdk/PLAT/middleware/developed/debug/inc/debug_log_ap.h +++ b/ec_fullsdk/PLAT/middleware/developed/debug/inc/debug_log_ap.h @@ -1,7 +1,7 @@ #if !defined _DEBUG_LOG_H #define _DEBUG_LOG_H -//This file was automatically generated by the PrePass Application ver 2.2.81.216, Fri Apr 11 09:44:03 2025 +//This file was automatically generated by the PrePass Application ver 2.2.81.216, Sat Apr 12 09:57:39 2025 #include "debug_trace.h" diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/GCC/FeatCustom_ec718s.inc b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/GCC/FeatCustom_ec718s.inc index 374a8fd..0c59360 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/GCC/FeatCustom_ec718s.inc +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/GCC/FeatCustom_ec718s.inc @@ -10,7 +10,7 @@ BIN_COMPRESS = y DRIVER_CPFLASH_ENABLE = n DRIVER_VPU_ENABLE = n DRIVER_EEPROM_ENABLE = n -DRIVER_SPI_ENABLE = n +DRIVER_SPI_ENABLE = y ifeq ($(MID_FEATURE_ENABLE), y) DRIVER_I2C_ENABLE = y else diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/GCC/Makefile b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/GCC/Makefile index 51acebd..1ac3339 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/GCC/Makefile +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/GCC/Makefile @@ -172,7 +172,7 @@ APP_SRC_DIRS += $(APP_DIR)/src/ppg \ $(APP_DIR)/src/gps/adaptation \ $(APP_DIR)/src/gps/offline_eph \ $(APP_DIR)/src/gps/offline_eph/ext/aes \ - $(APP_DIR)/gps + $(APP_DIR)/src/gps APP_EXCLUDE_FILES := diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/goodix_pv_v2.1.0.0_spo2wrnet_for_GH3228T_cd023f - 副本.c b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/goodix_pv_v2.1.0.0_spo2wrnet_for_GH3228T_cd023f - 副本.c new file mode 100644 index 0000000..08f298f --- /dev/null +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/goodix_pv_v2.1.0.0_spo2wrnet_for_GH3228T_cd023f - 副本.c @@ -0,0 +1,511 @@ +#ifndef Goodix_DSP_EXPORTS +#include "goodix_type.h" +#define NET_VERSION "GH3228T_cd023f" +#define NET_SIZE 3924 +const uint32_t Spo2WRWeights[] = { +0, 1073741329, 3999574012, 3471442047, 3780214886, 4000178303, 2929950804, 2495143628, +2970290559, 2156167122, 619404616, 789348584, 3319933902, 2136996736, 3954499501, 2155844344, +4260807495, 1448902467, 3148709986, 3708372977, 3363859666, 1082112248, 3206147517, 1058585058, +1058107101, 1058524726, 1058716434, 1060996767, 1057088519, 1062156363, 1060983320, 1064176116, +1051455998, 1059839158, 1063356877, 1065353216, 1058338418, 1058483133, 1062110265, 1060347853, +4096437775, 4173578114, 96249287, 142302726, 46176432, 4279652685, 4201656531, 120110439, +112533895, 4131872153, 4251881560, 4259020204, 4058346203, 268435456, 4187527169, 4110472463, +3229969796, 1082486148, 3221450872, 1073899927, 888286203, 1051730340, 3366000070, 85295127, +1387195297, 3675960313, 333756164, 333536896, 3441354296, 856907113, 3363813340, 183520783, +601333949, 3803309266, 3584077349, 2157104088, 3210167754, 1062573886, 1063109708, 1065353216, +1064663899, 1063962545, 4056203542, 27958070, 268435456, 240853462, 3222753533, 1075269885, +0, 1080528951, 150957696, 4169099135, 1745584307, 3212691973, 1065078385, 1056383158, +1065353216, 1059458681, 1059967368, 43763034, 36959618, 29778676, 268435456, 3221610982, +1074127334, 0, 1074752954, 1082923648, 52227200, 4221369216, 2135430759, 2159638586, +3531608289, 4135525715, 2715809664, 209761226, 2771812447, 3622469461, 773619865, 2162688333, +2206207203, 1937762878, 2160061178, 3207675224, 1060100829, 1054674996, 1052144291, 1065353216, +1059417531, 1049044443, 1059058566, 1055481670, 1065001480, 1055421370, 1051162596, 1058362508, +1050752920, 1053679741, 1061351470, 1058995308, 1058531701, 4181018345, 4261061511, 4178568690, +147835997, 155989941, 4121771723, 84695956, 4165806231, 4123362933, 4145569003, 217143882, +4292846979, 4156635296, 268435456, 22989955, 4148329231, 3218508640, 1071024992, 3215272250, +1066893384, 0, 1073250996, 2161419784, 232790274, 3435180006, 1200405713, 2278343415, +3087714316, 3456860347, 951516346, 1377696222, 4062543713, 3579915609, 4084432880, 1108686887, +876234790, 2136013639, 820272608, 3209444426, 1061856209, 1065348550, 1061910582, 1063509064, +1065353216, 4281893116, 4026531840, 74441011, 4282719262, 3228146934, 1080663286, 0, +1082660499, 2153771647, 4033469177, 2145588608, 3208234995, 1060656227, 1061204640, 1063926475, +1059131310, 1065353216, 4293907511, 4285572924, 23145812, 4026531840, 3223207109, 1075723461, +0, 1073459757, 2161707529, 562037750, 2161642503, 2148857586, 142607599, 276888280, +2021710558, 2148950699, 2407560104, 176169955, 981508607, 2161648597, 562031577, 612433660, +1573617582, 4109220736, 3208800200, 1061217016, 1060271586, 1052288904, 1062534431, 1065353216, +1052662144, 1043946311, 1043405011, 1049353392, 1041199451, 1049562776, 1046290015, 1051475883, +1044370844, 1050045716, 1050591949, 1049566002, 4026531840, 4091904097, 4112926457, 4256521358, +4274151182, 4129422542, 4107332473, 4137344156, 4163127615, 4050213461, 4283471552, 4288776512, +4148506786, 88599912, 4191362814, 4205773158, 3214316959, 1066833311, 3197379088, 1035358543, +0, 1072226857, 3188088941, 1045560072, 3180863642, 1049821279, 1057142566, 1053751385, +1034609895, 3198056750, 3190147577, 3203025485, 1060921984, 1044424167, 3125393333, 1052072978, +3178442557, 1044065743, 3187014746, 1059069745, 1036939185, 1055180309, 3181306100, 3171395037, +1049596484, 1053454790, 1042198871, 3185582551, 3195715016, 1047497607, 3163126620, 1028103420, +3182220766, 3163506534, 3148835688, 3193581754, 3183899052, 3174627705, 1030714171, 3172964331, +1052302730, 3182509810, 1045909100, 3179631113, 1039075737, 3172805854, 1056014575, 3157871968, +3179349434, 1047930853, 998135196, 3179998868, 1049233863, 1036866499, 3170565541, 1030639566, +1045211681, 993360752, 1024130666, 3185090281, 3188860645, 1037967182, 1014993599, 1035674196, +3188308867, 3192352835, 1043485487, 3199297430, 1040354856, 1033474467, 3199990705, 1045841800, +3175429609, 1044661920, 3199880136, 1029998133, 1021794559, 1021463703, 1033271914, 1034820233, +1029709998, 3181645919, 3147799899, 1049963030, 3199184164, 3199077444, 3155900674, 3203313546, +1037468479, 3192183590, 1044285232, 3198823559, 3205993607, 3197838891, 3205617185, 3172102450, +1053477708, 3195074063, 3191169307, 1043668327, 3183488291, 1052728242, 1034022353, 1046113422, +1044279750, 1041054848, 3191620331, 3187156697, 1041035348, 1034087071, 1032813201, 1023877648, +1042245215, 3188129766, 3167637752, 1043168907, 3203998333, 3191339179, 3162300078, 3202238577, +3163295464, 1032097768, 1052482054, 3179969028, 3203547446, 3132765183, 993714416, 999208604, +1045959648, 3174859416, 3195910896, 1041232965, 3155232172, 1051441667, 3196366384, 3196841661, +1048244070, 3192420112, 1033124028, 1048715737, 1044820215, 1044733986, 3188801261, 3187447003, +3187977533, 1049484017, 1047212308, 3167346802, 1046109428, 1040397796, 3180521555, 3191611651, +1031928783, 1037162464, 3189617626, 3193939535, 1026923543, 3187748320, 1049254874, 1035633574, +3197885329, 3189034114, 3175164678, 1045463575, 3197861566, 3188564876, 1050754530, 3182087459, +1045174693, 3189564905, 3144047360, 3183190091, 3191713387, 3171598323, 1029072817, 3212869761, +1065287423, 1935179521, 1420445853, 880764287, 1469249464, 3231250559, 1149484672, 904494893, +2160514461, 18154881, 3051126562, 2071985661, 388267929, 478137793, 3995744738, 2135774750, +1630175210, 3179323535, 3472780780, 3414159926, 2158349285, 3206592775, 1059026837, 1060511955, +1059792811, 1064969570, 1061210391, 1062931313, 1064696255, 1064581728, 1065353216, 1060282289, +1064066905, 1058351370, 1061899575, 1062189625, 1061840365, 1061057472, 1064851025, 4279120814, +98907296, 4164514887, 31336640, 4137201817, 4255047186, 4141284609, 122038685, 4254578309, +4138156253, 30501590, 4266867559, 4026531840, 57387976, 4221338006, 4223451414, 3226551897, +1079068249, 3220028740, 1071256481, 394255882, 4277088757, 3472631835, 1875497511, 4110793252, +536542958, 3436300312, 2145178391, 2158366636, 3144058459, 537956298, 3794362566, 620970623, +1015229128, 944261495, 3755134293, 3213671024, 1066115323, 1062815108, 1065353216, 1057691518, +1058210830, 4027065002, 171977037, 4198783646, 268435456, 3212988257, 1065504609, 0, +1084488549, 3902088064, 2131984401, 1105101007, 3211491700, 1063887489, 1060175172, 1061331196, +1061379347, 1065353216, 268435456, 159007971, 4235757866, 53669661, 3230840635, 1083356987, +0, 1068453332, 3873210587, 2137524409, 4005986557, 922452116, 260001295, 3239346407, +2135560412, 3502473221, 4118787726, 3656089621, 2159492934, 2134693288, 2154043287, 545238010, +1954486799, 337575808, 3218290695, 1070698903, 1058037646, 1046971298, 1051851149, 1053039682, +1047134333, 1057149333, 1049680280, 1052161499, 1045619643, 1065353216, 1054905987, 1044675046, +1049074662, 1044604299, 1049352733, 1050360702, 44440324, 4058223431, 4077551628, 4172568318, +118086542, 4130925078, 10311762, 4181443929, 1676601, 12985021, 4278335127, 4122072537, +4280091991, 4167096920, 4026531840, 4063318117, 3214821567, 1067337919, 3216110490, 1061298437, +0, 1078092990, 847190350, 487543542, 4044517401, 148893302, 652227143, 53421900, +1110843663, 3078575385, 3673671144, 3565223828, 3352014834, 3852175336, 2138860898, 273174138, +1076509756, 812991063, 3213074511, 1065523470, 1065353216, 1062390299, 1062765183, 1059857864, +4246158256, 4131911022, 4026531840, 4249656307, 3223861647, 1076377999, 0, 1091265068, +2132605823, 2145683408, 2142110530, 3208989910, 1061405244, 1065353216, 1059505525, 1064833704, +1059611897, 4026531840, 230433096, 4294700819, 163168176, 3224217651, 1076734003, 0, +1081132085, 3205163904, 3856695501, 4260593700, 3151986704, 2147692478, 2509275153, 2162720964, +368869587, 2160706589, 3538821504, 2147228912, 752910368, 2901246143, 2934893184, 2549530240, +269254657, 3208962441, 1061377990, 1056990552, 1061548569, 1063123537, 1060051909, 1058543253, +1053995739, 1058039691, 1065353216, 1054629078, 1052946365, 1044676395, 1062117442, 1059064284, +1062187328, 1059471454, 1060631745, 60177608, 4229137977, 4139826956, 4087864650, 4166052301, +4026531840, 4194234425, 4163332493, 4124766682, 4240524033, 4127614679, 4122431874, 4116267497, +4109987968, 4102945804, 4148880372, 3218808151, 1071324503, 3224008600, 1058411404, 0, +1078148423, 1044206622, 1053430767, 1056639557, 1049911082, 1058440975, 1045600926, 1051295666, +1049504051, 1037647009, 3191770066, 3176605117, 1050932703, 3174820307, 1061602744, 1059485086, +1064398268, 3186784299, 1057080053, 3202219812, 1056136033, 1046105521, 1043444907, 3205015334, +3189649948, 3188307446, 3196246667, 3179146919, 3203560180, 3179822049, 3187058748, 3128552276, +1041648308, 3174100737, 1045517449, 1019777518, 1034703778, 1045043416, 1034437962, 3196975499, +3191496178, 3185590886, 1045498901, 3197404380, 1048020441, 1040863381, 3197627345, 1042614714, +1046713908, 3198131318, 3198766142, 996709457, 3181169656, 1045292443, 1044576779, 1050344993, +1056386536, 3184294258, 3197472383, 3175578921, 3199081539, 3144412053, 1043539774, 1044330652, +3202181394, 1041005636, 1045004977, 3205629050, 1049268002, 3182377285, 3190240943, 1037542947, +3197596410, 3195379236, 1052643436, 3199977501, 1047425113, 3197377786, 3181277733, 3182788862, +1042819476, 1026024375, 1052178452, 1062627375, 1048699344, 3190138415, 1046713891, 3186239350, +1045117425, 1034666791, 1053827024, 1033318928, 1046457723, 1046647845, 3185454146, 1045705785, +1051733151, 3200514160, 1057248131, 3182674871, 3200709601, 1037699909, 1031837487, 1006291401, +3197752302, 3199361146, 3168744842, 3166192477, 3202962896, 3195819441, 1045525673, 1051631453, +3193334791, 1046767212, 3206113678, 3200771626, 1043584866, 3202866770, 1050384903, 1033989224, +3190094361, 3198226275, 3179364448, 3194067628, 3193627120, 3179984256, 1026714116, 1046937217, +3191408781, 1048741869, 1039644997, 3175093253, 1006261299, 3201985755, 1050332211, 1046510808, +3180478847, 1032136374, 3147490039, 3156853076, 3202540773, 1034998490, 1041386093, 1042093516, +3194414963, 1048838842, 1047218431, 3203886903, 3173541244, 3199707043, 1044541491, 1032495013, +3195946982, 3204284267, 3192613026, 3202755777, 3206369496, 3206167038, 3182001609, 1044610496, +3206695141, 1025742914, 3207162995, 3190237992, 1033926510, 3204469703, 1016325476, 1033196987, +1040847229, 986556084, 1039213138, 1037606384, 1033852052, 1043964737, 3175299710, 3172095444, +1046889179, 1041888244, 1045016466, 3167606236, 1031985124, 1043137086, 3152091620, 1035225234, +1029004097, 1035840556, 1045419555, 1038176065, 1036759116, 3193383753, 3188076789, 3193863542, +3194250162, 3204539587, 3201202884, 3192855357, 3196890203, 3189559290, 3203621266, 3199361486, +3191882711, 3197672037, 3195932476, 3191936557, 1041818141, 1041447921, 1052296868, 1048900640, +1045096180, 1048559016, 1046109303, 1045536288, 1049935330, 1028920180, 1048808803, 1049970427, +1036946671, 1044396132, 1048702558, 3192069902, 1044104997, 1022692071, 3193325444, 1040833267, +3170947908, 1045648860, 3157772117, 1039307701, 3163570032, 1034065563, 1028958764, 1041991661, +1041505426, 1043325243, 3171254946, 3180657300, 3194866221, 3190525733, 3199294064, 3196193870, +3199463310, 3196699841, 3202505541, 3198385079, 3198841009, 3172321174, 3196908579, 3198066250, +3200562002, 1029039458, 3170488326, 3199063454, 3187399720, 3201782278, 3161592482, 3196159509, +1008079504, 3198130902, 3173718175, 3188626816, 1004013736, 3187779319, 3190829947, 3196738791, +3189437767, 3206028153, 3201468674, 3199812335, 3211043262, 3204331987, 3204601631, 3198182051, +3201707061, 3204439094, 3201442752, 3192164362, 3204467515, 3206090076, 3198740671, 1046161400, +1045564701, 1026276283, 3190402442, 1018197843, 3174632526, 3193869603, 3184000161, 3196683500, +3185404950, 1039001050, 3167076693, 3173466538, 1038680372, 3187921736, 1036676703, 1045938084, +1045468858, 1048130775, 1039122045, 1043784999, 1041528726, 1041340713, 1046668346, 1041075353, +1043825556, 1049114319, 1047971032, 1032753709, 1029313411, 1021024999, 1033845186, 1049189557, +1056089301, 1044848926, 1041702435, 1051597150, 1050162489, 1051415908, 1048625733, 1049561815, +1051443101, 1049143972, 1054139670, 3138858509, 3154556626, 3188469329, 1033956264, 1022012934, +3163202846, 1016265402, 1027188642, 998388144, 3180865784, 3174574579, 1020684772, 3190393756, +3167259554, 3187329222, 3169705938, 1049869081, 1019289287, 1039851497, 1043585296, 1040284624, +3165753304, 3178708555, 1020028387, 1030497791, 3179713020, 3185570936, 3165444715, 3172774915, +3194711444, 3170019297, 3185565280, 1035067722, 1044192046, 1033560582, 1047646454, 1044225917, +1050325943, 1051781471, 1046614709, 1047472258, 1049488996, 1047448175, 1046005850, 1054123539, +1051552878, 3186433140, 1051908342, 1045315252, 1045900478, 1042618624, 1035767247, 1037349445, +1035625772, 1038703266, 3164920472, 1044664539, 1032962103, 1040455550, 1045053896, 1047505183, +1028626938, 1055238670, 1051567784, 1053226593, 1052511397, 1045555688, 1049611594, 1052122819, +1050461323, 1050747069, 1053543742, 1053701710, 1053314115, 1055454149, 1045603921, 3185700550, +1034118762, 1027765029, 1046001850, 1049282518, 1054410027, 1053263099, 1053190200, 1057085518, +1052260264, 1051294782, 1054363497, 1055658395, 1057376650, 1050397602, 1028055967, 3204779168, +1051165283, 3199060034, 1015434586, 3196551670, 3190132881, 3189400146, 3201557818, 1040310059, +3194891954, 3198020784, 1042232259, 3181103636, 3205506871, 3146463807, 3192915333, 3194937428, +3192271919, 3179929049, 3186448911, 3186279824, 3196884664, 1038624074, 3198972795, 3190574441, +3192791220, 1034949164, 3204879704, 1035713159, 3178805024, 3133200509, 1043005022, 1046042573, +3180108603, 1036066567, 1043876296, 1040412273, 992157139, 1044931277, 1033801378, 1001993338, +1051125452, 980588432, 1047165106, 1057725852, 3177620055, 1046745785, 3197840192, 1046115287, +3187051345, 1021989603, 3207838666, 1050298803, 3174591865, 3205121642, 3185729240, 1019092800, +3199477566, 3196132125, 3187210762, 3173990450, 3191146073, 3189666804, 1038903322, 3190308133, +3179104991, 3174745173, 3155812486, 3196784355, 3162974800, 3173762762, 1032730548, 3204351099, +1048602922, 3190191614, 1043808995, 3173691608, 1042183865, 1044401976, 1035975904, 3136504981, +1036386957, 1022102768, 1000442227, 1037334864, 3162021683, 1041669038, 3181804227, 1044662075, +3167439520, 1045482859, 1010268806, 3149675267, 1041230354, 1019399719, 1035211372, 995671644, +1049385789, 3193399728, 1030167322, 3113291125, 1048739671, 3198390191, 1044077803, 3197902777, +3196276819, 3198122390, 3191125423, 3126098112, 1016084564, 3188874343, 1035048294, 3193480122, +3193145197, 3164712549, 3188617304, 3193860309, 3196117929, 1036064769, 1051661908, 1032188600, +1045186531, 1054389045, 3175841084, 1050507500, 1045537066, 1043422537, 1038651935, 1033697223, +1048076991, 1052289794, 1043678328, 1051875333, 1051148103, 3182219426, 3191026425, 1051155526, +1014529312, 3197471896, 1048256321, 3182283607, 3181555839, 3166493318, 3191864542, 3185462581, +3148655300, 3195309716, 1043065123, 3198356886, 1037220351, 1041224640, 1038807009, 1049769968, +1035933299, 1039053252, 1034235137, 1030846339, 1035455333, 1032758431, 3183481625, 1041247586, +1025314249, 1015899369, 1048522195, 1040284473, 1032055917, 1044294601, 1037530753, 1024632712, +1052729858, 3162615869, 1037842888, 1051211259, 1005153287, 1043196842, 1050936932, 1017828821, +1044944134, 1049632166, 3195436656, 3200984197, 3196697582, 3212183823, 3198202226, 3203718804, +3209612534, 3199582069, 3207084980, 3209087248, 3204462988, 3201434064, 3204801848, 3201482707, +3204837220, 3198621381, 3187627553, 3195440504, 3204991436, 3193740726, 3206330529, 3199337545, +3198560827, 3201107288, 3199916300, 3193448608, 3201745551, 3192450750, 3196203269, 3200762595, +3192819433, 3197923589, 1050501025, 3190096331, 3198603341, 1032496965, 3200603316, 3190204723, +3190643421, 3203532039, 1025674547, 3196354077, 3199364556, 1034065596, 3202148342, 3203154387, +3197692596, 3209586531, 3207841881, 3197351592, 3209082851, 3201045638, 3208168413, 3210373688, +3189032283, 3213289782, 3211010264, 3189432870, 3211333506, 3208521700, 1032716729, 1050173237, +1048898507, 1051464987, 1046295172, 1049973526, 1049368198, 1046414740, 1044121406, 1047777361, +1048117580, 1052919503, 1043261441, 1045446692, 1028110394, 1033360188, 1042727732, 1045751540, +1056423025, 1045486825, 1048266443, 1050749906, 1042419437, 1052495743, 1034977604, 1048993759, +1051418716, 1043760254, 1052140847, 1019473235, 1001972890, 3188194230, 1030239043, 3176823834, +3187886460, 3169649097, 3175421077, 1023293770, 3188238475, 3162779693, 3182244277, 3188165602, +3187266789, 3188505129, 3158647493, 1049340214, 1036246129, 1045203528, 1046410823, 1043449254, +1042160287, 3172768984, 1015004516, 1043640645, 1040537647, 3184383089, 1046223398, 1028774538, +998725771, 3164426960, 3171524895, 1035360170, 1042227534, 1033992100, 1050334975, 1043073259, +1042674138, 1048807858, 1049048218, 1042115330, 1047576118, 1046729989, 1052142071, 1050487457, +1051491421, 3175920747, 1047604945, 1046070889, 1040853765, 1044564089, 1037023894, 1032866137, +1033981886, 1036121231, 3180634922, 1041130457, 1043426704, 1039041979, 1031952783, 1044234397, +1033005365, 1052567121, 1051354653, 1052900593, 1050031550, 1043388381, 1049033602, 1048503284, +1051047274, 1045013712, 1049188731, 1052923496, 1046377299, 1051520170, 1045920031, 3147280754, +1040203027, 1040178504, 1049771827, 1049299982, 1053689343, 1054889314, 1057068609, 1059017659, +1052815469, 1054388783, 1057544204, 1056136604, 1056430081, 1056237455, 3169737096, 1049973056, +1050399358, 1046807571, 1043600306, 1043358631, 1044801181, 1047240286, 1037783048, 1046674652, +1049479734, 1048773843, 1035072451, 1043313556, 1033684521, 3163759900, 1040143336, 1038231753, +1053475346, 1040323086, 1041911000, 1047091104, 1040247968, 1048738566, 1037459201, 1034193965, +1050918962, 1040227319, 1042141734, 1033020758, 1029229935, 3193842629, 1019700490, 3176917567, +3179431951, 3179178771, 3188805048, 3188362836, 3192324531, 3185084962, 3189019769, 3189894041, +3180724413, 3192685802, 3188355481, 1036228514, 1028421515, 1032123534, 1046014261, 1043465920, +1037814260, 3183988309, 1012572891, 1034057770, 1032584172, 3162695548, 1034781229, 3180237885, +3185382693, 993286166, 3182310819, 1034701037, 1040931252, 1042254767, 1050674764, 1048527338, +1048990504, 1049819508, 1049256551, 1050310939, 1046969642, 1048953125, 1052289122, 1050843332, +1049720731, 1031846553, 1042483255, 1032854077, 1044231991, 1043771010, 1034718409, 1041841208, +1041580632, 1032484616, 1030497807, 1046210822, 1037999566, 1044006432, 1036088836, 1042863688, +1027521358, 1049729157, 1045082474, 1048962873, 1037731815, 1036796590, 1048696336, 1036981464, +1044510972, 1032952177, 1041377669, 1049456077, 1045246971, 1045600846, 1040251117, 1035551108, +1046507324, 1047398059, 1051543372, 1051166886, 1051833353, 1053820519, 1057139990, 1056990300, +1055558368, 1055450437, 1058293270, 1053459194, 1057871613, 1053449162, 1026138942, 3190167889, +3191423136, 3190683684, 3171113677, 3196446282, 3200834728, 3172858666, 3197980465, 3196183840, +3193316845, 3199425640, 3194175025, 3198595565, 1043299162, 1042129328, 3204851658, 1037737646, +3200834962, 3187284228, 3200002512, 3121932675, 3190675541, 3191803152, 3184063066, 1006676693, +3188883558, 3192587960, 1029740715, 3192605891, 1033842321, 1049496923, 1044862670, 1045882303, +1050980333, 1048183766, 1046802477, 1052195702, 1052357963, 1035010380, 1054084234, 1031839003, +1054722260, 1032548184, 1051087954, 998732181, 3202667250, 3195078426, 3199348838, 3188526538, +3204664114, 3179745501, 1035686162, 3208962187, 3196344259, 3193415550, 3193756453, 3207590110, +1040064693, 3203671919, 1042647661, 3194730913, 1040422604, 3191340680, 3188371633, 3188050244, +1033914753, 3201703704, 1033585034, 3192766723, 3171844171, 3196996847, 3182808383, 3183905805, +3193759903, 1015949976, 1030755443, 1036575166, 1038461322, 3182272123, 1040318116, 1042815152, +3190493698, 1043854485, 1015428818, 1041689573, 3148795534, 1037194163, 1041843435, 3173560096, +1017409889, 3196411331, 1047593033, 1000387082, 3169113002, 3181310469, 1042389779, 3191034007, +1030265944, 1037257198, 1023730041, 3141168233, 1024450665, 1040913847, 3171416337, 1046292303, +1033658642, 1023981880, 3184023859, 3193383397, 3175681605, 3189042250, 3201471034, 3184055630, +3197183239, 3187873815, 3199793398, 3163396373, 3201487995, 3183595323, 3203137822, 3202383670, +1048033567, 3204275934, 3190682401, 3198087147, 3191764083, 3205411923, 3187739479, 3181333612, +3195330661, 3205379335, 1043938329, 3201181611, 3180246764, 3187712199, 1039035122, 3203581012, +1006868833, 3196322688, 3166586407, 3202467903, 3171053354, 3196180438, 3189666994, 3181444776, +3168684324, 3180274502, 3196087082, 3159641575, 3187684872, 1050917058, 1046156752, 1047837667, +1045866057, 1046736654, 1050668130, 1042330045, 1041931608, 1051368716, 1043094894, 1052422369, +1036165861, 1051563601, 3196503342, 3200849562, 1051798261, 3205020948, 3183357029, 3197685524, +1042759053, 3210945082, 3195522268, 1039501385, 3205953021, 3191008998, 3200598810, 3173281656, +3205181114, 3181542370, 1040771994, 1023700762, 3195749284, 1024097870, 3184333535, 3167500355, +3196759833, 1036062220, 3191504221, 3145556754, 3186025936, 1043022611, 3196756625, 3115379818, +3171226787, 1037457982, 1045898466, 3164855577, 1043164619, 1035451364, 1008430291, 1038878743, +1042511315, 3180005580, 1049555390, 1033331682, 1041133336, 1015265610, 1049987107, 3157669850, +1040793024, 1049299024, 3185165484, 1041199497, 978290741, 1041483279, 3187071413, 1045552314, +3175735214, 1034995668, 1041600615, 1048301256, 1016619073, 1032517731, 1040238546, 3189845619, +3189916697, 3196039522, 3189865147, 3192920927, 3191402493, 3175012595, 3181820255, 3198587732, +3180345726, 3197576417, 3188589283, 3200615573, 3179210314, 3197256450, 1042155692, 3189309723, +1032363984, 1018500878, 3193882249, 3194285598, 1052854574, 1049265288, 1051254334, 1045361756, +3204793168, 1050610659, 1049784114, 1049691483, 3210713230, 3207200828, 1037038493, 3205761095, +1037409618, 3201944327, 3201961443, 3204711049, 1049744176, 1046308492, 3204460996, 1042569851, +1052205389, 1016513416, 1040316657, 996501061, 1034323772, 1050639436, 3199320743, 1039531669, +1042829232, 1111117364, 2149990248, 777591337, 3358533396, 3254321102, 2983108973, 3065035952, +1222876594, 2827844265, 2291229330, 1837324924, 3094267265, 2378335676, 1400335952, 1197948730, +2863343299, 1706984858, 1683776622, 2772465771, 2141747833, 2173928653, 1229814389, 2777105781, +2611072195, 1953920086, 2254928516, 2807953247, 2596388233, 1956814937, 2156175248, 1704914551, +1637242449, 1635413117, 2405796988, 2845998491, 2644298163, 3368466879, 3452747959, 2593239250, +2525661577, 2038135166, 2373419162, 3366294705, 3184236681, 3120353203, 2695807939, 2628035258, +2526973079, 2342297744, 1890549905, 2440614010, 3549607601, 2932452563, 2694226108, 3283003903, +3587691493, 3118590155, 2308151726, 2206963355, 2442235522, 2508289405, 1701341915, 2505725806, +2576338523, 2136572829, 3510272401, 1196400051, 3048597937, 3890472158, 2474210205, 1016379025, +1851478891, 3831259980, 2189339040, 2408547247, 3254352722, 1689958305, 3247155865, 2558621669, +2457832845, 1960050541, 2260430478, 2808391346, 2710414272, 3864011039, 2233036145, 2680141954, +2796530302, 2843506307, 1500088452, 1097880914, 2003587659, 1230789455, 2186966618, 2373139350, +1903005561, 3804199065, 3083445445, 4293654218, 2161372917, 2189918605, 2256568700, 1884969835, +2609805423, 3547107743, 2359854972, 2630136968, 2341179604, 2911732629, 2124650634, 2493154701, +1869323172, 3062675574, 2141958543, 1639093670, 2462673249, 2491267744, 2611999187, 2139738040, +2039047534, 1785363298, 1952270685, 2210295398, 1531199818, 2491180142, 1431398471, 2171765334, +2142403448, 1836483208, 1887408777, 2558833307, 2341107604, 2508425872, 2039384451, 2271909750, +2443263102, 2108268918, 1956811398, 2357426045, 2039780731, 2123204233, 2373086867, 1501915481, +2138283921, 2358215340, 2054849178, 2442959465, 2460003221, 2526121119, 2660342165, 1972741495, +2139267980, 2492364146, 1703411550, 2070639970, 2778770052, 1819186264, 1550218879, 2306443389, +2692260787, 2139392879, 1940758429, 811109762, 1836752673, 1079864206, 2828180887, 2593948840, +2991362161, 2492965040, 2526581905, 1900308591, 2358482852, 2661706620, 2275702945, 2357891996, +2661335393, 2156162721, 2862125706, 2289870275, 2322495618, 1649315495, 167788401, 2153997177, +1078091104, 2524599454, 2157689946, 3582033098, 2744295573, 186917543, 3045219351, 1702053480, +456610604, 3234329290, 3900347517, 2748226787, 1622856910, 1249784392, 2358620269, 2105529774, +3819073186, 3249975234, 2393429409, 3619001254, 1919947462, 3461437845, 1275033977, 1167691412, +1400936112, 2631236758, 2412367272, 3047141747, 1402456769, 2091277411, 3365041313, 1400082328, +3502086711, 3703500006, 3236479999, 2531035089, 2271234656, 2442229363, 1752993913, 2757845062, +1194350248, 1479298472, 2912033799, 2070584942, 3107700841, 2862410113, 1542675116, 902407013, +1750415902, 503670358, 1854908756, 2442096695, 3700791416, 2324742052, 1904246955, 3352142714, +2646971575, 1654958800, 2946456716, 2539148441, 759705156, 1956423737, 2042436515, 2422761836, +2021740140, 1686396763, 2472174180, 3265368761, 3333996209, 3286093780, 2022423754, 1971017073, +1417042008, 1685093230, 2291912569, 2894645439, 2360971919, 3215431839, 2319871376, 1670014563, +2173868641, 3095557485, 3030739327, 2444861055, 2543751607, 2793975463, 2949904833, 3903444713, +3940789227, 1703321521, 1198019684, 1549233492, 1632325223, 2927886197, 2508892836, 2624632478, +2458876549, 1346078079, 1868173568, 792088922, 537990706, 1838303526, 1851148686, 2391047054, +2340389258, 1412522829, 2085578849, 2188789642, 1265132169, 1701278596, 2358141547, 2359400074, +1700115360, 1533632860, 1634956650, 1636724550, 1768978530, 2456309041, 1215920216, 1902923086, +1565288244, 1564944669, 1718837317, 1180334695, 1331834412, 1433764687, 1564503915, 2355516547, +2877127762, 2745215412, 3031407008, 2947916194, 1163820900, 1399155555, 2119200132, 3162135398, +2259844457, 1685754493, 2542308525, 2173346178, 1784111940, 2138928259, 1719309403, 1500563332, +2508357027, 2308335240, 2525007773, 3565118831, 2912126604, 2630920594, 2108215220, 1769175172, +1903389298, 1532846687, 4285034327, 1635683442, 2372627610, 3228469174, 2811086481, 2965727397, +3501491319, 4141477046, 2966145504, 2372505452, 2272551059, 1700222336, 2377811112, 3413412755, +1989904779, 2562168722, 2238624430, 2307749759, 1719115883, 2677633629, 2122225337, 2895957630, +2040428942, 2173801892, 1941206176, 2293603442, 3216179111, 1787938189, 2325375371, 1886938210, +2119656039, 2594463613, 2275706022, 2060298141, 2490334888, 630882969, 1311375411, 1232238713, +993998919, 2505132868, 925523786, 1883662651, 1935105142, 678907262, 1331655537, 2220980106, +1634108564, 1919385177, 2422890082, 2845476236, 2208738956, 2255835777, 2475583048, 2407352175, +1837260903, 1717577567, 1870098066, 1601136456, 846012779, 588318279, 1767718457, 1180119623, +1614612821, 2477631107, 1115383905, 759452742, 3416796011, 3504144315, 3083321054, 2209067432, +1751679634, 1719493991, 2105636486, 2793573747, 2927128658, 1583984752, 2356101233, 2457166144, +1786411375, 2037089166, 2173668453, 2454162574, 2288702313, 896160361, 2319018314, 2342742384, +2425864632, 2493481126, 1584680582, 2022732671, 2474743171, 2089911170, 1988727199, 1268753554, +1467264624, 2710288209, 3637497735, 2506132184, 1949973209, 3566796462, 3970942906, 1656789670, +1166126516, 944326451, 3293797983, 901094506, 2862400673, 2229712601, 1844100510, 3218442156, +1451327628, 1635415407, 2109331564, 2496004258, 3671826044, 3654458239, 3210432655, 2354656570, +2176683133, 3250364823, 3612320676, 694325381, 2003591995, 2706264634, 1499211951, 861548880, +1531192931, 1261254685, 3569398709, 3151614091, 3300514766, 3116874699, 3855797174, 3228878027, +2327294314, 1089271502, 3364732262, 2377019827, 2604061524, 2309391019, 2610351581, 2445140088, +3718948818, 2204193740, 2407774876, 2893252220, 3017374804, 4290299352, 3439119571, 3598823641, +3117336275, 3620251838, 2646847915, 2629740961, 2878656717, 1819768949, 2578809745, 1707053952, +664174746, 487325741, 760885315, 1279933007, 2996005182, 2088024438, 3097334965, 3030826897, +1065372625, 1133548844, 1748926079, 2139328417, 2692724361, 2846331527, 3720922328, 2614539224, +3677309339, 2057729641, 2324991852, 2340586654, 2054773605, 2406175870, 2640477832, 2093250207, +2339795349, 2173997925, 2258733225, 2373281383, 1855358086, 1939246202, 2005700718, 1534167410, +1347833425, 1130318949, 1163480924, 2170640224, 2356765295, 2105503599, 2005166985, 2054122607, +1182107228, 1935832191, 2036881027, 2107280240, 2694424987, 2258140294, 1635812493, 2271707741, +2325965969, 2190377345, 458708857, 977351740, 688923175, 792079145, 2105440588, 2072080771, +1752921975, 1601798784, 2206297088, 1938786670, 2507696259, 2022612873, 2006021278, 1734314363, +2643489681, 2040500876, 1651406425, 2188869762, 1919511170, 1618506349, 1296655711, 1986023761, +1934791552, 1751862630, 1431729757, 1952414308, 1937597287, 1514953336, 1683246179, 1854434640, +2019070042, 2407884648, 1484810613, 2138147968, 2287434121, 2104135310, 1871212434, 2273347976, +4285501818, 2324862358, 1990690691, 2290460286, 2358547115, 202664216, 621427538, 890710548, +2281719571, 2141033373, 2863969720, 2897393336, 2861545646, 2428028053, 3483608242, 2999172776, +2595331240, 3199307168, 3015166907, 3116284350, 3166473348, 2695277738, 3182021837, 3100155093, +2690957191, 2693501329, 2796719511, 1654357951, 2021823860, 2627904409, 2509936304, 1305291913, +2930222277, 2491854493, 2625282459, 1923593134, 1077359941, 642992697, 758725936, 184575782, +1547517526, 2253613667, 1264870491, 2339078749, 1954710625, 2542626953, 1837394070, 1319003013, +2339473272, 1701733024, 2491178865, 2508565144, 2258085249, 2710287539, 1112966826, 1512063053, +522074657, 1077033237, 2289966907, 2675669872, 2190965140, 2860810108, 2373475141, 2545983158, +2713241244, 3772356778, 2154607530, 1698393446, 1417034578, 1618826812, 2643500134, 2074984086, +3551505103, 3115427245, 1314416128, 1538732647, 1433974890, 2207425946, 2125174685, 2844292241, +2561316236, 1795204742, 1248355606, 2808894835, 1670874207, 1415137704, 1482439501, 1098604686, +2176429160, 2293269200, 3265176985, 2795475098, 2746991773, 2678107592, 3197154461, 2832311439, +2728899759, 2947782318, 3133059741, 2445387429, 2358618535, 672609337, 1512439889, 207890728, +2369147188, 3213867453, 2728840079, 2879492521, 1095477668, 1246973495, 1681936743, 2169585988, +2107285306, 2611913103, 2609091737, 2679015560, 2676789651, 2056498826, 2323746486, 77496215, +825433623, 1010186796, 909328980, 2809480526, 2795158417, 3100091827, 3516721593, 2945490326, +3602499001, 3521434557, 3751929072, 753121683, 419439893, 775045944, 1531849792, 3079364431, +2496697562, 1973347978, 2642321331, 640560010, 576069938, 1650806093, 1535203697, 1640872121, +2742803123, 2613072042, 2124727423, 2189133933, 4139494075, 2759041935, 1381329031, 541404433, +1362906426, 1429748777, 2084009323, 2373626259, 2593100193, 2358686598, 2091621790, 1465539671, +1583706204, 1886347898, 975208294, 1363632487, 1935823956, 946229594, 2240895555, 2191888225, +2390983306, 1887403645, 2124250210, 1870566243, 1835953539, 1599108460, 1904251790, 2742060194, +2490533256, 811960975, 1363095601, 1280002383, 1145782846, 1736329302, 1734109795, 1668510046, +2103997315, 1517617249, 1600877909, 2003913305, 1516531857, 3452262745, 3050230728, 3687631796, +3485124796, 3247605169, 3198919588, 2965625026, 3553933556, 3488455591, 3298668501, 3386900417, +1121444523, 2053138312, 1718514047, 2156231292, 2156107905, 2576979157, 3451559576, 3197732814, +2574951854, 2712578788, 3469650659, 2175774899, 2662191000, 3233334209, 3569590192, 2932189900, +2343098844, 2174452335, 2474345851, 2541326462, 1986957694, 2071952761, 2087875199, 2239597415, +1279146752, 994597186, 995314506, 1581011300, 2254015349, 2307685542, 1920107661, 1500542585, +1699104851, 1346648656, 1112095576, 2357881129, 2088986228, 2273866093, 2004582007, 1347845258, +1499752782, 1313368927, 1416781386, 2004314753, 1870237053, 2440464782, 2809296265, 3974676367, +3034044631, 3219968496, 3538808828, 1466729846, 2171362715, 1650950509, 1347116883, 1514950752, +2474345068, 2426119528, 2726913926, 1907078051, 3366226121, 2077145027, 1788913854, 2726201197, +2646515330, 2659885501, 3032376487, 2409982665, 3113932444, 2613536936, 3064319093, 3148848293, +3435626432, 1264616120, 1617652041, 2139587416, 1754302577, 1493124980, 3266606493, 2055952974, +942770025, 2654488926, 2429653944, 2727262856, 1718530920, 2521332559, 1869572497, 2982395019, +2359020923, 3831675295, 1388429980, 3853345485, 2057997418, 663837184, 1329178416, 2672133019, +2210686602, 2439425599, 1436110957, 2237248153, 1467562333, 1783271337, 2352829833, 507061085, +1656697378, 2071754653, 3165563541, 3432497078, 3014483563, 3182796473, 2845743270, 2659362218, +1482271664, 1397761126, 976052517, 1614623286, 1954046781, 2341045138, 3043857568, 2528088937, +3164848518, 3230631632, 2511779257, 2311367643, 1192971871, 879320619, 927683133, 2644597295, +2424998574, 2361438377, 2494993306, 2947061721, 2827385508, 2760146854, 2056292473, 1953075585, +1801416554, 2241429610, 1499626084, 2831427327, 2912991444, 2748104621, 3434459344, 3161544120, +1664705917, 2775807885, 2156959882, 1802470534, 1465475970, 1010910569, 3411826774, 2038477945, +2793114267, 2609870749, 2361099882, 1704755056, 2172754054, 1869896306, 2304166993, 1704104343, +3145826197, 2574557301, 3264116098, 2759949672, 2983825051, 2777467548, 2186236261, 1801604946, +1566390840, 4280958268, 1785490758, 1804433024, 2052623457, 2004834940, 2222097040, 2189126280, +2440661612, 1351709822, 1130246730, 1130194513, 1211847250, 739138121, 1345060934, 875769619, +1194143310, 864310579, 1061902375, 943671629, 927675969, 542131476, 538788109, 573515071, +1429625127, 1515676251, 2135580280, 1633899336, 2052940633, 1616800352, 1735155578, 2038328956, +1952077162, 2839269486, 2119645570, 2725013096, 4285231246, 2295176626, 2761989708, 1604161102, +966568612, 3267982262, 2225164192, 1347116168, 3245959801, 2657584094, 3532534226, 1706116206, +2699781753, 1250918771, 1050030948, 2053276023, 918602396, 914198086, 1898361320, 1866741664, +778275680, 1648073342, 2391638842, 2788266378, 2896942728, 2926406523, 2627297685, 2158414518, +2708508564, 2909497989, 2524941698, 2205649541, 2239069841, 2390390668, 2540801420, 1515998570, +1566665821, 1635676260, 1902737760, 1400857176, 2589749109, 1788577386, 1819446894, 876615474, +992625688, 1293895265, 1901145910, 1231390343, 1851948656, 1900967827, 2590921597, 2376958095, +1904918399, 2342233514, 2441053353, 1735165321, 2440784515, 1735491702, 2155964927, 2809035625, +2207021692, 2391313012, 1249743499, 2141939554, 1398433898, 2002222160, 2423817607, 2593560180, +2559676062, 1837791107, 2676520331, 2425207181, 2007142294, 2390396557, 2558495127, 2626919816, +2106040464, 2578083216, 2358220702, 2191168897, 2393341342, 1550940322, 2609680023, 1834781078, +1687181943, 2022471058, 2289994103, 2207745666, 11769496, 2104785526, 2038461581, 2390787979, +2138083961, 2425919856, 2391572612, 2124258192, 1854112381, 1919186302, 2037154420, 2088340613, +1904572291, 2577176979, 2594207860, 2475263097, 1717803133, 2071298422, 2005502830, 2323027084, +2071490969, 2156299407, 2207742336, 2021094813, 1702917467, 2153674376, 2005760908, 2021748099, +2205124980, 2037937263, 2004123778, 1979665789, 1737061246, 1483829864, 2237367414, 2170718853, +1433098856, 1129205354, 1380020832, 2846591605, 2946477235, 3115751121, 2493300110, 1618776233, +2104186204, 1903711346, 1752848788, 2763242619, 2846612917, 3183319212, 2124066722, 1467123354, +2238617961, 2106619292, 2190176922, 1952082786, 1567981668, 2322754423, 2576310150, 2460917402, +2310643867, 2459206795, 2341011636, 2341242488, 2290315126, 1718583914, 1804363632, 2457436529, +1786020992, 1734768745, 2391313524, 2290124416, 2407762799, 1937016713, 2290256022, 2526188679, +2022207338, 2020243055, 2155711111, 1888518269, 2155181436, 2375125370, 2591846588, 1803588502, +2019004298, 2240511109, 2173013875, 1938199673, 2136703357, 2037088638, 2037476992, 2173467254, +2928182152, 1767476480, 2155047513, 1855028091, 1635546487, 1802851469, 1684236373, 1418168434, +1654559071, 880038190, 2976928192, 75192611, 1613852210, 2474148006, 2352785008, 880696421, +1735030632, 1347906854, 926234289, 1580011651, 2072011858, 2342615406, 2106360925, 2424725858, +2456856203, 2057729147, 2425914512, 680491924, 942351872, 272386370, 1075784532, 223417400, +2289732708, 2172745070, 2292015768, 2610265726, 1801557383, 2288616595, 2123206755, 2579280554, +2141693038, 2055368836, 1704106869, 2036489087, 1933993607, 1586067040, 2205979278, 2359462758, +2893644984, 1871816835, 1819967618, 2321196126, 1938321270, 2390337650, 2391567492, 1011969389, +1145269829, 2323997046, 2474934148, 2593821583, 1903919745, 1718452331, 2566869134, 2088336735, +1768584045, 1853705074, 2002814825, 1854174350, 2070637173, 1836217955, 1531271273, 1817731670, +1835885418, 1719427165, 1380998524, 1615548297, 1802988386, 1112762726, 1513177969, 1635863131, +1617198709, 2036233325, 1550869597, 1653106536, 1584953955, 1735017571, 2322237857, 2289654926, +2155444618, 1818526043, 2172937324, 2155645287, 1787329928, 1869348720, 1098010173, 1148665649, +1313635206, 3335604065, 2932261844, 3114845123, 2997408686, 3650455245, 3232730563, 3101084331, +2879444479, 3655836344, 2813510858, 3167485386, 1120457130, 2053340558, 2558880905, 2257675878, +2509735775, 3029969598, 3197283208, 3298792929, 2591989965, 2190385618, 2881268924, 2611122603, +3368475064, 2831270849, 3703754194, 3570382547, 1938086085, 2708768431, 2072483460, 1720615574, +2760598124, 2122485382, 2676594091, 1955110036, 927681913, 1480077163, 1548242512, 2540127291, +1869904749, 2170515820, 2455537023, 1650360439, 71970048, 1260926013, 1648570958, 1884395568, +1972672891, 2069392758, 1987211647, 3031992940, 2308616065, 2426509711, 2691531403, 1550022497, +1481662574, 1669364825, 4134232422, 1920696147, 2339077758, 2123470965, 1888064142, 2272499073, +2141162872, 2273148287, 2592964984, 2006024310, 2122154631, 2289992831, 2692189323, 2188411008, +1803191189, 2424212098, 2325052307, 1786680201, 2424997243, 2340128124, 2022150764, 1801871991, +2222153081, 2039052897, 2474019987, 2642646396, 2357489284, 2290449762, 2240055403, 2340582794, +1903979392, 1929426571, 1904683390, 1314475352, 1044483653, 2991021142, 3436952475, 2896471235, +2846083495, 2897586346, 3467424449, 3537093822, 3819892156, 4285577177, 1891735724, 4058949567, +3051859857, 2140376362, 2287844469, 3046086063, 2479464615, 2794902639, 2340459195, 3396725189, +2526901393, 2592393647, 2979576224, 2440727990, 2376300652, 2896734613, 3015024300, 3148593599, +2161810079, 2207148628, 1820629361, 2808320918, 1853394335, 2051175227, 1870219117, 2274139258, +3016012905, 2410185614, 2258350715, 2828306350, 1532043376, 1835222294, 2334538587, 1867272248, +2758511294, 2088539050, 1869257847, 1383179632, 1363236976, 2370921837, 1265923928, 2592969026, +1821940347, 3013586096, 3686909375, 2795350881, 2040229548, 2205188980, 2641720451, 1886936832, +2039181460, 1902744431, 1987279791, 3092998801, 2036499098, 2375320456, 2425455008, 2356647313, +1569099900, 1954051435, 2490395244, 1584506484, 2239524255, 2842187113, 1470325370, 1719432537, +1970367889, 1834708810, 1835576928, 2108056430, 2088668568, 1684643688, 2523425654, 1920307807, +2377092483, 2576527989, 2574682761, 2323547290, 2003332214, 4283989105, 3245645450, 2577700237, +2709294219, 2879559284, 1499356190, 1417251931, 1415146332, 2540791913, 2997988319, 3028726678, +2914025632, 1016510371, 1900834320, 1953045363, 459109902, 1133927031, 1044604272, 2122724961, +1380737870, 1744834395, 774586206, 2198613563, 2808887637, 2526395809, 2845610679, 2175177603, +2143455165, 2036883313, 1803310215, 1736806497, 2033138769, 1297424747, 2415935416, 1931540780, +1757513703, 2201366702, 3960144790, 7451984, 2398906593, 1584018595, 1308642221, 2487153475, +2373280234, 1330859195, 3003149514, 1849472584, 1906872750, 2132886965, 3423542948, 257147962, +1543480244, 3346745405, 1023423147, 1635630660, 2094875592, 4151293244, 3329097804, 1521713574, +1975071628, 3814904908, 3848274005, 1892310492, 882795605, 2636013235, 3358261394, 794732382, +2012245681, 867059345, 3710660, 4267028797, 3328486025, 2553571745, 2986475666, 1046724188, +1357339829, 1353462935, 2571075042, 2101018428, 746684145, 2774308270, 2050839654, 2608513905, +820248761, 2450813546, 2283360694, 1061349960, 1711240436, 1503020695, 1442866602, 2469389101, +1218267894, 6501194, 1011708036, 2939926537, 3465139899, 1773323985, 4286869911, 1819226277, +3393746494, 2899755879, 4007692349, 46477823, 1214127959, 1389576518, 1736760831, 137411092, +1424663764, 4259163648, 3063949428, 298340022, 2257280323, 4287679930, 4137826648, 381962183, +1554979893, 1167162935, 2074607499, 2256830053, 3309878399, 3124619724, 1624671488, 2007867337, +1086023072, 986556891, 1255764104, 3905581392, 2785046313, 2942366121, 4287853618, 210129331, +2090798413, 3730287724, 2957508689, 72732548, 2143486161, 4150722403, 3196078125, 817854965, +1970947411, 3849551872, 766776677, 2614774200, 2244268868, 3329145982, 3227726106, 963616429, +2008219753, 3617624641, 4286462585, 182998183, 2108975468, 2461093632, 1174236838, 1005588121, +879032648, 2250709088, 3050805628, 2952816472, 1227059541, 2277181184, 3978962151, 1446378264, +23989941, 693851024, 1331647425, 2591576943, 3330867072, 2434662316, 3017015599, 3015839999, +3660537922, 3080935749, 2234515604, 159229807, 1388531909, 3412166836, 3479531887, 1132169352, +1485963396, 2415897180, 2341820502, 4170597793, 1747209811, 1167275888, 1571195834, 2804706048, +2994048137, 4282560159, 796494437, 2744807375, 1102536364, 1266442358, 427520663, 3683148434, +3042049944, 3563430995, 3677103954, 76133281, 1473773731, 1016280682, 110192578, 3551362407, +3209953153, 1434764287, 4106205274, 543906461, 2400339489, 3011815829, 3192863069, 542478470, +2092433573, 362132874, 1504362403, 4284052855, 2416740432, 1519585536, 793081533, 3295196228, +1818725023, 28410624, 1188719201, 3211149326, 1968088164, 1047930258, 1058077054, 3195213762, +3172068641, 1037083392, 3199290160, 3190810010, 3191101268, 3177867394, 3216281462, 1034079538, +1037628998, 3216993604, 1051294694, 1040306213, 1054331623, 3195193217, 3205042508, 1013177149, +3174890906, 3204078746, 1055382020, 1048493948, 3192172859, 3199930841, 1066843317, 1040417215, +3202514636, 1043437172, 3196864225, 3191710319, 3196627622, 1041420978, 1032051425, 1033969306, +1034689191, 1045201520, 1030816114, 3196743503, 1036266732, 3188901321, 1058093398, 3190885268, +3166849516, 1053422227, 3154349190, 1044440478, 3185250501, 3185433520, 3191817392, 3173354491, +3189560285, 1050689749, 1041869260, 3181591239, 1019383768, 3192930724, 1058101848, 3190464064, +1024318092, 1041742650, 3168562461, 1048195374, 3184696862, 3216057297, 1068482953, 3214881081, +1067315927, 3234987196, 1087503548, 1057921567, 1059576087, 1057527962, 1059869773, 1059935257, +1062565932, 1054567980, 1055934164, 1060113955, 1063546876, 1063286439, 1062820932, 1065353216, +1059717957, 1055044951, 1056698388, 1059235467, 1060375340, 1060677206, 1057916914, 1057652166, +1053917533, 1059083774, 1052269900, 1060184169, 1059124754, 1061477498, 1056532185, 1052272069, +1055281643, 1057635352, 1060379793, 1051204302, 1058416541, 1060006691, 1061419975, 1054937523, +1061235429, 1052790966, 1055892888, 1060132037, 1058809836, 1058539090, 1061701273, 1056931618, +1053633995, 1059829230, 1055759650, 1062913075, 1053071356, 1059480047, 1061441591, 1059342007, +1055999485, 1060575684, 1057885457, 1063821826, 1052438328, 1065353216, 1059979609, 1063429017, +1053774029, 1062372751, 1057072245, 1050815640, 1050033265, 1043018837, 1058087866, 1057225763, +1057472273, 1051448397, 1046388967, 1053507959, 1054771718, 1056329752, 1053123053, 1055555522, +1057584925, 1047416510, 1047729929, 1046796289, 1051578329, 1048401007, 1053878631, 1058587683, +1051487216, 1060015917, 1053785070, 1056318049, 1057975118, 1054732544, 1050208612, 1057288790, +1053033657, 1050682586, 1048891004, 1046460132, 3189681285, 1041024799, 3196711699, 1049163915, +1040619896, 1028321096, 1031040341, 3193175832, 3171861617, 3196079026, 1049402785, 1032310106, +1047353772, 3197765313, 3180313333, 1035898995, 1029101441, 1037491068, 1016311807, 1029377976, +3181481127, 1046606139, 1046980825, 3170404254, 3129182093, 1044579493, 3194416252, 1032688604, +1044922561, 988133882, 1047356562, 3190925225, 1043887229, 3174346728, 1051735017, 3192145061, +3172751232, 1017827586, 1028093246, 1038227108, 1001421494, 1054986195, 3192711542, 990419090, +3195085887, 1041128997, 3192068156, 3184379530, 3188617818, 3173074324, 1041456962, 1009650467, +990787154, 1041447534, 3196348620, 3196943026, 3180609328, 3188344222, 1033624404, 3188267753, +3190436579, 1011796963, 3173869973, 1033920345, 3199742386, 3184478387, 3185633928, 3181073513, +3190901377, 1057583437, 3188456474, 3189327578, 3181075734, 3187278857, 1041613697, 3176336589, +3183609472, 1024654348, 3196639283, 3188975902, 1047228155, 1043238559, 1026972482, 1017758561, +1040265668, 1048281270, 1045654027, 3171579020, 3179324414, 3171683725, 1023724961, 1036536208, +1041774111, 3185681164, 3162958865, 1044762653, 3185853448, 1040950808, 3183031591, 1037163404, +3181097716, 3192944701, 3184692725, 3183998343, 1048008498, 3190456268, 1040353281, 1045661915, +1039646220, 3169876660, 3188798258, 1016365490, 1038780111, 3187706760, 1044572204, 1034158982, +3181052333, 1020570210, 3188436346, 3186692277, 3169791380, 1024201487, 1031101508, 3190939499, +1033361538, 3163140062, 1043798465, 3180771913, 1042875665, 1054349203, 3183265110, 3170239690, +1049288213, 1030572887, 3173707204, 1040251286, 1033934290, 1024237712, 1041888006, 3179315546, +1016084168, 3194920421, 1047469739, 1033404872, 1023265531, 1049500085, 3198488456, 1046243196, +3182480057, 1036598369, 1016299742, 3180404920, 3178300419, 3195842785, 1049630190, 1044212751, +1050209738, 3201718112, 1036951145, 3174397558, 1011283832, 1048922550, 3190459611, 1037349260, +1043032796, 3172570506, 3192970395, 1019381837, 3179074634, 3171671988, 1053123825, 3155715284, +3176653376, 3197451892, 1040528991, 1025842119, 3172699243, 3159077121, 3190454845, 1036579691, +1034102014, 3184608221, 3173236380, 3187247908, 1040835651, 3191247130, 1049566217, 1048694648, +1019362177, 3187510235, 1014081150, 1025985867, 3166942466, 1029963407, 1018500061, 3167145142, +1015247949, 1046534753, 3146050964, 1042003374, 1021866089, 3163759270, 1049638554, 1045233032, +1038264781, 1041385495, 3188168587, 3199635024, 1042193764, 1044473208, 3165704205, 1046415037, +1045263052, 1034938499, 1046903359, 1047791629, +}; + +uint32_t* get_Spo2WRWeights_addr() +{ + return (uint32_t *)(Spo2WRWeights); +} +uint32_t get_Spo2WRWeights_size() +{ + return sizeof(Spo2WRWeights) / sizeof(Spo2WRWeights[0]); +} +void get_Spo2WRWeights_version(char* ver, uint8_t len) +{ + memcpy(ver, NET_VERSION, len); +} +#endif //#ifndef Goodix_DSP_EXPORTS diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/adaptation/icoe_adap.c b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/adaptation/icoe_adap.c index 6df8185..d0028de 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/adaptation/icoe_adap.c +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/adaptation/icoe_adap.c @@ -132,7 +132,7 @@ int icoe_adap_uart_send_char(unsigned char chr) #endif } -int icoe_adap_uart_send_bytes(unsigned char *str, unsigned int len) +int icoe_adap_uart_send_bytes(char *str,int len) { #ifdef WIN32 return WINComWrite(str, len); diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/adaptation/icoe_adap.h b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/adaptation/icoe_adap.h index 7d0065f..cd23d05 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/adaptation/icoe_adap.h +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/adaptation/icoe_adap.h @@ -20,6 +20,9 @@ #include "sk_comm.h" +#define Gps_DL_Send_Buf_len (1*1024) +#define Gps_DL_Recv_Buf_len 640 + //open debug log bps #define APP_DEBUG_BAUDRATE (460800) //sys print log @@ -217,7 +220,7 @@ int icoe_adap_uart_clear_data(void); int icoe_adap_uart_set_baudrate(unsigned int rate); -int icoe_adap_uart_send_bytes(unsigned char *str,unsigned int len); +int icoe_adap_uart_send_bytes(char *str,int len); int icoe_adap_uart_get_bytes(unsigned char *str,unsigned int len); diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/icoe_gps.h b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/icoe_gps.h index 578f493..bf3ad78 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/icoe_gps.h +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/icoe_gps.h @@ -13,8 +13,9 @@ extern "C" { #include "lspi.h" -#define GPS_POWER_ON sns_gpio_write(SNS_GpioPortB,SNS_GpioPin14,true) -#define GPS_POWER_OFF sns_gpio_write(SNS_GpioPortB,SNS_GpioPin14,false) +#define Gps_DL_Send_Buf_len (1*1024) +#define Gps_DL_Recv_Buf_len 640 + //StarCourse测试账号: diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/icoe_load_fw.c b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/icoe_load_fw.c index 3abd6ab..7bc2878 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/icoe_load_fw.c +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/icoe_load_fw.c @@ -1,5 +1,6 @@ - #include "icoe_adap.h" +#include "icoe_gps.h" +#include "icoe_xmodem.h" char* gps_dl_send_buf; int gps_file_exist; @@ -13,7 +14,7 @@ int icoe_entry_load_mode_by_hw(void) char c = 0; int i = 0, cnt = 0; - unsigned char cmd[] = {"M!TM!TM!T"}; + char cmd[] = {"M!TM!TM!T"}; icoe_adap_uart_set_baudrate(FW_DOWNLOAD_BAUDRATE); //TODO @@ -32,7 +33,8 @@ int icoe_entry_load_mode_by_hw(void) } - icoe_adap_uart_send_muti(cmd,strlen(cmd)+1); //TODO + //icoe_adap_uart_send_muti(cmd,strlen(cmd)+1); //TODO + icoe_adap_uart_send_bytes(cmd,strlen(cmd)+1); c = icoe_adap_uart_get_char(5); //TODO timeout is 5ms @@ -65,8 +67,8 @@ int icoe_load_fw(char *bl_filename,char *fw_filename) FILE* pBL_File = NULL; FILE* pFW_File = NULL; - unsigned char baudrate_cmd[] = {"$CFGPRT,,h0,921600,1,35\r\n"}; - unsigned char cmd[] = {"2\n"}; + //unsigned char baudrate_cmd[] = {"$CFGPRT,,h0,921600,1,35\r\n"}; + char cmd[] = {"2\n"}; uint32_t boot_size = 0; uint32_t fw_size = 0; @@ -76,9 +78,9 @@ int icoe_load_fw(char *bl_filename,char *fw_filename) int ack_id = 0; uint8_t succ_flag = 1; uint8_t retry_num; - uint8_t recv_len; + //uint8_t recv_len; - gps_dl_send_buf = aic_zalloc(Gps_DL_Send_Buf_len+1); + gps_dl_send_buf = malloc(Gps_DL_Send_Buf_len+1); if (NULL == gps_dl_send_buf) { @@ -332,11 +334,12 @@ int icoe_load_fw(char *bl_filename,char *fw_filename) //icoe_adap_delay_ms(5); //memcpy(cmd,"2\n",3); - icoe_adap_uart_send_muti(cmd,2); + icoe_adap_uart_send_bytes(cmd,2); succ_flag = 0; - recv_len = 0; #if 0 + recv_len = 0; + do { recv_len = icoe_adap_uart_get_string(gps_dl_recv_buf,WRITE_BUF_SIZE); @@ -374,7 +377,7 @@ int icoe_load_fw(char *bl_filename,char *fw_filename) icoe_adap_delay_ms(5); - //icoe_adap_uart_send_muti(baudrate_cmd,2); + //icoe_adap_uart_send_bytes(baudrate_cmd,2); //icoe_adap_delay_ms(5); //icoe_adap_uart_set_baudrate(921600); @@ -501,11 +504,11 @@ int icoe_load_fw(char *bl_filename,char *fw_filename) //icoe_adap_delay_ms(5000); //cmd[0] = '5'; - //icoe_adap_uart_send_muti(cmd,2); + //icoe_adap_uart_send_bytes(cmd,2); //icoe_adap_delay_ms(1000); gps_file_exist = 0; - if (NULL != gps_dl_send_buf) aic_free(gps_dl_send_buf); + if (NULL != gps_dl_send_buf) free(gps_dl_send_buf); //icoe_adap_uart_set_baudrate(APP_RUNING_BAUDRATE); //TODO diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/icoe_xmodem.c b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/icoe_xmodem.c index 572280f..64eca43 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/icoe_xmodem.c +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps/icoe_xmodem.c @@ -67,7 +67,7 @@ void icoe_xmodem_send_frame(char* data, char pack_counter,unsigned int len) //TODO:modify according to your uart driver - icoe_adap_uart_send_muti(xmodem_buff,XMODEM_BLOCKSIZE+3+2); + icoe_adap_uart_send_bytes(xmodem_buff,XMODEM_BLOCKSIZE+3+2); icoe_adap_delay_ms(5); } diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps_uart_read.c b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps_uart_read.c index ed9709a..b80d07a 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps_uart_read.c +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/gps_uart_read.c @@ -406,6 +406,7 @@ static void gps_uart_task_entry(void *thread_input) gps_uart_init(); gps_power_gpio_init(); + #if 0 while(1) { yak_strlog("gps read..."); @@ -414,6 +415,7 @@ static void gps_uart_task_entry(void *thread_input) yak_strlog(read_buf); } + #endif gps_state = E_GPS_State_init; @@ -442,7 +444,8 @@ static void gps_uart_task_entry(void *thread_input) { gps_uart_drv->Receive(read_buf, len); read_buf[len] = 0; - len = 0; + len = 0; + //icoe_gps_nmea_parse(); } yak_strlog(read_buf); } @@ -489,7 +492,7 @@ static void gps_uart_task_entry(void *thread_input) icoe_offline_eph_init((unsigned char * )GPS_OFFLINE_EPH_CustomerKey); //icoe_extract_offline_eph_Ex(RXN_GPS_CONSTEL,pgl_data,0,rtcm_data,&rtcm_len); - unsigned char gps_com[] = "$AIDEPHTYPE,2\r\n"; + char gps_com[] = "$AIDEPHTYPE,2\r\n"; //sns_uart_write(SNS_UART2,(uint8_t *)str,len); icoe_adap_uart_send_bytes(gps_com,strlen((char *)gps_com)); @@ -501,7 +504,7 @@ static void gps_uart_task_entry(void *thread_input) { yak_log("RXN_GPS_CONSTEL rtcm data to inject len =%d\r\n",rtcm_len); - icoe_adap_uart_send_bytes(rtcm_data,rtcm_len); + icoe_adap_uart_send_bytes((char *)rtcm_data,rtcm_len); icoe_adap_delay_ms(10); } @@ -514,7 +517,7 @@ static void gps_uart_task_entry(void *thread_input) { yak_log("RXN_BDS_CONSTEL rtcm data to inject len =%d\r\n",rtcm_len); - icoe_adap_uart_send_bytes(rtcm_data,rtcm_len); + icoe_adap_uart_send_bytes((char *)rtcm_data,rtcm_len); //icoe_adap_delay_ms(10); @@ -523,7 +526,7 @@ static void gps_uart_task_entry(void *thread_input) //SK_SendMsg_ToGpsUart(E_TASK_MSG_GPS_Locate_start,NULL,0); // - icoe_adap_uart_send_bytes((unsigned char *)"$AIDINFO\r\n",sizeof("$AIDINFO\r\n")); + icoe_adap_uart_send_bytes("$AIDINFO\r\n",sizeof("$AIDINFO\r\n")); #endif } break; diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh3x2x_demo_algo_config.h b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh3x2x_demo_algo_config.h index 9f47d46..dc83974 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh3x2x_demo_algo_config.h +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh3x2x_demo_algo_config.h @@ -63,7 +63,7 @@ /* function algo enable config */ #define __USE_GOODIX_ADT_ALGORITHM__ (0) #define __USE_GOODIX_HR_ALGORITHM__ (1) -#define __USE_GOODIX_HRV_ALGORITHM__ (1) +#define __USE_GOODIX_HRV_ALGORITHM__ (0) #define __USE_GOODIX_HSM_ALGORITHM__ (0) #define __USE_GOODIX_SPO2_ALGORITHM__ (1) #define __USE_GOODIX_ECG_ALGORITHM__ (0) diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh3x2x_demo_algo_hook.c b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh3x2x_demo_algo_hook.c index fe8e190..eb06131 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh3x2x_demo_algo_hook.c +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh3x2x_demo_algo_hook.c @@ -115,7 +115,7 @@ void GH3X2X_HrAlgorithmResultReport(STGh3x2xAlgoResult * pstAlgoResult, GU32 lub DBG("w:%d hr%d\n",hr_algo,pstAlgoResult->snResult[0]); if(hr_algo) { - set_hr_value(pstAlgoResult->snResult[0]); + //set_hr_value(pstAlgoResult->snResult[0]); // blood_algo(pstAlgoResult->snResult[0]); } @@ -145,7 +145,7 @@ void GH3X2X_Spo2AlgorithmResultReport(STGh3x2xAlgoResult * pstAlgoResult, GU32 l DBG("spo2:%d\r\n",pstAlgoResult->snResult[0]); if(pstAlgoResult->snResult[0]) { - set_spo2_value(pstAlgoResult->snResult[0]); + //set_spo2_value(pstAlgoResult->snResult[0]); } #endif } diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh_demo_config.h b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh_demo_config.h index 904b1b8..cd126d7 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh_demo_config.h +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh_demo_config.h @@ -57,7 +57,7 @@ /* ppg function type */ #define __FUNC_TYPE_HR_ENABLE__ (1) /**< hb function tye */ -#define __FUNC_TYPE_HRV_ENABLE__ (1) /**< hrv function tye */ +#define __FUNC_TYPE_HRV_ENABLE__ (0) /**< hrv function tye */ #define __FUNC_TYPE_HSM_ENABLE__ (0) /**< hsm function tye */ #define __FUNC_TYPE_SPO2_ENABLE__ (1) /**< spo2 function tye */ #define __FUNC_TYPE_BT_ENABLE__ (0) /**< bt function tye */ @@ -72,7 +72,7 @@ #define __ADT_ONLY_PARTICULAR_WM_CONFIG__ (5) //0: Do not set particular watermark at openning function is ADT only N (N>3&&N<800): set particular watermark, and this value is N at openning function is ADT only /* ecg function type */ -#define __FUNC_TYPE_ECG_ENABLE__ (1) /**< ecg algorithm tye */ +#define __FUNC_TYPE_ECG_ENABLE__ (0) /**< ecg algorithm tye */ #if __FUNC_TYPE_ECG_ENABLE__ #define __FUNC_TYPE_PWTT_ENABLE__ (0) /**< pwtt algorithm tye */ #define __FUNC_TYPE_BP_ENABLE__ (0) /**< bp algorithm tye */ diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh_demo_hook.c b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh_demo_hook.c index 3127517..d0486f5 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh_demo_hook.c +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh_demo_hook.c @@ -201,12 +201,12 @@ void gh3x2x_algorithm_get_io_data_hook_func(const STGh3x2xFrameInfo * const pstF GH3X2X_INFO_LOG("[IO_DATA]Ch%d rawdata= %d\r\n",(int)(uchChnlCnt),(int)(pstFrameInfo->punFrameRawdata[uchChnlCnt])); } #endif -#if 1 +#if 0 if(pstFrameInfo->unFunctionID == 0x80) { // EXAMPLE_LOG("**************%d**********************\r\n",pstFrameInfo->unFunctionID); - clear_ecg_check_cnt(); - sync_ecg_sourcedata((int32_t *)pstFrameInfo->punFrameRawdata,pstFrameInfo->pstFunctionInfo->uchChnlNum); + //clear_ecg_check_cnt(); + //sync_ecg_sourcedata((int32_t *)pstFrameInfo->punFrameRawdata,pstFrameInfo->pstFunctionInfo->uchChnlNum); } else if((int)(pstFrameInfo->unFunctionID) == GH3X2X_FUNCTION_HRV)//GH3X2X_FUNCTION_ADT { @@ -359,7 +359,7 @@ soconly, you can disable multi sensor event manager via API GhMultSensorWearEven thirdly, you can open/close function via API Gh3x2xDemoStartSampling/Gh3x2xDemoStopSampling according event record **/ /// @param uchNewEvent such as: GH3X2X_MULTI_SENSOR_EVENT_GH_WEAR_ON -extern uint8_t adt_start_state; +uint8_t adt_start_state; void GhMultiSensorEventHook(GU32 uchNewEvent) { DBG("[GhMultiSensorEventHook] uchNewEvent:%d\r\n",uchNewEvent); diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh_demo_user.c b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh_demo_user.c index 73b35d5..2de5f1a 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh_demo_user.c +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/ppg/gh_demo_user.c @@ -31,8 +31,11 @@ #define DBG yak_log extern void hr_timer_switch(uint8_t sw); -extern int sensor_bus_normal_spi_write(uint8_t *write_buffer, uint16_t length); -extern int sensor_bus_normal_spi_read(uint8_t *write_buffer, uint16_t length); +//extern int sensor_bus_normal_spi_write(uint8_t *write_buffer, uint16_t length); +//extern int sensor_bus_normal_spi_read(uint8_t *write_buffer, uint16_t length); +uint8_t sk_ppg_spi_drv_write(uint8_t *write_buffer, uint16_t length); +uint8_t sk_ppg_spi_drv_read(uint8_t *read_buffer, uint16_t length); + #if ( __GH3X2X_INTERFACE__ == __GH3X2X_INTERFACE_I2C__ ) /* i2c interface */ @@ -162,7 +165,8 @@ GU8 hal_gh3x2x_spi_write(GU8 write_buffer[], GU16 length) { GU8 ret = 1; // printk("hal_gh3x2x_spi_write len:%d-------------\n",length); - ret = sensor_bus_normal_spi_write(write_buffer,length); + //ret = sensor_bus_normal_spi_write(write_buffer,length); + ret = sk_ppg_spi_drv_write(write_buffer,length); // GOODIX_PLANFROM_SPI_WRITE_ENTITY(write_buffer, length); return ret; @@ -195,7 +199,8 @@ GU8 hal_gh3x2x_spi_read(GU8 read_buffer[], GU16 length) { GU8 ret = 1; // printk("hal_gh3x2x_spi_read len:%d-------------\n",length); - ret = sensor_bus_normal_spi_read(read_buffer,length); + //ret = sensor_bus_normal_spi_read(read_buffer,length); + ret = sk_ppg_spi_drv_read(read_buffer,length); // GOODIX_PLANFROM_SPI_READ_ENTITY(); return ret; @@ -226,7 +231,8 @@ GU8 hal_gh3x2x_spi_write_F1_and_read(GU8 read_buffer[], GU16 length) { GU8 ret = 1; // printk("hal_gh3x2x_spi_write_F1_and_read len:%d-------------\n",length); - ret = sensor_bus_normal_spi_read(read_buffer,length); + //ret = sensor_bus_normal_spi_read(read_buffer,length); + ret = sk_ppg_spi_drv_read(read_buffer,length); // GOODIX_PLANFROM_SPI_READ_ENTITY(); return ret; diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/sk_main.c b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/sk_main.c index d5a3f88..d987e10 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/sk_main.c +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/sk_main.c @@ -383,10 +383,9 @@ void SK_MainTask_Entry(void *appInfo) SK_SocketTask_Init(); //Sk_FotaApp_Init(); - //SK_PPG_Task_Init(); + SK_PPG_Task_Init(); //SK_LocationTask_Init(); - SK_GPS_UART_Task_Init(); - + //SK_GPS_UART_Task_Init(); yak_log("----- long size=%d,double size=%d", sizeof(longsize), sizeof(doublesize)); diff --git a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/sk_ppg.c b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/sk_ppg.c index 44f17b7..ed428b2 100644 --- a/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/sk_ppg.c +++ b/ec_fullsdk/PLAT/project/ec7xx_0h00/ap/apps/at_command/src/sk_ppg.c @@ -36,7 +36,7 @@ */ #define TRANSFER_SIZE (18) -#define ARM_SPI_FRAME_FROMAT ARM_SPI_CPOL1_CPHA0 +#define ARM_SPI_FRAME_FROMAT ARM_SPI_CPOL0_CPHA0 #define RTE_SPI_IO_MODE RTE_SPI0_IO_MODE @@ -132,12 +132,26 @@ void ADT_Timer_start(void) extern GU32 g_unDemoFuncMode; -// 关功能 -extern GU32 gh3x2x_mode; +// 关功能 功能开关 +GU32 gh3x2x_mode; + +uint8_t hr_wear; + +int16_t acceleration_buffer[300]; +uint8_t acceleration_buffer_save_index; +uint8_t acceleration_buffer_current_index; + + extern void GhMultiSensorWearDetStop(void); +void hr_timer_switch(uint8_t sw) +{ + return; +} + + int hr_algo_stop(void) { if (g_unDemoFuncMode) @@ -214,6 +228,34 @@ void PPG_Dev_reset() Gh3x2xDemoInit(); } +uint8_t sk_ppg_spi_drv_write(uint8_t *write_buffer, uint16_t length) +{ + uint8_t real_len = 0; + real_len = spiMasterDrv->Send(write_buffer, length); + return real_len; +} + +uint8_t sk_ppg_spi_drv_read(uint8_t *read_buffer, uint16_t length) +{ + uint8_t real_len = 0; + real_len = spiMasterDrv->Receive(read_buffer, length); + return real_len; +} + +void sk_ppg_spi_drv_init(void) +{ + spiMasterDrv->Initialize(SPI_Callback); + + // Power on + spiMasterDrv->PowerControl(ARM_POWER_FULL); + + // Configure slave spi bus + spiMasterDrv->Control(ARM_SPI_MODE_MASTER | ARM_SPI_FRAME_FROMAT | ARM_SPI_DATA_BITS(TRANSFER_DATA_WIDTH) | + ARM_SPI_MSB_LSB | ARM_SPI_SS_MASTER_UNUSED, + 200000U); +} + + int spi0_func_test() { int32_t ret, i; @@ -245,7 +287,7 @@ int spi0_func_test() - printf("Press button to trigger transfer!\n"); + yak_strlog("SPI init over\r\n"); // REPEAT: while (1) @@ -255,9 +297,11 @@ int spi0_func_test() memset(master_buffer_in, 0, sizeof(master_buffer_in)); // spiMasterDrv->Transfer(master_buffer_out, master_buffer_in, TRANSFER_SIZE); + yak_log("SPI send:=%s\r\n",master_buffer_out); spiMasterDrv->Send(master_buffer_out, TRANSFER_SIZE); #if RTE_SPI_IO_MODE != POLLING_MODE + yak_strlog("RTE_SPI_IO_MODE != POLLING_MODE\r\n"); do { @@ -268,29 +312,13 @@ int spi0_func_test() if (timeOut_ms == 0) { - printf("Master transfer failed for timeout\n"); + yak_strlog("Master transfer failed for timeout\n"); } else { - for (i = 0; i < TRANSFER_SIZE; i++) - { - if (master_buffer_in[i] != slave_buffer_out[i]) - break; - } - - if (i != TRANSFER_SIZE) - { - printf("Master transfer failed for data verifying\n"); - - for (i = 0; i < TRANSFER_SIZE; i++) - { - printf("%d: 0x%x-0x%x\r\n", i, master_buffer_in[i], slave_buffer_out[i]); - } - } - else - { - printf("Master transfer success\n"); - } + + yak_strlog("Master transfer success\n"); + } } return ret; @@ -299,51 +327,15 @@ int spi0_func_test() void PPG_Task_entry(void * pArg) -{ - #if 0 - // In case AGPIO is used - slpManAONIOPowerOn(); - - // GPIO function select - PadConfig_t padConfig; - PAD_getDefaultConfig(&padConfig); - - padConfig.mux = PPG_PAD_ALT_FUNC; - PAD_setPinConfig(PPG_PAD_INDEX, &padConfig); - PAD_setPinPullConfig(PPG_PAD_INDEX, PAD_INTERNAL_PULL_UP); - - - //ppg pin config - config.pinDirection = GPIO_DIRECTION_INPUT; - config.misc.interruptConfig = GPIO_INTERRUPT_RISING_EDGE; - - GPIO_pinConfig(PPG_GPIO_INSTANCE, PPG_GPIO_PIN, &config); - - // Enable IRQ - XIC_SetVector(PXIC1_GPIO_IRQn, GPIO_ISR); - XIC_EnableIRQ(PXIC1_GPIO_IRQn); - - #endif - - #if 0 - //Temp_Gpio_Init(); - //Temp_Gpio_Init_test(); - //Temp_PowerOff(); - while(1) - { - //int t = 0; - gpio_test(); - } - #else - - - Temp_Gpio_Init(); - +{ + Temp_Gpio_Init(); + sk_ppg_spi_drv_init(); while(1) { + #if 0 int t = 0; - + Temp_PowerOn(); yak_strlog("temp read..."); @@ -353,10 +345,12 @@ void PPG_Task_entry(void * pArg) Temp_PowerOff(); yak_log("temp value=%d",t); - osDelay(1000); - //osDelay(3000); - } - #endif + #else + //spi0_func_test(); + //Gh3x2xDemoInit(); + #endif + osDelay(5000); + } } diff --git a/ec_fullsdk/PLAT/tools/UpdateDBPattern.txt b/ec_fullsdk/PLAT/tools/UpdateDBPattern.txt new file mode 100644 index 0000000..0a3a848 --- /dev/null +++ b/ec_fullsdk/PLAT/tools/UpdateDBPattern.txt @@ -0,0 +1,12 @@ + + + _ _ _ _ _____ ____ + | | | | | | | | | __ \ | _ \ + | | | | _ __ __| | __ _ | |_ ___ | | | | | |_) | + | | | | | _ \ / _` | / _` | | __| / _ \ | | | | | _ < + | |__| | | |_) | | (_| | | (_| | | |_ | __/ | |__| | | |_) | + \____/ | .__/ \__ _| \__ _| \__| \___| |_____/ |____/ + | | + |_| + + diff --git a/ec_fullsdk/PLAT/tools/comdb_cust_lib.txt b/ec_fullsdk/PLAT/tools/comdb_cust_lib.txt index d4a275d..8c9fd6a 100644 --- a/ec_fullsdk/PLAT/tools/comdb_cust_lib.txt +++ b/ec_fullsdk/PLAT/tools/comdb_cust_lib.txt @@ -1,8 +1,8 @@ DbVersion -1771461578,100 +164774008,100 BuildInfo -The current data file was built by the Application Ver. 2.2.81.216, Thu Apr 10 18:00:56 2025 +The current data file was built by the Application Ver. 2.2.81.216, Fri Apr 11 17:31:38 2025 EnumVals 0,0,0,0,PHY_ONLINE,PHY_ICS_MODULE,PhyIcsMeasMainEntrance_0,P_INFO,swLogPrintf("ICS MEAS of euArfcn %d will be started "); @@ -7715,5 +7715,5 @@ MW_INFO_PHY_EDRX_PARAM,midWareNvmInfoPhyEdrxParam plat_config,plat_config_fs_t OptionalSegment -optional_sk_01,69CA96867046C5022E0D5862ACF2EBDF296C6A81F80371D2E545828A34156D90 +optional_sk_01,A7D0D983DC4C2F0229B15B6D54EEF1B03384BAAED37B4BBBDAE38757800B1F49