Skip to content

Commit

Permalink
AMC_BLDC: Alignment with the latest changes on MBD (#250)
Browse files Browse the repository at this point in the history 
* AMC_BLDC: Update generated code with features to prepare for multi CAN packet + transmit STATUS message

* AMC_BLDC: Update MBDAgent glue code to work with new generated code

* AMC_BLDC: Cleanup MBDAgent + Remove can-raw2struct folder (no more used)

* AMC_BLDC: MDBAgent update pole_pairs during initialization and runtime

* AMC_BLDC: During the periodic tick function and FOC_inner_loop use the ConfigurationParameters model's output instead of the initialization paraemtere. Update the type of poles parameter in pwm.h optimizing memory usage.
  • Loading branch information
@sgiraz
sgiraz authored Feb 3, 2022
1 parent e3c2a10 commit 9031151
Show file tree
Hide file tree
Showing 58 changed files with 2,248 additions and 2,133 deletions.
179 changes: 53 additions & 126 deletions emBODY/eBcode/arch-arm/board/amcbldc/application06/proj/amcbldc-application06.uvoptx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,24 +158,7 @@
<Name></Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>879</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134385606</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>..\src\model-based-design\supervisor-rx\SupervisorFSM_RX.cpp</Filename>
<ExecCommand></ExecCommand>
<Expression>\\amcbldc\../src/model-based-design/supervisor-rx/SupervisorFSM_RX.cpp\879</Expression>
</Bp>
</Breakpoint>
<Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
Expand Down Expand Up @@ -1499,7 +1482,7 @@

<Group>
<GroupName>others::motorhal</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
Expand Down Expand Up @@ -1818,7 +1801,7 @@
</Group>

<Group>
<GroupName>mbd::can-raw2struct</GroupName>
<GroupName>mbd::supervisor-rx</GroupName>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
Expand All @@ -1830,70 +1813,14 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\src\model-based-design\can-raw2struct\can_rx_raw2struct.cpp</PathWithFileName>
<FilenameWithoutPath>can_rx_raw2struct.cpp</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>81</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\src\model-based-design\can-raw2struct\can_rx_raw2struct.h</PathWithFileName>
<FilenameWithoutPath>can_rx_raw2struct.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>82</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\src\model-based-design\can-raw2struct\can_rx_raw2struct_private.h</PathWithFileName>
<FilenameWithoutPath>can_rx_raw2struct_private.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>19</GroupNumber>
<FileNumber>83</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\src\model-based-design\can-raw2struct\can_rx_raw2struct_types.h</PathWithFileName>
<FilenameWithoutPath>can_rx_raw2struct_types.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>

<Group>
<GroupName>mbd::supervisor-rx</GroupName>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>20</GroupNumber>
<FileNumber>84</FileNumber>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\src\model-based-design\supervisor-rx\SupervisorFSM_RX.cpp</PathWithFileName>
<FilenameWithoutPath>SupervisorFSM_RX.cpp</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>20</GroupNumber>
<FileNumber>85</FileNumber>
<GroupNumber>19</GroupNumber>
<FileNumber>81</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1904,8 +1831,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>20</GroupNumber>
<FileNumber>86</FileNumber>
<GroupNumber>19</GroupNumber>
<FileNumber>82</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1916,8 +1843,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>20</GroupNumber>
<FileNumber>87</FileNumber>
<GroupNumber>19</GroupNumber>
<FileNumber>83</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1936,8 +1863,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>21</GroupNumber>
<FileNumber>88</FileNumber>
<GroupNumber>20</GroupNumber>
<FileNumber>84</FileNumber>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1948,8 +1875,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>21</GroupNumber>
<FileNumber>89</FileNumber>
<GroupNumber>20</GroupNumber>
<FileNumber>85</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1960,8 +1887,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>21</GroupNumber>
<FileNumber>90</FileNumber>
<GroupNumber>20</GroupNumber>
<FileNumber>86</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1972,8 +1899,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>21</GroupNumber>
<FileNumber>91</FileNumber>
<GroupNumber>20</GroupNumber>
<FileNumber>87</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -1992,8 +1919,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>22</GroupNumber>
<FileNumber>92</FileNumber>
<GroupNumber>21</GroupNumber>
<FileNumber>88</FileNumber>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2004,8 +1931,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>22</GroupNumber>
<FileNumber>93</FileNumber>
<GroupNumber>21</GroupNumber>
<FileNumber>89</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2016,8 +1943,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>22</GroupNumber>
<FileNumber>94</FileNumber>
<GroupNumber>21</GroupNumber>
<FileNumber>90</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2028,8 +1955,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>22</GroupNumber>
<FileNumber>95</FileNumber>
<GroupNumber>21</GroupNumber>
<FileNumber>91</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2048,8 +1975,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>23</GroupNumber>
<FileNumber>96</FileNumber>
<GroupNumber>22</GroupNumber>
<FileNumber>92</FileNumber>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2060,8 +1987,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>23</GroupNumber>
<FileNumber>97</FileNumber>
<GroupNumber>22</GroupNumber>
<FileNumber>93</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2072,8 +1999,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>23</GroupNumber>
<FileNumber>98</FileNumber>
<GroupNumber>22</GroupNumber>
<FileNumber>94</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2084,8 +2011,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>23</GroupNumber>
<FileNumber>99</FileNumber>
<GroupNumber>22</GroupNumber>
<FileNumber>95</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2096,8 +2023,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>23</GroupNumber>
<FileNumber>100</FileNumber>
<GroupNumber>22</GroupNumber>
<FileNumber>96</FileNumber>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2108,8 +2035,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>23</GroupNumber>
<FileNumber>101</FileNumber>
<GroupNumber>22</GroupNumber>
<FileNumber>97</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2128,8 +2055,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>24</GroupNumber>
<FileNumber>102</FileNumber>
<GroupNumber>23</GroupNumber>
<FileNumber>98</FileNumber>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2140,8 +2067,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>24</GroupNumber>
<FileNumber>103</FileNumber>
<GroupNumber>23</GroupNumber>
<FileNumber>99</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2152,8 +2079,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>24</GroupNumber>
<FileNumber>104</FileNumber>
<GroupNumber>23</GroupNumber>
<FileNumber>100</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2164,8 +2091,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>24</GroupNumber>
<FileNumber>105</FileNumber>
<GroupNumber>23</GroupNumber>
<FileNumber>101</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2184,8 +2111,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>25</GroupNumber>
<FileNumber>106</FileNumber>
<GroupNumber>24</GroupNumber>
<FileNumber>102</FileNumber>
<FileType>8</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2196,8 +2123,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>25</GroupNumber>
<FileNumber>107</FileNumber>
<GroupNumber>24</GroupNumber>
<FileNumber>103</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2208,8 +2135,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>25</GroupNumber>
<FileNumber>108</FileNumber>
<GroupNumber>24</GroupNumber>
<FileNumber>104</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand All @@ -2220,8 +2147,8 @@
<bShared>0</bShared>
</File>
<File>
<GroupNumber>25</GroupNumber>
<FileNumber>109</FileNumber>
<GroupNumber>24</GroupNumber>
<FileNumber>105</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
Expand Down
Loading

0 comments on commit 9031151

Please sign in to comment.