update

app/app.uvoptx

@@ -503,7 +503,7 @@
       <GroupNumber>1</GroupNumber>
       <FileNumber>12</FileNumber>
       <FileType>1</FileType>
-      <tvExp>1</tvExp>
+      <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>.\src\basic\ads1293\ads1293.c</PathWithFileName>
@@ -583,6 +583,18 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>19</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\src\one_conduction\heart_wave_sample_service.c</PathWithFileName>
+      <FilenameWithoutPath>heart_wave_sample_service.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -593,7 +605,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>19</FileNumber>
+      <FileNumber>20</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -613,7 +625,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>20</FileNumber>
+      <FileNumber>21</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -625,7 +637,7 @@
     </File>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>21</FileNumber>
+      <FileNumber>22</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -645,7 +657,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>4</GroupNumber>
-      <FileNumber>22</FileNumber>
+      <FileNumber>23</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -665,7 +677,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>23</FileNumber>
+      <FileNumber>24</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -677,7 +689,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>24</FileNumber>
+      <FileNumber>25</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -689,7 +701,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>25</FileNumber>
+      <FileNumber>26</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -701,7 +713,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>26</FileNumber>
+      <FileNumber>27</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -713,7 +725,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>27</FileNumber>
+      <FileNumber>28</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -725,7 +737,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>28</FileNumber>
+      <FileNumber>29</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -737,7 +749,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>29</FileNumber>
+      <FileNumber>30</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -749,7 +761,7 @@
     </File>
     <File>
       <GroupNumber>5</GroupNumber>
-      <FileNumber>30</FileNumber>
+      <FileNumber>31</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -769,7 +781,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>6</GroupNumber>
-      <FileNumber>31</FileNumber>
+      <FileNumber>32</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -789,7 +801,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>32</FileNumber>
+      <FileNumber>33</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -801,7 +813,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>33</FileNumber>
+      <FileNumber>34</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -813,7 +825,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>34</FileNumber>
+      <FileNumber>35</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -825,7 +837,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>35</FileNumber>
+      <FileNumber>36</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -837,7 +849,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>36</FileNumber>
+      <FileNumber>37</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -849,7 +861,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>37</FileNumber>
+      <FileNumber>38</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -861,7 +873,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>38</FileNumber>
+      <FileNumber>39</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -873,7 +885,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>39</FileNumber>
+      <FileNumber>40</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -885,7 +897,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>40</FileNumber>
+      <FileNumber>41</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -897,7 +909,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>41</FileNumber>
+      <FileNumber>42</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -909,7 +921,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>42</FileNumber>
+      <FileNumber>43</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -921,7 +933,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>43</FileNumber>
+      <FileNumber>44</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -933,7 +945,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>44</FileNumber>
+      <FileNumber>45</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -945,7 +957,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>45</FileNumber>
+      <FileNumber>46</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -957,7 +969,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>46</FileNumber>
+      <FileNumber>47</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -969,7 +981,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>47</FileNumber>
+      <FileNumber>48</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -981,7 +993,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>48</FileNumber>
+      <FileNumber>49</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -993,7 +1005,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>49</FileNumber>
+      <FileNumber>50</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1005,7 +1017,7 @@
     </File>
     <File>
       <GroupNumber>7</GroupNumber>
-      <FileNumber>50</FileNumber>
+      <FileNumber>51</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1015,6 +1027,18 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>7</GroupNumber>
+      <FileNumber>52</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\sdk\modules\nrfx\drivers\src\nrfx_timer.c</PathWithFileName>
+      <FilenameWithoutPath>nrfx_timer.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -1025,7 +1049,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>51</FileNumber>
+      <FileNumber>53</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1037,7 +1061,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>52</FileNumber>
+      <FileNumber>54</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1049,7 +1073,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>53</FileNumber>
+      <FileNumber>55</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1061,7 +1085,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>54</FileNumber>
+      <FileNumber>56</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1073,7 +1097,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>55</FileNumber>
+      <FileNumber>57</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1085,7 +1109,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>56</FileNumber>
+      <FileNumber>58</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1097,7 +1121,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>57</FileNumber>
+      <FileNumber>59</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1109,7 +1133,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>58</FileNumber>
+      <FileNumber>60</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1121,7 +1145,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>59</FileNumber>
+      <FileNumber>61</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1133,7 +1157,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>60</FileNumber>
+      <FileNumber>62</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1145,7 +1169,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>61</FileNumber>
+      <FileNumber>63</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1157,7 +1181,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>62</FileNumber>
+      <FileNumber>64</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1169,7 +1193,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>63</FileNumber>
+      <FileNumber>65</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1181,7 +1205,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>64</FileNumber>
+      <FileNumber>66</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1193,7 +1217,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>65</FileNumber>
+      <FileNumber>67</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1205,7 +1229,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>66</FileNumber>
+      <FileNumber>68</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1217,7 +1241,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>67</FileNumber>
+      <FileNumber>69</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1229,7 +1253,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>68</FileNumber>
+      <FileNumber>70</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1241,7 +1265,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>69</FileNumber>
+      <FileNumber>71</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1253,7 +1277,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>70</FileNumber>
+      <FileNumber>72</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1265,7 +1289,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>71</FileNumber>
+      <FileNumber>73</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1277,7 +1301,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>72</FileNumber>
+      <FileNumber>74</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1289,7 +1313,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>73</FileNumber>
+      <FileNumber>75</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1301,7 +1325,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>74</FileNumber>
+      <FileNumber>76</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1313,7 +1337,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>75</FileNumber>
+      <FileNumber>77</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1325,7 +1349,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>76</FileNumber>
+      <FileNumber>78</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1337,7 +1361,7 @@
     </File>
     <File>
       <GroupNumber>8</GroupNumber>
-      <FileNumber>77</FileNumber>
+      <FileNumber>79</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1357,7 +1381,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>9</GroupNumber>
-      <FileNumber>78</FileNumber>
+      <FileNumber>80</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1369,7 +1393,7 @@
     </File>
     <File>
       <GroupNumber>9</GroupNumber>
-      <FileNumber>79</FileNumber>
+      <FileNumber>81</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1381,7 +1405,7 @@
     </File>
     <File>
       <GroupNumber>9</GroupNumber>
-      <FileNumber>80</FileNumber>
+      <FileNumber>82</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1393,7 +1417,7 @@
     </File>
     <File>
       <GroupNumber>9</GroupNumber>
-      <FileNumber>81</FileNumber>
+      <FileNumber>83</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1405,7 +1429,7 @@
     </File>
     <File>
       <GroupNumber>9</GroupNumber>
-      <FileNumber>82</FileNumber>
+      <FileNumber>84</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1417,7 +1441,7 @@
     </File>
     <File>
       <GroupNumber>9</GroupNumber>
-      <FileNumber>83</FileNumber>
+      <FileNumber>85</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1437,7 +1461,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>84</FileNumber>
+      <FileNumber>86</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1449,7 +1473,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>85</FileNumber>
+      <FileNumber>87</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1461,7 +1485,7 @@
     </File>
     <File>
       <GroupNumber>10</GroupNumber>
-      <FileNumber>86</FileNumber>
+      <FileNumber>88</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1481,7 +1505,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>87</FileNumber>
+      <FileNumber>89</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1493,7 +1517,7 @@
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>88</FileNumber>
+      <FileNumber>90</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1505,7 +1529,7 @@
     </File>
     <File>
       <GroupNumber>11</GroupNumber>
-      <FileNumber>89</FileNumber>
+      <FileNumber>91</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1525,7 +1549,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>12</GroupNumber>
-      <FileNumber>90</FileNumber>
+      <FileNumber>92</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1545,7 +1569,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>13</GroupNumber>
-      <FileNumber>91</FileNumber>
+      <FileNumber>93</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -1557,7 +1581,7 @@
     </File>
     <File>
       <GroupNumber>13</GroupNumber>
-      <FileNumber>92</FileNumber>
+      <FileNumber>94</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>

app/app.uvprojx

@@ -473,6 +473,11 @@
               <FileType>1</FileType>
               <FilePath>.\src\one_conduction\zeeprom_fs.c</FilePath>
             </File>
+            <File>
+              <FileName>heart_wave_sample_service.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\src\one_conduction\heart_wave_sample_service.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -1734,6 +1739,11 @@
               <FileType>1</FileType>
               <FilePath>..\sdk\modules\nrfx\drivers\src\nrfx_rtc.c</FilePath>
             </File>
+            <File>
+              <FileName>nrfx_timer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\sdk\modules\nrfx\drivers\src\nrfx_timer.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -4287,6 +4297,11 @@
               <FileType>1</FileType>
               <FilePath>.\src\one_conduction\zeeprom_fs.c</FilePath>
             </File>
+            <File>
+              <FileName>heart_wave_sample_service.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>.\src\one_conduction\heart_wave_sample_service.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -5548,6 +5563,11 @@
               <FileType>1</FileType>
               <FilePath>..\sdk\modules\nrfx\drivers\src\nrfx_rtc.c</FilePath>
             </File>
+            <File>
+              <FileName>nrfx_timer.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\sdk\modules\nrfx\drivers\src\nrfx_timer.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>

app/config/sdk_config.h

@@ -3979,13 +3979,13 @@
 // <e> NRFX_TIMER_ENABLED - nrfx_timer - TIMER periperal driver
 //==========================================================
 #ifndef NRFX_TIMER_ENABLED
-#define NRFX_TIMER_ENABLED 0
+#define NRFX_TIMER_ENABLED 1
 #endif
 // <q> NRFX_TIMER0_ENABLED  - Enable TIMER0 instance
  
 
 #ifndef NRFX_TIMER0_ENABLED
-#define NRFX_TIMER0_ENABLED 0
+#define NRFX_TIMER0_ENABLED 1
 #endif
 
 // <q> NRFX_TIMER1_ENABLED  - Enable TIMER1 instance
@@ -5698,7 +5698,7 @@
 // <e> TIMER_ENABLED - nrf_drv_timer - TIMER periperal driver - legacy layer
 //==========================================================
 #ifndef TIMER_ENABLED
-#define TIMER_ENABLED 0
+#define TIMER_ENABLED 1
 #endif
 // <o> TIMER_DEFAULT_CONFIG_FREQUENCY  - Timer frequency if in Timer mode
  
@@ -5758,14 +5758,14 @@
  
 
 #ifndef TIMER0_ENABLED
-#define TIMER0_ENABLED 0
+#define TIMER0_ENABLED 1
 #endif
 
 // <q> TIMER1_ENABLED  - Enable TIMER1 instance
  
 
 #ifndef TIMER1_ENABLED
-#define TIMER1_ENABLED 0
+#define TIMER1_ENABLED 1
 #endif
 
 // <q> TIMER2_ENABLED  - Enable TIMER2 instance

app/src/one_conduction/app_event.h

@@ -0,0 +1,25 @@
+#pragma once
+#include <stdint.h>
+
+typedef enum {
+  kplod_connected_event = 0,  // 导联连接事件
+  kplod_disconnected_event,   // 导联断开事件
+  kplod_connecting_event,     // 导联连接中事件
+
+  kplod_start_charge_event,  // 充电事件
+  kplod_charging_event,      // 充电中
+  kplod_end_charge_event,    // 充电结束事件
+
+  kevent_tmr_scheduler_event,  // 定时器调度事件
+  kevent_capture_data_event,   // 采样数据回调
+} app_event_type_t;
+
+typedef struct {
+  app_event_type_t eventType;
+  union {
+    uint32_t plod_connected_accumulation_time;  // 导联连接累计时间
+    uint8_t* capture_data_cache;                // 实时采样数据，数据长度为256字节
+  } val;
+} app_event_t;
+
+void app_event_process_cb(void* p_event_data, uint16_t event_size);

app/src/one_conduction/display_manager.c

@@ -8,6 +8,7 @@
 #include "basic/ssd1306/driver_ssd1306_basic.h"
 #include "basic/ssd1306/wave_drawer.h"
 #include "font.h"
+#include "heart_wave_sample_service.h"
 #include "one_conduction_board.h"
 PageState_t g_pageState;
 
@@ -269,6 +270,9 @@ typedef struct {
   int heartrate_x;
   int heartrate_y;
 
+  bool in30spage;
+  bool hasover30s;
+
 } sample_page_state_t;
 sample_page_state_t m_sample_page_state;
 
@@ -280,13 +284,15 @@ void dsp_mgr_change_to_sampling() {  //
   sps->wave_drawser_hight = 40;
   sps->wave_drawser_width = 120;
 
-  sps->progress_x     = SMAPLE_PAGE_START_X+1;
+  sps->progress_x     = SMAPLE_PAGE_START_X + 1;
   sps->progress_y     = SMAPLE_PAGE_START_Y + sps->wave_drawser_hight + 3 + 4;
   sps->progress_width = 80;
   sps->progress_hight = 8;
 
   sps->heartrate_x = sps->progress_x + sps->progress_width + 2;
   sps->heartrate_y = sps->progress_y - 4;
+  sps->in30spage   = false;
+  sps->hasover30s  = false;
 
   ssd1306_basic_clear_gram();
 
@@ -301,19 +307,60 @@ void dsp_mgr_change_to_sampling() {  //
   dsp_mgr_change_to_page(kPage_sampling);
 }
 
+void samplePage_set_in30s_page() {
+  /**
+   * @brief
+   *  不足30秒[X]
+   */
+  ssd1306_basic_clear();
+  uint8_t x = 20;
+  uint8_t y = 32 - font24x24_zh_lib.heightPixel / 2;  // 12*4 +12
+  uint8_t xchange, ychange;
+
+  // ssd1306_basic_draw_str(&x, &y, "123", &fontclocklib);
+
+  ssd1306_basic_draw_str(x, y, &xchange, &ychange, "不足", &font24x24_zh_lib);
+  x = x + xchange;
+  ssd1306_basic_draw_str(x, y, &xchange, &ychange, "30", &font12x24_asiic_lib);
+  x = x + xchange;
+  ssd1306_basic_draw_str(x, y, &xchange, &ychange, "秒", &font24x24_zh_lib);
+  x = x + xchange;
+
+  ssd1306_basic_gram_update();
+  dsp_mgr_change_to_page(kPage_samplingError);
+}
+
 void samplePage_update_state(int progress_s, int wave_y, int heartrate) {  //
+
   sample_page_state_t* sps = &m_sample_page_state;
   uint8_t              xchange, ychange;
 
-  // 25 <=> 30
-  int progress = progress_s / 30.0 * 25;
-  wave_drawer_draw_next_point(&sps->wave_drawer, wave_y);
-  ssd1306_basic_draw_progress(sps->progress_x, sps->progress_y, sps->progress_width, sps->progress_hight, 25, progress);
-  if (heartrate <= 0) {
-    ssd1306_basic_draw_str(sps->heartrate_x, sps->heartrate_y, &xchange, &ychange, "<>--", &font_asicc16x8_lib);
+  if (!sps->in30spage) {
+    if (!sps->hasover30s && progress_s > 30) {
+      // 切换到30s页面
+
+    } else {
+      // 25 <=> 30
+      int progress = progress_s / 30.0 * 25;
+      wave_drawer_draw_next_point(&sps->wave_drawer, wave_y);
+      ssd1306_basic_draw_progress(sps->progress_x, sps->progress_y, sps->progress_width, sps->progress_hight, 25, progress);
+      if (heartrate <= 0) {
+        ssd1306_basic_draw_str(sps->heartrate_x, sps->heartrate_y, &xchange, &ychange, "<>--", &font_asicc16x8_lib);
+      }
+      ssd1306_basic_gram_update();
+    }
+  } else {
   }
 }
 
+void samplePage_schedule() {
+  int capturetime = hwss_has_captured_time_ms();
+  int wave_y      = (int)hwss_read_val();
+  int heartrate   = (int)hwss_read_heart_rate();
+  // ZLOGI("samplePage_schedule %d %d %d", capturetime, wave_y, heartrate);
+  samplePage_update_state(capturetime / 1000, wave_y, heartrate);
+}
+
 /*******************************************************************************
  *                                  SCHEDULE                                   *
  *******************************************************************************/
@@ -326,6 +373,10 @@ static void dsp_mgr_schedule_tmr_cb(void* p_context) {  //
     welcomePage_schedule();
   } else if (g_pageState.page == kPage_main) {
     mainPage_schedule();
+  } else if (g_pageState.page == kPage_preparePage) {
+    PreparePage_schedule();
+  } else if (g_pageState.page == kPage_sampling) {
+    samplePage_schedule();
   }
 }
 
@@ -335,7 +386,7 @@ void dsp_mgr_init(void) {
   if (!timer_inited) {
     ZERROR_CHECK(app_timer_create(&m_dsp_mgr_schedule_tmr, APP_TIMER_MODE_REPEATED, dsp_mgr_schedule_tmr_cb));
   }
-  ZERROR_CHECK(app_timer_start(m_dsp_mgr_schedule_tmr, APP_TIMER_TICKS(101), NULL));
+  ZERROR_CHECK(app_timer_start(m_dsp_mgr_schedule_tmr, APP_TIMER_TICKS(30), NULL));
   timer_inited = true;
 }
 void dsp_mgr_uninit(void) {

app/src/one_conduction/heart_wave_sample_service.c

@@ -0,0 +1,97 @@
+#include "heart_wave_sample_service.h"
+
+#include "app_event.h"
+#include "nrfx_timer.h"
+#include "one_conduction_board.h"
+
+static const nrfx_timer_t m_timer         = NRFX_TIMER_INSTANCE(1); /**< Timer used for channel sweeps and tx with duty cycle. */
+static bool               m_timer_started = false;                  /**< True if timer is running. */
+
+static uint16_t m_capture_buffer_a[128];
+static uint16_t m_capture_buffer_b[128];
+
+static uint16_t* m_capture_buffer;
+static uint16_t  m_capture_buffer_index = 0;
+
+volatile static float m_real_time_data = 0;  // 0->100
+static uint32_t       m_start_capture_tp;
+
+static void swap_buffer() {
+  if (m_capture_buffer == NULL) {
+    m_capture_buffer       = m_capture_buffer_a;
+    m_capture_buffer_index = 0;
+    return;
+  }
+
+  if (m_capture_buffer == m_capture_buffer_a) {
+    m_capture_buffer = m_capture_buffer_b;
+  } else {
+    m_capture_buffer = m_capture_buffer_a;
+  }
+  m_capture_buffer_index = 0;
+  return;
+}
+
+void nrfx_timer_event_handler(nrf_timer_event_t event_type, void* p_context) {  //
+  uint16_t val = SingleLeadECG_battery_get_adc_val();                           // 12bit
+
+  m_real_time_data = (float)val / 4096.0f * 100;
+
+  if (m_capture_buffer == NULL) {
+    swap_buffer();
+  }
+
+  if (m_capture_buffer_index < 128) {
+    m_capture_buffer[m_capture_buffer_index++] = val;
+  }
+
+  if (m_capture_buffer_index == 128) {
+    app_event_t evt;
+    evt.eventType              = kevent_capture_data_event;
+    evt.val.capture_data_cache = (uint8_t*)m_capture_buffer;
+    swap_buffer();
+    app_sched_event_put(&evt, sizeof(evt), app_event_process_cb);
+  }
+}
+
+void hwss_init(void) {
+  if (m_timer_started) {
+    return;
+  }
+  /**
+   * @brief ³õʼ»¯¶¨Ê±Æ÷
+   */
+  nrfx_err_t          err;
+  nrfx_timer_config_t timer_cfg = {
+      .frequency          = NRF_TIMER_FREQ_125kHz,
+      .mode               = NRF_TIMER_MODE_TIMER,
+      .bit_width          = NRF_TIMER_BIT_WIDTH_24,
+      .p_context          = NULL,
+      .interrupt_priority = NRFX_TIMER_DEFAULT_CONFIG_IRQ_PRIORITY,
+  };
+
+  err = nrfx_timer_init(&m_timer, &timer_cfg, nrfx_timer_event_handler);
+  if (err != NRFX_SUCCESS) {
+    NRF_LOG_ERROR("nrfx_timer_init failed with: %d\n", err);
+  }
+  uint32_t timer_ticks = nrfx_timer_ms_to_ticks(&m_timer, 5);  // 200HZ
+  nrfx_timer_extended_compare(&m_timer, NRF_TIMER_CC_CHANNEL0, timer_ticks, NRF_TIMER_SHORT_COMPARE0_CLEAR_MASK, true);
+  m_timer_started = true;
+}
+void hwss_uninit(void) { nrfx_timer_disable(&m_timer); }
+
+void hwss_start_capture(void) {
+  m_start_capture_tp = znordic_getpower_on_s();
+  nrfx_timer_enable(&m_timer);
+}
+void hwss_stop_capture(void) { nrfx_timer_disable(&m_timer); }
+
+float hwss_read_val(void) {
+  __disable_irq();
+  float val = m_real_time_data;
+  __enable_irq();
+  return val;
+}
+float hwss_read_heart_rate(void) { return 0; }
+
+int hwss_has_captured_time_ms() { return (znordic_getpower_on_s() - m_start_capture_tp) * 1000; }

app/src/one_conduction/heart_wave_sample_service.h

@@ -0,0 +1,15 @@
+#pragma once
+#include "one_conduction_board.h"
+
+// 每256个字节触发一次回调
+typedef void (*heart_wave_sample_service_callback_t)(uint16_t *p_data, uint16_t length);
+
+void hwss_init(void);
+void hwss_uninit(void);
+
+void hwss_start_capture(void);
+void hwss_stop_capture(void);
+
+float hwss_read_val(void);
+float hwss_read_heart_rate(void);
+int   hwss_has_captured_time_ms();

app/src/one_conduction/one_conduction_board.c

@@ -228,6 +228,7 @@ void SingleLeadECG_battery_deinit() { nrfx_saadc_channel_uninit(BATTERY_ADC_CHAN
 
 int16_t SingleLeadECG_battery_get_adc_val() {
   int16_t val = znrf_adc_channel_read_val(BATTERY_ADC_CHANNEL);
+  if (val < 0) val = 0;
   return val;
 }
 

app/src/one_conduction/one_conduction_main.c

@@ -1,25 +1,15 @@
 #include <math.h>
 
+#include "app_event.h"
 #include "basic/zble_module.h"
 #include "basic/zdatachannel_service.h"
 #include "display_manager.h"
+#include "heart_wave_sample_service.h"
 #include "one_conduction_board.h"
 #include "sample_data_manager.h"
 #include "znordic.h"
 
 typedef enum {
-  kplod_connected_event = 0,  // 导联连接事件
-  kplod_disconnected_event,   // 导联断开事件
-  kplod_connecting_event,     // 导联连接中事件
-
-  kplod_start_charge_event,  // 充电事件
-  kplod_charging_event,      // 充电中
-  kplod_end_charge_event,    // 充电结束事件
-
-  kevent_tmr_scheduler_event,  // 定时器调度事件
-} app_event_type_t;
-
-typedef enum {
   // 待机
   kdevice_state_standby = 0,
   // 开机
@@ -69,13 +59,6 @@ static const char* device_state_to_str(device_state_t ds) {
   }
 }
 
-typedef struct {
-  app_event_type_t eventType;
-  union {
-    uint32_t plod_connected_accumulation_time;  // 导联连接累计时间
-  } val;
-} app_event_t;
-
 /*******************************************************************************
  *                                   GLOBAL                                    *
  *******************************************************************************/
@@ -95,7 +78,6 @@ static uint32_t       m_change_to_cur_state_tp = 0;                      //
  *******************************************************************************/
 
 // 业务事件处理函数
-static void app_event_process_cb(void* p_event_data, uint16_t event_size);
 
 /*******************************************************************************
  *                                 事件生成器                                  *
@@ -106,7 +88,9 @@ static uint32_t m_plod_state_disconnect_timepoint = 0;
 static uint32_t m_plod_state_connect_timepoint    = 0;
 static bool     m_plod_state_connected_state      = false;
 static uint32_t plod_state_has_disconnected_ms() { return znordic_haspassed_ms(m_plod_state_disconnect_timepoint); }
-static bool     plod_state_is_connected() {}
+static bool     plod_state_is_connected() {
+	return m_plod_state_connected_state;
+}
 static void     m_plod_state_event_detect_tmr_cb(void* p_context) {  //
   static uint32_t    connecte_state_trigger_cnt          = 0;
   static uint32_t    connecte_state_trigger_cnt_last_val = 0;
@@ -186,15 +170,17 @@ static void     power_on() {
   SingleLeadECG_led_init();
   SingleLeadECG_ecg_init();
   SingleLeadECG_battery_init();
-
+  hwss_init();
   sample_data_mgr_init();
   dsp_mgr_init();
+
   m_poweronflag = true;
-  ZERROR_CHECK(app_timer_start(m_state_machine_driver_tmr, APP_TIMER_TICKS(5), NULL));  // 200HZ采样
+  ZERROR_CHECK(app_timer_start(m_state_machine_driver_tmr, APP_TIMER_TICKS(100), NULL));  // 200HZ采样
 }
 static void power_off() {
   dsp_mgr_uninit();
   sample_data_mgr_uninit();
+  hwss_uninit();
 
   SingleLeadECG_battery_deinit();
   SingleLeadECG_ecg_deinit();
@@ -248,8 +234,7 @@ static void state_machine__change_to_home_state() {
   state_machine_change_to_state(kdevice_state_home);
   dsp_mgr_change_to_main();
 }
-
-static void app_event_process_cb(void* p_event_data, uint16_t event_size) {
+void app_event_process_cb(void* p_event_data, uint16_t event_size) {
   if (!p_event_data) return;
   app_event_t* p_event = (app_event_t*)p_event_data;
 
@@ -307,8 +292,15 @@ static void app_event_process_cb(void* p_event_data, uint16_t event_size) {
        *                                 页面加载中                                  *
        *******************************************************************************/
       if (cur_state_haspassed_ms() >= (500 * 5)) {
+        /**
+         * @brief
+         *  1. 启动采样定时器
+         *  2. 切换状态
+         *  3. 切换页面
+         */
         state_machine_change_to_state(kdevice_state_sampling);
         dsp_mgr_change_to_sampling();
+        hwss_start_capture();
       } else if (cur_state_haspassed_ms() >= (500 * 4)) {
         if (dsp_mgr_preparePage_get_progress() != 4) {
           dsp_mgr_preparePage_set_progress(4);
@@ -394,6 +386,7 @@ void one_conduction_main() {
           .on_service_init = on_service_init,
       };
   zble_module_init(&cfg);
+  hwss_init();
 
 #if 1
   SingleLeadECG_ecg_io_init();
@@ -405,6 +398,7 @@ void one_conduction_main() {
   ZERROR_CHECK(app_timer_start(m_plod_state_event_detect_tmr, APP_TIMER_TICKS(100), NULL));
   ZERROR_CHECK(app_timer_start(m_charge_event_detect_tmr, APP_TIMER_TICKS(100), NULL));
 #endif
+
   // ZERROR_CHECK();
   while (true) {
     app_sched_execute();