josh/hj_datalink
1
0
Fork 0
forked from gatsby/df_datalink
Code Issues Pull Requests Releases Activity

Merge branch 'master' of http://nas.gatsby.icu:3000/gatsby/df_datalink

Browse Source
This commit is contained in:
bit-cyber-fh
2024-05-22 16:22:38 +08:00
parent 68396cb7ac 688534c117
commit 475314f2a5
7 changed files with 179 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
caldata
+176
View File
@@ -175,6 +175,50 @@ calMap[JG05]="\{\n\
\{ 0, 2923, -6999, 11232\}, \n\
};"
calMap[JG06]="\{\n\
\{ 0, -3193, -1212, 1843\}, \{ 0, -3191, -1331, 1701\},\n\
\{ 0, -3257, -1489, 1654\}, \{ 0, -3460, -1572, 1522\},\n\
\{ 0, -3552, -1697, 1526\}, \{ 0, -3709, -1915, 1292\},\n\
\{ 0, -3824, -2028, 1254\}, \{ 0, -3932, -2082, 1069\},\n\
\{ 0, -3929, -2154, 1109\}, \{ 0, -4073, -2215, 949\},\n\
\{ 0, -4078, -2261, 970\}, \{ 0, -3980, -2076, 1035\},\n\
\{ 0, -3976, -2215, 807\}, \{ 0, -4119, -2390, 631\},\n\
\{ 0, -3947, -1939, 778\}, \{ 0, -3860, -1811, 773\},\n\
\{ 0, -3941, -2073, 812\}, \{ 0, -4011, -2152, 603\},\n\
\{ 0, -4004, -2293, 666\}, \{ 0, -3763, -1990, 981\},\n\
\{ 0, -3795, -2080, 955\}, \{ 0, -5422, -4014, -3352\},\n\
\{ 0, -5334, -3839, -3198\}, \{ 0, -5003, -3704, -3127\},\n\
\{ 0, -4923, -3459, -2822\}, \{ 0, -4880, -3634, -2927\},\n\
\{ 0, -4626, -3279, -2818\}, \{ 0, -4459, -3158, -2737\},\n\
\{ 0, -4451, -3021, -2714\}, \{ 0, -4232, -2966, -2584\},\n\
\{ 0, -4121, -2834, -2596\}, \{ 0, -3976, -2641, -2334\},\n\
\{ 0, -3794, -2439, -2238\}, \{ 0, -3675, -2262, -2175\},\n\
\{ 0, -3362, -1706, -1623\}, \{ 0, -3528, -2164, -1984\},\n\
\{ 0, -3152, -1630, -1687\}, \{ 0, -3263, -1802, -1695\},\n\
\{ 0, -2947, -1336, -1531\}, \{ 0, -3096, -1405, -1527\},\n\
\{ 0, -3166, -1540, -1558\}, \{ 0, -3138, -1467, -1543\},\n\
\{ 0, -903, 658, -935\}, \{ 0, -828, 762, -1026\},\n\
\{ 0, -550, 1350, -713\}, \{ 0, -829, 1110, -1164\},\n\
\{ 0, -752, 1063, -1160\}, \{ 0, -705, 1128, -1506\},\n\
\{ 0, -659, 1257, -1704\}, \{ 0, -719, 1290, -1965\},\n\
\{ 0, -544, 1695, -1719\}, \{ 0, -687, 1528, -2183\},\n\
\{ 0, -478, -21223, -2095\}, \{ 0, -653, 1741, -2397\},\n\
\{ 0, -651, 1813, -2513\}, \{ 0, -511, -21073, -2543\},\n\
\{ 0, -499, -23598, -2642\}, \{ 0, -851, 1982, -2660\},\n\
\{ 0, -872, 1961, -2673\}, \{ 0, -810, 2043, -2845\},\n\
\{ 0, -1060, 1924, -2732\}, \{ 0, -1115, -3044, -2581\},\n\
\{ 0, -1129, 2014, -2828\}, \{ 0, 731, 4892, 234\},\n\
\{ 0, 570, 4718, 22\}, \{ 0, 100, 4534, -37\},\n\
\{ 0, 254, 4653, -65\}, \{ 0, 182, 4873, 90\},\n\
\{ 0, 164, 4680, -74\}, \{ 0, 148, 4590, -196\},\n\
\{ 0, 208, 4540, -186\}, \{ 0, 250, 4615, -126\},\n\
\{ 0, 308, 4559, -37\}, \{ 0, 409, 4640, -129\},\n\
\{ 0, 474, 4646, -81\}, \{ 0, 388, 4486, -12\},\n\
\{ 0, 513, 4546, -96\}, \{ 0, 673, 4704, 72\},\n\
\{ 0, 509, 4312, -42\}, \{ 0, 584, 4564, -44\},\n\
\{ 0, 672, 4597, -120\}, \n\
};"
calMap[LJ01]="\{\n\
\{ 0, 3306, -5061, -13611\}, \{ 0, 3049, -4933, -13418\},\n\
\{ 0, 2843, -4962, -13208\}, \{ 0, 2486, -5123, -13136\},\n\
@@ -217,4 +261,136 @@ calMap[LJ01]="\{\n\
\{ 0, 4245, -9975, -14787\}, \{ 0, 4320, -9969, -14682\},\n\
\{ 0, 4147, -9974, -14613\}, \{ 0, 4026, -9853, -14365\},\n\
\{ 0, 3899, -9675, -14231\}, \n\
};"
calMap[LJ03]="\{\n\
\{ 0, 1349, -5364, -8244\}, \{ 0, 1305, -5313, -8123\},\n\
\{ 0, 1346, -5207, -8048\}, \{ 0, 1267, -5433, -8294\},\n\
\{ 0, 1432, -5184, -8028\}, \{ 0, 1300, -5323, -7882\},\n\
\{ 0, 1344, -5252, -7874\}, \{ 0, 1471, -4946, -7465\},\n\
\{ 0, 1463, -4744, -7438\}, \{ 0, 1343, -4772, -7414\},\n\
\{ 0, 1327, -4773, -7466\}, \{ 0, 1529, -4640, -7207\},\n\
\{ 0, 1361, -4649, -7166\}, \{ 0, 1282, -4773, -7277\},\n\
\{ 0, 1395, -4358, -6842\}, \{ 0, 1460, -4368, -6891\},\n\
\{ 0, 1453, -4271, -6791\}, \{ 0, 1508, -3985, -6433\},\n\
\{ 0, 1631, -3986, -6168\}, \{ 0, 1703, -3670, -6021\},\n\
\{ 0, 1721, -3765, -5929\}, \{ 0, -945, -8000, -7277\},\n\
\{ 0, -760, -7667, -6891\}, \{ 0, -674, -7604, -6809\},\n\
\{ 0, -651, -7716, -6859\}, \{ 0, -564, -7489, -6550\},\n\
\{ 0, -619, -7426, -6299\}, \{ 0, -548, -7423, -6400\},\n\
\{ 0, -594, -7559, -6385\}, \{ 0, -454, -7217, -6158\},\n\
\{ 0, -652, -7475, -6376\}, \{ 0, -515, -7409, -6425\},\n\
\{ 0, -594, -7547, -6704\}, \{ 0, -624, -7454, -6696\},\n\
\{ 0, -632, -7298, -6673\}, \{ 0, -618, -7398, -6976\},\n\
\{ 0, -448, -7026, -6590\}, \{ 0, -403, -7384, -6981\},\n\
\{ 0, -309, -7243, -6984\}, \{ 0, -244, -7224, -7184\},\n\
\{ 0, -149, -7332, -7120\}, \{ 0, 3, -6982, -7051\},\n\
\{ 0, 637, -5403, -6598\}, \{ 0, 741, -5338, -6589\},\n\
\{ 0, 1061, -5151, -6684\}, \{ 0, 1132, -5092, -6982\},\n\
\{ 0, 1395, -5371, -6885\}, \{ 0, 1576, -5046, -7027\},\n\
\{ 0, 1685, -5036, -7188\}, \{ 0, -4861, -4954, -7182\},\n\
\{ 0, 7528, -4764, -7106\}, \{ 0, 7402, -4883, -7450\},\n\
\{ 0, 2421, -4626, -7362\}, \{ 0, 2537, -4763, -7522\},\n\
\{ 0, 2625, -4445, -7453\}, \{ 0, 2812, -4555, -7423\},\n\
\{ 0, 2817, -4220, -7536\}, \{ 0, 2871, -4363, -7597\},\n\
\{ 0, 2991, -4147, -7377\}, \{ 0, 3022, -4280, -7546\},\n\
\{ 0, 3081, -4477, -7607\}, \{ 0, 3207, -4288, -7445\},\n\
\{ 0, 3222, -4523, -7341\}, \{ 0, 2538, -5235, -7880\},\n\
\{ 0, 2556, -5329, -7867\}, \{ 0, 2637, -5562, -7906\},\n\
\{ 0, 2615, -5434, -7647\}, \{ 0, 2526, -5602, -7602\},\n\
\{ 0, 2506, -5612, -7705\}, \{ 0, 2365, -5521, -7538\},\n\
\{ 0, 7423, -5500, -7675\}, \{ 0, 2264, -5602, -7646\},\n\
\{ 0, 2263, -5490, -7639\}, \{ 0, -15024, -5463, -7460\},\n\
\{ 0, -4834, -5419, -7484\}, \{ 0, -3118, -5570, -7579\},\n\
\{ 0, -6596, -5413, -7525\}, \{ 0, 1877, -5315, -7328\},\n\
\{ 0, 1874, -5682, -7534\}, \{ 0, 1759, -5330, -7287\},\n\
\{ 0, 1735, -5507, -7305\}, \n\
};"
calMap[LJ04]="\{\n\
\{ 0, -3188, -5668, -7029\}, \{ 0, -3144, -5592, -6708\},\n\
\{ 0, -3332, -5859, -7135\}, \{ 0, -3402, -5694, -6908\},\n\
\{ 0, -3376, -5858, -7070\}, \{ 0, -3383, -5474, -6886\},\n\
\{ 0, -3518, -5487, -6925\}, \{ 0, -3383, -5342, -6659\},\n\
\{ 0, -3487, -5535, -6848\}, \{ 0, -3472, -5206, -6576\},\n\
\{ 0, -3432, -5335, -6581\}, \{ 0, -3502, -5071, -6421\},\n\
\{ 0, -3549, -5020, -6390\}, \{ 0, -3618, -4961, -6310\},\n\
\{ 0, -3774, -4938, -6377\}, \{ 0, -3868, -5039, -6488\},\n\
\{ 0, -3865, -4778, -6328\}, \{ 0, -3812, -4602, -6360\},\n\
\{ 0, -3990, -4498, -6189\}, \{ 0, -3820, -4493, -6070\},\n\
\{ 0, -3793, -4262, -5963\}, \{ 0, -4355, -5745, -6648\},\n\
\{ 0, -4372, -5742, -6633\}, \{ 0, -4458, -5618, -6650\},\n\
\{ 0, -4484, -5695, -6732\}, \{ 0, -4367, -5513, -6642\},\n\
\{ 0, -4433, -5498, -6628\}, \{ 0, -4364, -5480, -6563\},\n\
\{ 0, -4344, -5382, -6497\}, \{ 0, -4255, -5470, -6465\},\n\
\{ 0, -4154, -5145, -6183\}, \{ 0, -4211, -5200, -6136\},\n\
\{ 0, -4086, -5205, -6195\}, \{ 0, -4113, -5261, -6338\},\n\
\{ 0, -4069, -4832, -5831\}, \{ 0, -3835, -4826, -5801\},\n\
\{ 0, -4030, -5011, -6065\}, \{ 0, -3711, -4838, -5795\},\n\
\{ 0, -3644, -4881, -5899\}, \{ 0, -3507, -4813, -5800\},\n\
\{ 0, -3453, -4947, -5520\}, \{ 0, -3374, -4954, -5642\},\n\
\{ 0, -4837, -5736, -7500\}, \{ 0, -4470, -5620, -7385\},\n\
\{ 0, -4401, -5408, -7370\}, \{ 0, -4271, -5626, -7496\},\n\
\{ 0, -4286, -5828, -7556\}, \{ 0, -4184, -5982, -7565\},\n\
\{ 0, -3923, -5491, -7415\}, \{ 0, -3926, -5554, -7685\},\n\
\{ 0, -3657, -5235, -7542\}, \{ 0, -3530, -5104, -7717\},\n\
\{ 0, -3370, -4853, -7737\}, \{ 0, -3224, -4703, -7679\},\n\
\{ 0, -3100, -4620, -7733\}, \{ 0, -3010, -4547, -7648\},\n\
\{ 0, -2838, -4318, -7619\}, \{ 0, -2907, -4260, -7604\},\n\
\{ 0, -2883, -4306, -7768\}, \{ 0, -2878, -3949, -7601\},\n\
\{ 0, -2927, -4097, -7840\}, \{ 0, -2816, -3790, -7544\},\n\
\{ 0, -2853, -3654, -7534\}, \{ 0, -2052, -2142, -3986\},\n\
\{ 0, -2109, -2259, -4027\}, \{ 0, -2132, -2002, -3745\},\n\
\{ 0, -2275, -2181, -3810\}, \{ 0, -2353, -1951, -3419\},\n\
\{ 0, -2428, -2046, -3391\}, \{ 0, -2537, -1974, -3301\},\n\
\{ 0, -2568, -1805, -3074\}, \{ 0, -2764, -1930, -3068\},\n\
\{ 0, -2793, -1922, -2816\}, \{ 0, -2931, -2060, -2982\},\n\
\{ 0, -3118, -2158, -2858\}, \{ 0, -3370, -2240, -3088\},\n\
\{ 0, -3411, -2369, -3055\}, \{ 0, -3867, -2590, -3016\},\n\
\{ 0, -3965, -2696, -3099\}, \{ 0, -4112, -2907, -3438\},\n\
\{ 0, -4226, -2747, -3341\}, \n\
};"
calMap[LJ06]="\{\n\
\{ 0, -2262, -6113, 0\}, \{ 0, -2289, -5998, 0\},\n\
\{ 0, -2389, -5908, 0\}, \{ 0, -2400, -5772, 0\},\n\
\{ 0, -2453, -5681, 0\}, \{ 0, -2499, -5388, 0\},\n\
\{ 0, -2697, -5347, 0\}, \{ 0, -2711, -5354, 0\},\n\
\{ 0, -2706, -5191, 0\}, \{ 0, -2735, -5041, 0\},\n\
\{ 0, -2774, -5210, 0\}, \{ 0, -2786, -5058, 0\},\n\
\{ 0, -2678, -4895, 0\}, \{ 0, -2919, -5057, 0\},\n\
\{ 0, -2721, -4910, 0\}, \{ 0, -2907, -5193, 0\},\n\
\{ 0, -2788, -5127, 0\}, \{ 0, -2740, -5244, 0\},\n\
\{ 0, -2952, -5528, 0\}, \{ 0, -2780, -5636, 0\},\n\
\{ 0, -2699, -5809, 0\}, \{ 0, -5951, -7685, 0\},\n\
\{ 0, -5919, -8016, 0\}, \{ 0, -5825, -7896, 0\},\n\
\{ 0, -5678, -8137, 0\}, \{ 0, -5540, -7997, 0\},\n\
\{ 0, -5402, -8086, 0\}, \{ 0, -5177, -8028, 0\},\n\
\{ 0, -5086, -8084, 0\}, \{ 0, -4956, -8329, 0\},\n\
\{ 0, -4540, -7947, 0\}, \{ 0, -4522, -8167, 0\},\n\
\{ 0, -4236, -8042, 0\}, \{ 0, -4221, -8116, 0\},\n\
\{ 0, -4065, -7614, 0\}, \{ 0, -3927, -7733, 0\},\n\
\{ 0, -4279, -8023, 0\}, \{ 0, -3821, -7745, 0\},\n\
\{ 0, -3811, -7711, 0\}, \{ 0, -3622, -7571, 0\},\n\
\{ 0, -3670, -7673, 0\}, \{ 0, -3468, -7280, 0\},\n\
\{ 0, -7748, -9555, 0\}, \{ 0, -7489, -9416, 0\},\n\
\{ 0, -7519, -9207, 0\}, \{ 0, -7465, -9536, 0\},\n\
\{ 0, -7860, -9780, 0\}, \{ 0, -7653, -9649, 0\},\n\
\{ 0, -7797, -9516, 0\}, \{ 0, -7830, -9363, 0\},\n\
\{ 0, -7742, -9205, 0\}, \{ 0, -7527, -8705, 0\},\n\
\{ 0, -7519, -8575, 0\}, \{ 0, -7595, -8404, 0\},\n\
\{ 0, -7486, -8284, 0\}, \{ 0, -7580, -7872, 0\},\n\
\{ 0, -7538, -7504, 0\}, \{ 0, -7962, -7643, 0\},\n\
\{ 0, -8127, -7655, 0\}, \{ 0, -8093, -6990, 0\},\n\
\{ 0, -8134, -6976, 0\}, \{ 0, -8124, -6803, 0\},\n\
\{ 0, -8197, -6536, 0\}, \{ 0, -3942, -1676, 0\},\n\
\{ 0, -4183, -1856, 0\}, \{ 0, -4299, -1592, 0\},\n\
\{ 0, -4544, -1886, 0\}, \{ 0, -4665, -1528, 0\},\n\
\{ 0, -4565, -1494, 0\}, \{ 0, -4739, -1559, 0\},\n\
\{ 0, -4674, -1424, 0\}, \{ 0, -5024, -1639, 0\},\n\
\{ 0, -4809, -1556, 0\}, \{ 0, -5018, -1704, 0\},\n\
\{ 0, -4793, -1466, 0\}, \{ 0, -5107, -1687, 0\},\n\
\{ 0, -4760, -1739, 0\}, \{ 0, -5083, -1904, 0\},\n\
\{ 0, -5023, -2034, 0\}, \{ 0, -4848, -2186, 0\},\n\
\{ 0, -4732, -1999, 0\}, \n\
};"
calibration_data/dataGen.m
+1 -1
View File
@@ -1,5 +1,5 @@
clear;clc;
name = 'LJ01';
name = 'LJ06';
load(['phase_' name '.mat']);
data = sortrows(dataDec1, 1);
calibration_data/phase_JG06.mat
BIN
View File
Binary file not shown.
calibration_data/phase_LJ03.mat
BIN
View File
Binary file not shown.
calibration_data/phase_LJ04.mat
BIN
View File
Binary file not shown.
calibration_data/phase_LJ06.mat
BIN
View File
Binary file not shown.
df_datalink_sp/src/networking/link_layer/link_layer.c
+2 -2
View File
@@ -589,7 +589,7 @@ int32_t Linklayer_Reconfig(L2_INST *instPtr, const L2_CONFIG *config)
instPtr->rtneConfig.last = NULL;
instPtr->rtneConfig.curr = NULL;
instPtr->rtneConfig.next = NULL;
instPtr->cxn2Net = false;
instPtr->cxn2Net = (config->myType == L2_NODE_HEAD) ? true : false;
instPtr->dataAvail = false;
instPtr->frameNum.last = 0;
instPtr->frameNum.curr = 0;
@@ -1050,7 +1050,7 @@ int32_t Linklayer_Proc(L2_INST *instPtr)
instPtr->linkLog.tuNum = instPtr->frameNum.curr;
instPtr->linkLog.slotNum = (uint8_t)instPtr->slotNum.curr;
instPtr->linkLog.nodeType = (L2_GetNodeType(instPtr) == L2_NODE_HEAD) ? 0xAA : 0xCC;
instPtr->linkLog.cxnStatus = (instPtr->cxn2Net) ? 0x11 : 0x00;
instPtr->linkLog.cxnStatus = (L2_isCxn2Net(instPtr)) ? 0x11 : 0x00;
instPtr->linkLog.linkStage = (instPtr->mainState == L2_INIT_STATE) ? 0x11 : 0x22;
instPtr->linkLog.recxnCnt = instPtr->log.reconnectCnt;
instPtr->linkLog.beamNo = instPtr->scanFSM->beamNo;