Delete unneccesary files, compilation fix.

PrintEngineering · Apr 3, 2020 · d16a739 · d16a739
1 parent f5f6903
commit d16a739
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 1,680 deletions.
diff --git a/TFT/src/Libraries/Startup/stm32f10x_cl/startup_stm32f10x_cl.s b/TFT/src/Libraries/Startup/stm32f10x_cl/startup_stm32f10x_cl.s
diff --git a/TFT/src/Libraries/Startup/stm32f10x_hd/startup_stm32f10x_hd.s b/TFT/src/Libraries/Startup/stm32f10x_hd/startup_stm32f10x_hd.s
diff --git a/TFT/src/Libraries/Startup/stm32f2xx/startup_stm32f2xx.s b/TFT/src/Libraries/Startup/stm32f2xx/startup_stm32f2xx.s
diff --git a/TFT/src/Libraries/fwlib/stm32f10x/src/stm32f10x_usart.c b/TFT/src/Libraries/fwlib/stm32f10x/src/stm32f10x_usart.c
@@ -281,7 +281,7 @@ void USART_Init(USART_TypeDef* USARTx, USART_InitTypeDef* USART_InitStruct)
 void USART_StructInit(USART_InitTypeDef* USART_InitStruct)
 {
   /* USART_InitStruct members default value */
-  USART_InitStruct->USART_BaudRate = 9600;
+  USART_InitStruct->USART_BaudRate = 115200;
   USART_InitStruct->USART_WordLength = USART_WordLength_8b;
   USART_InitStruct->USART_StopBits = USART_StopBits_1;
   USART_InitStruct->USART_Parity = USART_Parity_No ;
@@ -431,7 +431,7 @@ void USART_ITConfig(USART_TypeDef* USARTx, uint16_t USART_IT, FunctionalState Ne
 }
 
 /**
-  * @brief  Enables or disables the USARTs DMA interface.
+  * @brief  Enables or disables the USART DMA interface.
   * @param  USARTx: Select the USART or the UART peripheral. 
   *   This parameter can be one of the following values:
   *   USART1, USART2, USART3, UART4 or UART5.
@@ -555,7 +555,7 @@ void USART_LINBreakDetectLengthConfig(USART_TypeDef* USARTx, uint16_t USART_LINB
 }
 
 /**
-  * @brief  Enables or disables the USARTs LIN mode.
+  * @brief  Enables or disables the USART LIN mode.
   * @param  USARTx: Select the USART or the UART peripheral. 
   *   This parameter can be one of the following values:
   *   USART1, USART2, USART3, UART4 or UART5.
@@ -670,7 +670,7 @@ void USART_SetPrescaler(USART_TypeDef* USARTx, uint8_t USART_Prescaler)
 }
 
 /**
-  * @brief  Enables or disables the USARTs Smart Card mode.
+  * @brief  Enables or disables the USART Smart Card mode.
   * @param  USARTx: where x can be 1, 2 or 3 to select the USART peripheral.
   * @param  NewState: new state of the Smart Card mode.
   *   This parameter can be: ENABLE or DISABLE.     
@@ -720,7 +720,7 @@ void USART_SmartCardNACKCmd(USART_TypeDef* USARTx, FunctionalState NewState)
 }
 
 /**
-  * @brief  Enables or disables the USARTs Half Duplex communication.
+  * @brief  Enables or disables the USART Half Duplex communication.
   * @param  USARTx: Select the USART or the UART peripheral. 
   *   This parameter can be one of the following values:
   *   USART1, USART2, USART3, UART4 or UART5.

diff --git a/TFT/src/User/API/boot.h b/TFT/src/User/API/boot.h
@@ -137,6 +137,8 @@ enum
   ICON_STATUS_FLOW,
   ICON_INFOBOX_PART1,
   ICON_INFOBOX_PART2,
+  ICON_GLOBAL_NOZZLE0,
+  ICON_GLOBAL_BED,
 
 //  ICON_RESERVE
 // Preview should be in the last place

diff --git a/TFT/src/User/Menu/Selectmode.c b/TFT/src/User/Menu/Selectmode.c
diff --git a/TFT/src/User/Menu/Selectmode.h b/TFT/src/User/Menu/Selectmode.h
diff --git a/TFT/src/User/variants.h b/TFT/src/User/variants.h
@@ -150,6 +150,7 @@
   #define ICON_WIDTH  70
   #define ICON_HEIGHT 70
   #define TITLE_END_Y 40
+  #define ICON_START_Y (TITLE_END_Y+10)
 
   #define LIST_ICON_WIDTH   55
   #define LIST_ICON_HEIGHT  50