Browse Source

修改main.c

liuhao 3 years ago
parent
commit
92c24146db
4 changed files with 82 additions and 84 deletions
  1. 2 2
      Prj/OBJ/Template.hex
  2. 75 75
      Prj/USER/Template.uvguix.liuhao
  3. 1 6
      Prj/USER/Template.uvprojx
  4. 4 1
      Prj/USER/main.c

+ 2 - 2
Prj/OBJ/Template.hex

@@ -574,7 +574,7 @@
 :1023C000401C0B49087084B10121084800F014F842
 :1023D000084801780078401C064A1070642902DB26
 :1023E00000201146087000F037FB10BD00080040C7
-:1023F000000000200C000020CA430282704721B177
+:1023F000000000200E000020CA430282704721B175
 :10240000028842F00102028004E002884FF6FE7367
 :102410001A4002807047000010B5044668488442A4
 :1024200008D10121C014FFF78DFE0021E014FFF751
@@ -686,7 +686,7 @@
 :102AC0000AE00D480078401C0B4908700846007861
 :102AD000022801DB0020087001200849087000BFAF
 :102AE00002E0002002490870012010BD000C0140E6
-:102AF0000D00002001000020020000200300002043
+:102AF0000F00002001000020020000200300002041
 :102B0000FEF714FCFFF74EFF4FF4165000F022F8CA
 :102B1000FFF778FAFFF7D8FDFFF7B8F9FFF78AFF5C
 :102B2000FFF7A4F913E00A48007840B100200849F3

File diff suppressed because it is too large
+ 75 - 75
Prj/USER/Template.uvguix.liuhao


+ 1 - 6
Prj/USER/Template.uvprojx

@@ -10,7 +10,7 @@
       <TargetName>Template</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
+      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
       <uAC6>0</uAC6>
       <TargetOption>
         <TargetCommonOption>
@@ -599,11 +599,6 @@
     <Layers>
       <Layer>
         <LayName>&lt;Project Info&gt;</LayName>
-        <LayDesc></LayDesc>
-        <LayUrl></LayUrl>
-        <LayKeys></LayKeys>
-        <LayCat></LayCat>
-        <LayLic></LayLic>
         <LayTarg>0</LayTarg>
         <LayPrjMark>1</LayPrjMark>
       </Layer>

+ 4 - 1
Prj/USER/main.c

@@ -382,6 +382,8 @@ void Get_DCV_ACV_RES(void)
 	}
 
 }
+char showBuff[2]={0};
+
 int main(void)
 {
     ADC1_Init();
@@ -391,7 +393,8 @@ int main(void)
 	Timer4_init()	;//T4 10msʱÖÓ
 	Isr_Init();
 	key_Init();
-    Init_Lcd1602();
+	Init_Lcd1602();
+	
 	while(1)
 	{
 		 if(clearFlag)

Some files were not shown because too many files changed in this diff