updated version numbers

dekuNukem · May 5, 2022 · a121e8a · a121e8a
1 parent 2af2571
commit a121e8a
Show file tree

Hide file tree

Showing 15 changed files with 581 additions and 572 deletions.
diff --git a/firmware/ibmpc/MDK-ARM/ibmpc.uvguix.allen b/firmware/ibmpc/MDK-ARM/ibmpc.uvguix.allen
@@ -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>
@@ -3606,9 +3606,9 @@
       <ActiveTab>0</ActiveTab>
       <Doc>
         <Name>../Src/main.c</Name>
-        <ColumnNumber>57</ColumnNumber>
-        <TopLine>566</TopLine>
-        <CurrentLine>592</CurrentLine>
+        <ColumnNumber>11</ColumnNumber>
+        <TopLine>327</TopLine>
+        <CurrentLine>352</CurrentLine>
         <Folding>1</Folding>
         <ContractedFolders></ContractedFolders>
         <PaneID>0</PaneID>

diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.axf b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.axf
diff --git a/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.build_log.htm b/firmware/ibmpc/MDK-ARM/ibmpc/ibmpc.build_log.htm
@@ -27,11 +27,20 @@ <h2>Project:</h2>
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
 Build target 'ibmpc'
-compiling ps2kb.c...
+compiling main.c...
+../Src/main.c(482): warning:  #188-D: enumerated type mixed with another type
+      HAL_GPIO_WritePin(GAMEPAD_B1_GPIO_Port, GAMEPAD_B1_Pin, !(this_gamepad_event->button_1));
+../Src/main.c(483): warning:  #188-D: enumerated type mixed with another type
+      HAL_GPIO_WritePin(GAMEPAD_B2_GPIO_Port, GAMEPAD_B2_Pin, !(this_gamepad_event->button_2));
+../Src/main.c(484): warning:  #188-D: enumerated type mixed with another type
+      HAL_GPIO_WritePin(GAMEPAD_B3_GPIO_Port, GAMEPAD_B3_Pin, !(this_gamepad_event->button_3));
+../Src/main.c(485): warning:  #188-D: enumerated type mixed with another type
+      HAL_GPIO_WritePin(GAMEPAD_B4_GPIO_Port, GAMEPAD_B4_Pin, !(this_gamepad_event->button_4));
+../Src/main.c: 4 warnings, 0 errors
 linking...
-Program Size: Code=16660 RO-data=428 RW-data=128 ZI-data=2176  
+Program Size: Code=16656 RO-data=428 RW-data=128 ZI-data=2176  
 FromELF: creating hex file...
-"ibmpc\ibmpc.axf" - 0 Error(s), 0 Warning(s).
+"ibmpc\ibmpc.axf" - 0 Error(s), 4 Warning(s).
 
 <h2>Software Packages used:</h2>