l431 add second comp

am32-firmware · Jul 24, 2024 · ed44082 · ed44082
1 parent eef9cb4
commit ed44082
Show file tree

Hide file tree

Showing 111 changed files with 348 additions and 13,526 deletions.
diff --git a/Inc/targets.h b/Inc/targets.h
@@ -49,6 +49,15 @@
 #define USE_SERIAL_TELEMETRY
 #endif
 
+#ifdef  REF_L431
+#define FILE_NAME				"REF_L431"
+#define FIRMWARE_NAME           "L431 Neutron"
+#define DEAD_TIME               80
+#define HARDWARE_GROUP_L4_A
+#define TARGET_VOLTAGE_DIVIDER  260
+#define USE_SERIAL_TELEMETRY
+#endif
+
 #ifdef SEQURE_TEST_E230
 #define FIRMWARE_NAME "Sequre e2"
 #define FILE_NAME "SEQURE_TEST_E230"
@@ -2598,6 +2607,50 @@
 #define PHASE_C_COMP 0x400000D1 // pa5
 #endif
 
+#ifdef     HARDWARE_GROUP_L4_A
+
+#define    MCU_L431
+#define    USE_TIMER_15_CHANNEL_1
+#define    INPUT_PIN               LL_GPIO_PIN_2
+#define    INPUT_PIN_PORT              GPIOA
+#define    IC_TIMER_CHANNEL         LL_TIM_CHANNEL_CH1
+#define    IC_TIMER_REGISTER          TIM15
+#define    IC_TIMER_POINTER           htim15
+
+#define    INPUT_DMA_CHANNEL       LL_DMA_CHANNEL_5
+#define    DMA_HANDLE_TYPE_DEF     hdma_tim15_ch1
+#define    IC_DMA_IRQ_NAME         DMA1_Channel5_IRQn
+
+#define PHASE_A_GPIO_LOW          LL_GPIO_PIN_1
+#define PHASE_A_GPIO_PORT_LOW         GPIOB
+#define PHASE_A_GPIO_HIGH          LL_GPIO_PIN_10
+#define PHASE_A_GPIO_PORT_HIGH         GPIOA
+
+#define PHASE_B_GPIO_LOW          LL_GPIO_PIN_0
+#define PHASE_B_GPIO_PORT_LOW         GPIOB
+#define PHASE_B_GPIO_HIGH          LL_GPIO_PIN_9
+#define PHASE_B_GPIO_PORT_HIGH         GPIOA
+
+#define PHASE_C_GPIO_LOW          LL_GPIO_PIN_7
+#define PHASE_C_GPIO_PORT_LOW         GPIOA
+#define PHASE_C_GPIO_HIGH          LL_GPIO_PIN_8
+#define PHASE_C_GPIO_PORT_HIGH         GPIOA
+
+#define USE_COMP_1
+#define PHASE_A_COMP  LL_COMP_INPUT_MINUS_IO3  // pa0
+#define PHASE_B_COMP  LL_COMP_INPUT_MINUS_IO4  // pa4
+#define PHASE_C_COMP  LL_COMP_INPUT_MINUS_IO5  // pa5
+
+#define CURRENT_SENSE_ADC_PIN        LL_GPIO_PIN_3
+#define VOLTAGE_SENSE_ADC_PIN        LL_GPIO_PIN_6
+
+#define CURRENT_ADC_CHANNEL         LL_ADC_CHANNEL_8
+#define VOLTAGE_ADC_CHANNEL         LL_ADC_CHANNEL_11
+
+#endif
+
+
+
 #ifdef     HARDWARE_GROUP_L4_N
 
 #define    MCU_L431
@@ -2627,9 +2680,10 @@
 #define PHASE_C_GPIO_HIGH          LL_GPIO_PIN_8
 #define PHASE_C_GPIO_PORT_HIGH         GPIOA
 
+#define USE_COMP_2
 #define PHASE_A_COMP  LL_COMP_INPUT_MINUS_IO2  // pb7
-#define PHASE_B_COMP  LL_COMP_INPUT_MINUS_IO5  // pa4
-#define PHASE_C_COMP  LL_COMP_INPUT_MINUS_IO4  // pa5
+#define PHASE_B_COMP  LL_COMP_INPUT_MINUS_IO5  // pa5
+#define PHASE_C_COMP  LL_COMP_INPUT_MINUS_IO4  // pa4
 
 #define CURRENT_SENSE_ADC_PIN        LL_GPIO_PIN_3
 #define VOLTAGE_SENSE_ADC_PIN        LL_GPIO_PIN_6

diff --git a/Keil_Projects/AM32_MultiProject.uvmpw b/Keil_Projects/AM32_MultiProject.uvmpw
@@ -5,7 +5,7 @@
 
   <Header>### uVision Project, (C) Keil Software</Header>
 
-  <WorkspaceName>E:\NextCloud\dev\am32\Keil_Projects\AM32_MultiProject.uvmpw</WorkspaceName>
+  <WorkspaceName>WorkSpace</WorkspaceName>
 
   <project>
     <PathAndName>.\Am32e230.uvprojx</PathAndName>
@@ -29,7 +29,6 @@
 
   <project>
     <PathAndName>.\Am32F421.uvprojx</PathAndName>
-    <NodeIsActive>1</NodeIsActive>
     <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
   </project>
 
@@ -47,6 +46,7 @@
 
   <project>
     <PathAndName>.\Am32l431.uvprojx</PathAndName>
+    <NodeIsExpanded>1</NodeIsExpanded>
     <NodeIsCheckedInBatchBuild>1</NodeIsCheckedInBatchBuild>
   </project>
 

diff --git a/Keil_Projects/AM32_MultiProject.uvmpw.uvgui.alkaz b/Keil_Projects/AM32_MultiProject.uvmpw.uvgui.alkaz
diff --git a/Keil_Projects/Am32F031.uvguix.alkaz b/Keil_Projects/Am32F031.uvguix.alkaz
@@ -93,8 +93,8 @@
       <flags>2</flags>
       <showCmd>3</showCmd>
       <MinPosition>
-        <xPos>-1</xPos>
-        <yPos>-1</yPos>
+        <xPos>-32000</xPos>
+        <yPos>-32000</yPos>
       </MinPosition>
       <MaxPosition>
         <xPos>-1</xPos>
@@ -110,8 +110,8 @@
     <MDIClientArea>
       <RegID>0</RegID>
       <MDITabState>
-        <Len>1274</Len>
-        <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000B000000020000000100000043433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C4144432E6300000000054144432E6300000000C5D4F200FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C4144432E6300000000054144432E6300000000FFDC7800FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000BECEA100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000F0A0A100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C496E635C7065726970686572616C732E68000000000D7065726970686572616C732E6800000000BCA8E100FFFFFFFF3B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E63000000009CC1B600FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C73797374656D5F73746D3332673478782E63000000001273797374656D5F73746D3332673478782E6300000000F7B88600FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C73746D3332673478785F69742E63000000000E73746D3332673478785F69742E6300000000D9ADC200FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C73746D3332673078785F69742E63000000000E73746D3332673078785F69742E6300000000A5C2D700FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C6C3433315C5372635C4144432E6300000000054144432E6300000000B3A6BE00FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000EAD6A300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000C8030000</Data>
+        <Len>1802</Len>
+        <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000010000000020000000100000043433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C4144432E6300000000054144432E6300000000C5D4F200FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C4144432E6300000000054144432E6300000000FFDC7800FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000BECEA100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000F0A0A100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C496E635C7065726970686572616C732E68000000000D7065726970686572616C732E6800000000BCA8E100FFFFFFFF3B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E63000000009CC1B600FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C73797374656D5F73746D3332673478782E63000000001273797374656D5F73746D3332673478782E6300000000F7B88600FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C73746D3332673478785F69742E63000000000E73746D3332673478785F69742E6300000000D9ADC200FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C73746D3332673078785F69742E63000000000E73746D3332673078785F69742E6300000000A5C2D700FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C6C3433315C5372635C4144432E6300000000054144432E6300000000B3A6BE00FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000EAD6A300FFFFFFFF4A433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663431355C5372635C636F6D70617261746F722E63000000000C636F6D70617261746F722E6300000000F6FA7D00FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663431355C5372635C61743332663431355F69742E63000000000D61743332663431355F69742E6300000000B5E99D00FFFFFFFF4A433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C6C3433315C5372635C636F6D70617261746F722E63000000000C636F6D70617261746F722E63000000005FC3CF00FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C6C3433315C5372635C73746D33326C3478785F69742E63000000000E73746D33326C3478785F69742E6300000000C1838300FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C6C3433315C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000CACAD500FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000C8030000</Data>
       </MDITabState>
     </MDIClientArea>
     <ViewEx>
@@ -3605,7 +3605,7 @@
       <Size>100</Size>
       <ActiveTab>1</ActiveTab>
       <Doc>
-        <Name>C:\Users\alkaz\OneDrive\Documents\AM32_MULTI_MCU\Inc\targets.h</Name>
+        <Name>&lt;1&gt;..\Inc\targets.h</Name>
         <ColumnNumber>19</ColumnNumber>
         <TopLine>648</TopLine>
         <CurrentLine>654</CurrentLine>

diff --git a/Keil_Projects/Am32F051.uvguix.alkaz b/Keil_Projects/Am32F051.uvguix.alkaz
@@ -93,8 +93,8 @@
       <flags>2</flags>
       <showCmd>3</showCmd>
       <MinPosition>
-        <xPos>-1</xPos>
-        <yPos>-1</yPos>
+        <xPos>-32000</xPos>
+        <yPos>-32000</yPos>
       </MinPosition>
       <MaxPosition>
         <xPos>-1</xPos>
@@ -110,8 +110,8 @@
     <MDIClientArea>
       <RegID>0</RegID>
       <MDITabState>
-        <Len>1274</Len>
-        <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000B000000020000000100000043433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C4144432E6300000000054144432E6300000000C5D4F200FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C4144432E6300000000054144432E6300000000FFDC7800FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000BECEA100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000F0A0A100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C496E635C7065726970686572616C732E68000000000D7065726970686572616C732E6800000000BCA8E100FFFFFFFF3B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E63000000009CC1B600FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C73797374656D5F73746D3332673478782E63000000001273797374656D5F73746D3332673478782E6300000000F7B88600FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C73746D3332673478785F69742E63000000000E73746D3332673478785F69742E6300000000D9ADC200FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C73746D3332673078785F69742E63000000000E73746D3332673078785F69742E6300000000A5C2D700FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C6C3433315C5372635C4144432E6300000000054144432E6300000000B3A6BE00FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000EAD6A300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000C8030000</Data>
+        <Len>1802</Len>
+        <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000010000000020000000100000043433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C4144432E6300000000054144432E6300000000C5D4F200FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C4144432E6300000000054144432E6300000000FFDC7800FFFFFFFF3E433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C496E635C746172676574732E680000000009746172676574732E6800000000BECEA100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000F0A0A100FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C496E635C7065726970686572616C732E68000000000D7065726970686572616C732E6800000000BCA8E100FFFFFFFF3B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C5372635C6D61696E2E6300000000066D61696E2E63000000009CC1B600FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C73797374656D5F73746D3332673478782E63000000001273797374656D5F73746D3332673478782E6300000000F7B88600FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C73746D3332673478785F69742E63000000000E73746D3332673478785F69742E6300000000D9ADC200FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673037315C5372635C73746D3332673078785F69742E63000000000E73746D3332673078785F69742E6300000000A5C2D700FFFFFFFF43433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C6C3433315C5372635C4144432E6300000000054144432E6300000000B3A6BE00FFFFFFFF50433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C673433315C5372635C73657269616C5F74656C656D657472792E63000000001273657269616C5F74656C656D657472792E6300000000EAD6A300FFFFFFFF4A433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663431355C5372635C636F6D70617261746F722E63000000000C636F6D70617261746F722E6300000000F6FA7D00FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C663431355C5372635C61743332663431355F69742E63000000000D61743332663431355F69742E6300000000B5E99D00FFFFFFFF4A433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C6C3433315C5372635C636F6D70617261746F722E63000000000C636F6D70617261746F722E63000000005FC3CF00FFFFFFFF4C433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C6C3433315C5372635C73746D33326C3478785F69742E63000000000E73746D33326C3478785F69742E6300000000C1838300FFFFFFFF4B433A5C55736572735C616C6B617A5C4F6E6544726976655C446F63756D656E74735C414D33325F4D554C54495F4D43555C4D63755C6C3433315C5372635C7065726970686572616C732E63000000000D7065726970686572616C732E6300000000CACAD500FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000B50100007000000080070000C8030000</Data>
       </MDITabState>
     </MDIClientArea>
     <ViewEx>