Переглянути джерело

使用2.5G通道的DAC定义;

WangCJ 2 місяців тому
батько
коміт
810b3696f5

+ 1 - 1
ConsoleApp2/ConsoleApp2/obj/Debug/net6.0/ConsoleApp2.AssemblyInfo.cs

@@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("ConsoleApp2")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+3e83dc4d1242c00f4127dd3c95fdc054cd389f4a")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5e4a549e928bd7c2863236c8114eaa7f7c8dbc88")]
 [assembly: System.Reflection.AssemblyProductAttribute("ConsoleApp2")]
 [assembly: System.Reflection.AssemblyTitleAttribute("ConsoleApp2")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

+ 1 - 1
ConsoleApp2/ConsoleApp2/obj/Debug/net6.0/ConsoleApp2.AssemblyInfoInputs.cache

@@ -1 +1 @@
-6d68f602b04d6c2a331dbb1707292452e61d87ca21a860fc770844a6b2e18fe9
+1e43fba57669208a695b58b8d6ce6ea2916df00fe5a14330d5030f1c3b5e354b

+ 4 - 9
HARDWARE/AnalogChannelCtrl/AnalogChannelCtrl_8g.c

@@ -2,11 +2,6 @@
 #include "delay.h"
 #include <stdio.h>
 
-//DAC序号定义,根据A0,A1的状态来定义
-#define	DAC0_8G  0//A0=0,A1=0
-#define	DAC1_8G  1//A0=1,A1=0
-#define	DAC2_8G  2//A0=0,A1=1
-
 //DAC输出Port的定义
 #define	DAC_VOUT0 0 
 #define	DAC_VOUT1 1 
@@ -20,10 +15,10 @@
 u8 DacPortInfoTable[4][4][2] = 
 {
     //          FGN                 FGP                     FDN                     FDP
-    { {DAC0_8G, DAC_VOUT0},  {DAC2_8G, DAC_VOUT0},  {DAC0_8G, DAC_VOUT2},  {DAC0_8G, DAC_VOUT1}}, // ch1
-    { {DAC0_8G, DAC_VOUT7},  {DAC2_8G, DAC_VOUT1},  {DAC0_8G, DAC_VOUT5},  {DAC0_8G, DAC_VOUT6}}, // ch2
-    { {DAC1_8G, DAC_VOUT0},  {DAC2_8G, DAC_VOUT2},  {DAC1_8G, DAC_VOUT2},  {DAC1_8G, DAC_VOUT1}}, // ch3
-    { {DAC1_8G, DAC_VOUT7},  {DAC2_8G, DAC_VOUT3},  {DAC1_8G, DAC_VOUT5},  {DAC1_8G, DAC_VOUT6}}, // ch4
+    { {DAC1, DAC_VOUT0},  {DAC3, DAC_VOUT0},  {DAC1, DAC_VOUT2},  {DAC1, DAC_VOUT1}}, // ch1
+    { {DAC1, DAC_VOUT7},  {DAC3, DAC_VOUT1},  {DAC1, DAC_VOUT5},  {DAC1, DAC_VOUT6}}, // ch2
+    { {DAC2, DAC_VOUT0},  {DAC3, DAC_VOUT2},  {DAC2, DAC_VOUT2},  {DAC2, DAC_VOUT1}}, // ch3
+    { {DAC2, DAC_VOUT7},  {DAC3, DAC_VOUT3},  {DAC2, DAC_VOUT5},  {DAC2, DAC_VOUT6}}, // ch4
 };
 
 u32 GetDACConfigWord_8G(ParamsDAC_8G params,u8* dacIndex)

+ 17 - 17
OBJ/AnalogChannel_JiHeMSO8000_test.hex

@@ -1135,7 +1135,7 @@
 :1046D0008DF8060001208DF8070001A8FEF7B6FE50
 :1046E000FFF790FC08B010BD000802400014014024
 :1046F0004FF04070E1EE100A704700001C470008C0
-:1047000000000020CC020000C40100089C48000802
+:1047000000000020CC020000C4010008A0480008FE
 :10471000CC020020647D00002002000811121E80DF
 :1047200018013230323430373038313134373030AC
 :104730007A68616F796F6E670011104A6948654D3C
@@ -1145,21 +1145,21 @@
 :1047700012081B080603180A0108060208060308A7
 :1047800008091010070806060806050806040A08A6
 :10479000020A071E0A07010A07092014030A080370
-:1047A0000A07070C07060C07050C07040C484024F1
-:1047B0000301052A02031201140702011205130660
-:1047C000011D02020102761B07021E3B01068B2C13
-:1047D00002030404195D92091808323032322D3078
-:1047E00031033D2030303A031946211B250C97191F
-:1047F000091957112A4D0C3132034B390D0C320473
-:104800004B2D0E24197E111A650C29E4296A2A9D64
-:104810000C3132075AE12432154B110F1832201A8D
-:104820006F0C4132215A870C32225A890C32234BA9
-:104830003D103032291A910C4132302AF50C1919E9
-:1048400032314B69110C32322A810C3132331A99D0
-:104850000C299032344B0912482A4054590C3241E9
-:104860005ABD0C32424B45130C32435ADD0C2A48D8
-:10487000184A140C32505A790C2AC1B84A156C32B5
-:10488000E05A350C32E15A4D0C32E31A550C2930FE
-:0C48900032E44B31161801101AFF0181B0
+:1047A0000A07070C07060C07050C07040C48401500
+:1047B0000301050112031B0102661C0703010E130E
+:1047C00006021B030201380A010207030302050265
+:1047D000068B2C02030404195D920918083230324A
+:1047E000322D3031033D2030303A031129AB1B25E7
+:1047F0000C97190932022A4D0C3132034B390D0C3A
+:1048000032044B2D0E2432051A650C29E4296A2A3C
+:104810009D0C3132075AE12432154B110F1832200A
+:104820001A6F0C4132215A870C32225A890C3223DA
+:104830004B3D103032291A910C4132302AF50C19B7
+:104840001932314B69110C32322A810C3132331A50
+:10485000990C299032344B0912482A4054590C3291
+:10486000415ABD0C32424B45130C32435ADD0C2ADF
+:1048700048184A140C32505A790C2AC1B84A156C9F
+:1048800032E05A350C32E15A4D0C32E31A550C29FC
+:104890003032E44B31161801101AFF01810000007C
 :040000050800018965
 :00000001FF

Різницю між файлами не показано, бо вона завелика
+ 5 - 5
ProjectFiles/AnalogChannelJiHeMSO8000_test.uvguix.Lenovo


+ 10 - 0
ProjectFiles/AnalogChannelJiHeMSO8000_test.uvoptx

@@ -210,6 +210,16 @@
           <WinNumber>1</WinNumber>
           <ItemText>spiLines-&gt;csLine</ItemText>
         </Ww>
+        <Ww>
+          <count>2</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>*dacIndex</ItemText>
+        </Ww>
+        <Ww>
+          <count>3</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>ConfigWord</ItemText>
+        </Ww>
       </WatchWindow1>
       <WatchWindow2>
         <Ww>

Деякі файли не було показано, через те що забагато файлів було змінено