Skip to content

Commit

Permalink
fix merge issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlkaMotors
AlkaMotors committed Mar 8, 2024
1 parent a4f64a1 commit e9fc66b
Show file tree
Hide file tree
Showing 13 changed files with 638 additions and 685 deletions.
4 changes: 1 addition & 3 deletions Inc/targets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -469,10 +469,9 @@
#define USE_SERIAL_TELEMETRY
#endif

<<<<<<< Updated upstream

/*****************************************************AT32F415 targets
* ************************************************/
=======

#ifdef AM60_V2_F421
#define FIRMWARE_NAME "F421 Am60 "
Expand All @@ -486,7 +485,6 @@


/*****************************************************AT32F415 targets ************************************************/
>>>>>>> Stashed changes

#ifdef PB450_F051
#define FILE_NAME "PB450_F051"
Expand Down
40 changes: 20 additions & 20 deletions Keil_Projects/AM32_MultiProject.uvmpw.uvgui.alkaz
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions Keil_Projects/Am32F031.uvguix.alkaz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
<TableColWidths>202 100</TableColWidths>
<TableColWidths>211 212</TableColWidths>
</View>
<View>
<WinId>346</WinId>
<ViewName>Code Coverage</ViewName>
<TableColWidths>669 564</TableColWidths>
<TableColWidths>669 160</TableColWidths>
</View>
<View>
<WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName>
<TableColWidths>885 124 124 100</TableColWidths>
<TableColWidths>829</TableColWidths>
</View>
</SECTreeCtrl>

Expand Down Expand Up @@ -93,8 +93,8 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
<xPos>-32000</xPos>
<yPos>-32000</yPos>
<xPos>-1</xPos>
<yPos>-1</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
Expand Down
10 changes: 5 additions & 5 deletions Keil_Projects/Am32F051.uvguix.alkaz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
<TableColWidths>202 100</TableColWidths>
<TableColWidths>211 212</TableColWidths>
</View>
<View>
<WinId>346</WinId>
<ViewName>Code Coverage</ViewName>
<TableColWidths>669 564</TableColWidths>
<TableColWidths>669 160</TableColWidths>
</View>
<View>
<WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName>
<TableColWidths>885 124 124 100</TableColWidths>
<TableColWidths>829</TableColWidths>
</View>
</SECTreeCtrl>

Expand Down Expand Up @@ -93,8 +93,8 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
<xPos>-32000</xPos>
<yPos>-32000</yPos>
<xPos>-1</xPos>
<yPos>-1</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
Expand Down
10 changes: 5 additions & 5 deletions Keil_Projects/Am32F415.uvguix.alkaz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,17 +154,17 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
<TableColWidths>202 100</TableColWidths>
<TableColWidths>211 212</TableColWidths>
</View>
<View>
<WinId>346</WinId>
<ViewName>Code Coverage</ViewName>
<TableColWidths>669 564</TableColWidths>
<TableColWidths>669 160</TableColWidths>
</View>
<View>
<WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName>
<TableColWidths>885 124 124 100</TableColWidths>
<TableColWidths>829</TableColWidths>
</View>
</SECTreeCtrl>

Expand Down Expand Up @@ -232,8 +232,8 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
<xPos>-32000</xPos>
<yPos>-32000</yPos>
<xPos>-1</xPos>
<yPos>-1</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
Expand Down
12 changes: 6 additions & 6 deletions Keil_Projects/Am32F421.uvguix.alkaz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
<TableColWidths>202 202</TableColWidths>
<TableColWidths>211 212</TableColWidths>
</View>
<View>
<WinId>346</WinId>
Expand Down Expand Up @@ -634,8 +634,8 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
<xPos>-32000</xPos>
<yPos>-32000</yPos>
<xPos>-1</xPos>
<yPos>-1</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
Expand All @@ -651,8 +651,8 @@
<MDIClientArea>
<RegID>0</RegID>
<MDITabState>
<Len>261</Len>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000100000000000000010000003E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000A2010000700000008007000059020000</Data>
<Len>1512</Len>
<Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D00000008000000010000006D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C447269766572735C53544D3332473078785F48414C5F4472697665725C5372635C73746D3332673078785F6C6C5F7263632E63000000001273746D3332673078785F6C6C5F7263632E6300000000C5D4F200FFFFFFFF42433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C494F2E630000000004494F2E6300000000FFDC7800FFFFFFFF3D433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C7369676E616C2E6300000000087369676E616C2E6300000000BECEA100FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000F0A0A100FFFFFFFF5C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C447269766572735C647269766572735C7372635C61743332663432315F746D722E63000000000E61743332663432315F746D722E6300000000BCA8E100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E63000000009CC1B600FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000F7B88600FFFFFFFF46433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C5753323831322E6300000000085753323831322E6300000000D9ADC200FFFFFFFF3B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E6300000000A5C2D700FFFFFFFF4A433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C636F6D70617261746F722E63000000000C636F6D70617261746F722E6300000000B3A6BE00FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C61743332663432315F69742E63000000000D61743332663432315F69742E6300000000EAD6A300FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663432315C5372635C4144432E6300000000054144432E6300000000F6FA7D00FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C6D63755C663432315C496E635C7065726970686572616C732E68000000000D7065726970686572616C732E6800000000B5E99D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000DA020000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
Expand Down Expand Up @@ -4146,7 +4146,7 @@
<Size>100</Size>
<ActiveTab>0</ActiveTab>
<Doc>
<Name>..\Inc\targets.h</Name>
<Name>&lt;1&gt;..\Inc\targets.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>1986</TopLine>
<CurrentLine>1</CurrentLine>
Expand Down
6 changes: 3 additions & 3 deletions Keil_Projects/Am32F421.uvoptx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3045,9 +3045,9 @@
<LExpSel>0</LExpSel>
</OPTXL>
<OPTFL>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget>
<IsCurrentTarget>1</IsCurrentTarget>
</OPTFL>
<CpuCode>255</CpuCode>
<DebugOpt>
Expand Down Expand Up @@ -4267,7 +4267,7 @@
<OPTFL>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>255</CpuCode>
<DebugOpt>
Expand Down
10 changes: 5 additions & 5 deletions Keil_Projects/Am32G071.uvguix.alkaz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
<TableColWidths>202 100</TableColWidths>
<TableColWidths>211 212</TableColWidths>
</View>
<View>
<WinId>346</WinId>
<ViewName>Code Coverage</ViewName>
<TableColWidths>669 564</TableColWidths>
<TableColWidths>669 160</TableColWidths>
</View>
<View>
<WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName>
<TableColWidths>885 124 124 100</TableColWidths>
<TableColWidths>829</TableColWidths>
</View>
</SECTreeCtrl>

Expand Down Expand Up @@ -142,8 +142,8 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
<xPos>-32000</xPos>
<yPos>-32000</yPos>
<xPos>-1</xPos>
<yPos>-1</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
Expand Down
10 changes: 5 additions & 5 deletions Keil_Projects/Am32G431.uvguix.alkaz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
<TableColWidths>202 100</TableColWidths>
<TableColWidths>211 212</TableColWidths>
</View>
<View>
<WinId>346</WinId>
<ViewName>Code Coverage</ViewName>
<TableColWidths>669 564</TableColWidths>
<TableColWidths>669 160</TableColWidths>
</View>
<View>
<WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName>
<TableColWidths>885 124 124 100</TableColWidths>
<TableColWidths>829</TableColWidths>
</View>
</SECTreeCtrl>

Expand Down Expand Up @@ -93,8 +93,8 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
<xPos>-32000</xPos>
<yPos>-32000</yPos>
<xPos>-1</xPos>
<yPos>-1</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
Expand Down
10 changes: 5 additions & 5 deletions Keil_Projects/Am32e230.uvguix.alkaz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,17 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
<TableColWidths>202 100</TableColWidths>
<TableColWidths>211 212</TableColWidths>
</View>
<View>
<WinId>346</WinId>
<ViewName>Code Coverage</ViewName>
<TableColWidths>669 564</TableColWidths>
<TableColWidths>669 160</TableColWidths>
</View>
<View>
<WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName>
<TableColWidths>885 124 124 100</TableColWidths>
<TableColWidths>829</TableColWidths>
</View>
</SECTreeCtrl>

Expand Down Expand Up @@ -154,8 +154,8 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
<xPos>-32000</xPos>
<yPos>-32000</yPos>
<xPos>-1</xPos>
<yPos>-1</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
Expand Down
Loading

0 comments on commit e9fc66b

Please sign in to comment.