sv/IronOS
1
0
Fork 0
forked from me/IronOS
Code Pull Requests Activity

Merge pull request #1293 from discip/patch-1

Browse Source 
removing some redundant lines
This commit is contained in:
Ben V. Brown
2022-05-04 08:58:17 +10:00
committed by GitHub
parent fd7db70fde cc269361b5
commit e6f1eb6729
3 changed files with 79 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
source/Core/BSP/Miniware/Pins.h
View File

@@ -6,119 +6,87 @@
*/ */
#ifndef BSP_MINIWARE_PINS_H_ #ifndef BSP_MINIWARE_PINS_H_
#define BSP_MINIWARE_PINS_H_ #define BSP_MINIWARE_PINS_H_
#include "configuration.h" #include "configuration.h"
#ifdef MODEL_TS100 #ifdef MODEL_TS100
#define KEY_B_Pin GPIO_PIN_6 #define KEY_B_Pin GPIO_PIN_6
#define KEY_B_GPIO_Port GPIOA #define KEY_B_GPIO_Port GPIOA
#define TMP36_INPUT_Pin GPIO_PIN_7 #define TMP36_INPUT_Pin GPIO_PIN_7
#define TMP36_INPUT_GPIO_Port GPIOA #define TMP36_INPUT_GPIO_Port GPIOA
#define TMP36_ADC1_CHANNEL ADC_CHANNEL_7 #define TMP36_ADC1_CHANNEL ADC_CHANNEL_7
#define TMP36_ADC2_CHANNEL ADC_CHANNEL_7 #define TMP36_ADC2_CHANNEL ADC_CHANNEL_7
#define TIP_TEMP_Pin GPIO_PIN_0 #define TIP_TEMP_Pin GPIO_PIN_0
#define TIP_TEMP_GPIO_Port GPIOB #define TIP_TEMP_GPIO_Port GPIOB
#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_8 #define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_8
#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_8 #define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_8
#define VIN_Pin GPIO_PIN_1 #define VIN_Pin GPIO_PIN_1
#define VIN_GPIO_Port GPIOB #define VIN_GPIO_Port GPIOB
#define VIN_ADC1_CHANNEL ADC_CHANNEL_9 #define VIN_ADC1_CHANNEL ADC_CHANNEL_9
#define VIN_ADC2_CHANNEL ADC_CHANNEL_9 #define VIN_ADC2_CHANNEL ADC_CHANNEL_9
#define OLED_RESET_Pin GPIO_PIN_8 #define OLED_RESET_Pin GPIO_PIN_8
#define OLED_RESET_GPIO_Port GPIOA #define OLED_RESET_GPIO_Port GPIOA
#define KEY_A_Pin GPIO_PIN_9 #define KEY_A_Pin GPIO_PIN_9
#define KEY_A_GPIO_Port GPIOA #define KEY_A_GPIO_Port GPIOA
#define INT_Orientation_Pin GPIO_PIN_3 #define INT_Orientation_Pin GPIO_PIN_3
#define INT_Orientation_GPIO_Port GPIOB #define INT_Orientation_GPIO_Port GPIOB
#define PWM_Out_Pin GPIO_PIN_4 #define PWM_Out_Pin GPIO_PIN_4
#define PWM_Out_GPIO_Port GPIOB #define PWM_Out_GPIO_Port GPIOB
#define PWM_Out_CHANNEL TIM_CHANNEL_1 #define PWM_Out_CHANNEL TIM_CHANNEL_1
#define PWM_Out_CCR #define PWM_Out_CCR
#define INT_Movement_Pin GPIO_PIN_5 #define INT_Movement_Pin GPIO_PIN_5
#define INT_Movement_GPIO_Port GPIOB #define INT_Movement_GPIO_Port GPIOB
#define SCL_Pin GPIO_PIN_6 #define SCL_Pin GPIO_PIN_6
#define SCL_GPIO_Port GPIOB #define SCL_GPIO_Port GPIOB
#define SDA_Pin GPIO_PIN_7 #define SDA_Pin GPIO_PIN_7
#define SDA_GPIO_Port GPIOB #define SDA_GPIO_Port GPIOB
#endif #endif
#ifdef MODEL_TS80
// TS80 pin map
#define KEY_B_Pin GPIO_PIN_0
#define KEY_B_GPIO_Port GPIOB
#define TMP36_INPUT_Pin GPIO_PIN_4
#define TMP36_INPUT_GPIO_Port GPIOA
#define TMP36_ADC1_CHANNEL ADC_CHANNEL_4
#define TMP36_ADC2_CHANNEL ADC_CHANNEL_4
#define TIP_TEMP_Pin GPIO_PIN_3
#define TIP_TEMP_GPIO_Port GPIOA
#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_3
#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_3
#define VIN_Pin GPIO_PIN_2 #if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0
#define VIN_GPIO_Port GPIOA // TS80 & TS80P pin map
#define VIN_ADC1_CHANNEL ADC_CHANNEL_2 #define KEY_B_Pin GPIO_PIN_0
#define VIN_ADC2_CHANNEL ADC_CHANNEL_2 #define KEY_B_GPIO_Port GPIOB
#define OLED_RESET_Pin GPIO_PIN_15 #define TMP36_INPUT_Pin GPIO_PIN_4
#define OLED_RESET_GPIO_Port GPIOA #define TMP36_INPUT_GPIO_Port GPIOA
#define KEY_A_Pin GPIO_PIN_1 #define TMP36_ADC1_CHANNEL ADC_CHANNEL_4
#define KEY_A_GPIO_Port GPIOB #define TMP36_ADC2_CHANNEL ADC_CHANNEL_4
#define INT_Orientation_Pin GPIO_PIN_4 #define TIP_TEMP_Pin GPIO_PIN_3
#define INT_Orientation_GPIO_Port GPIOB #define TIP_TEMP_GPIO_Port GPIOA
#define PWM_Out_Pin GPIO_PIN_6 #define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_3
#define PWM_Out_GPIO_Port GPIOA #define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_3
#define PWM_Out_CHANNEL TIM_CHANNEL_1
#define INT_Movement_Pin GPIO_PIN_5
#define INT_Movement_GPIO_Port GPIOB
#define SCL_Pin GPIO_PIN_6
#define SCL_GPIO_Port GPIOB
#define SDA_Pin GPIO_PIN_7
#define SDA_GPIO_Port GPIOB
#define SCL2_Pin GPIO_PIN_5
#define SCL2_GPIO_Port GPIOA
#define SDA2_Pin GPIO_PIN_1
#define SDA2_GPIO_Port GPIOA
#endif #define VIN_Pin GPIO_PIN_2
#ifdef MODEL_TS80P #define VIN_GPIO_Port GPIOA
// TS80P pin map #define VIN_ADC1_CHANNEL ADC_CHANNEL_2
#define KEY_B_Pin GPIO_PIN_0 #define VIN_ADC2_CHANNEL ADC_CHANNEL_2
#define KEY_B_GPIO_Port GPIOB #define OLED_RESET_Pin GPIO_PIN_15
#define TMP36_INPUT_Pin GPIO_PIN_4 #define OLED_RESET_GPIO_Port GPIOA
#define TMP36_INPUT_GPIO_Port GPIOA #define KEY_A_Pin GPIO_PIN_1
#define TMP36_ADC1_CHANNEL ADC_CHANNEL_4 #define KEY_A_GPIO_Port GPIOB
#define TMP36_ADC2_CHANNEL ADC_CHANNEL_4 #define INT_Orientation_Pin GPIO_PIN_4
#define TIP_TEMP_Pin GPIO_PIN_3 #define INT_Orientation_GPIO_Port GPIOB
#define TIP_TEMP_GPIO_Port GPIOA #define PWM_Out_Pin GPIO_PIN_6
#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_3 #define PWM_Out_GPIO_Port GPIOA
#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_3 #define PWM_Out_CHANNEL TIM_CHANNEL_1
#define INT_Movement_Pin GPIO_PIN_5
#define INT_Movement_GPIO_Port GPIOB
#define SCL_Pin GPIO_PIN_6
#define SCL_GPIO_Port GPIOB
#define SDA_Pin GPIO_PIN_7
#define SDA_GPIO_Port GPIOB
#define SCL2_Pin GPIO_PIN_5
#define SCL2_GPIO_Port GPIOA
#define SDA2_Pin GPIO_PIN_1
#define SDA2_GPIO_Port GPIOA
#define VIN_Pin GPIO_PIN_2 #endif
#define VIN_GPIO_Port GPIOA
#define VIN_ADC1_CHANNEL ADC_CHANNEL_2
#define VIN_ADC2_CHANNEL ADC_CHANNEL_2
#define OLED_RESET_Pin GPIO_PIN_15
#define OLED_RESET_GPIO_Port GPIOA
#define KEY_A_Pin GPIO_PIN_1
#define KEY_A_GPIO_Port GPIOB
#define INT_Orientation_Pin GPIO_PIN_4
#define INT_Orientation_GPIO_Port GPIOB
#define PWM_Out_Pin GPIO_PIN_6
#define PWM_Out_GPIO_Port GPIOA
#define PWM_Out_CHANNEL TIM_CHANNEL_1
#define INT_Movement_Pin GPIO_PIN_5
#define INT_Movement_GPIO_Port GPIOB
#define SCL_Pin GPIO_PIN_6
#define SCL_GPIO_Port GPIOB
#define SDA_Pin GPIO_PIN_7
#define SDA_GPIO_Port GPIOB
#define SCL2_Pin GPIO_PIN_5
#define SCL2_GPIO_Port GPIOA
#define SDA2_Pin GPIO_PIN_1
#define SDA2_GPIO_Port GPIOA
#define INT_PD_Pin GPIO_PIN_9
#define INT_PD_GPIO_Port GPIOA
#endif #ifdef MODEL_TS80P
// TS80P pin map
#define INT_PD_Pin GPIO_PIN_9
#define INT_PD_GPIO_Port GPIOA
#endif
#endif /* BSP_MINIWARE_PINS_H_ */ #endif /* BSP_MINIWARE_PINS_H_ */

6
source/Core/BSP/Miniware/Power.cpp
View File

@@ -22,11 +22,7 @@ void power_check() {
} }
bool getIsPoweredByDCIN() { bool getIsPoweredByDCIN() {
#ifdef MODEL_TS80 #if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0
return false;
#endif
#ifdef MODEL_TS80P
return false; return false;
#endif #endif

4
source/Core/Drivers/Font.h
View File

@@ -124,7 +124,7 @@ const uint8_t WarningBlock24[] = {
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x30, 0x0C, 0x02, 0xF1, 0xF1, 0xF1, 0x02, 0x0C, 0x30, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x30, 0x0C, 0x02, 0xF1, 0xF1, 0xF1, 0x02, 0x0C, 0x30, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0xC0, 0xB0, 0x8C, 0x83, 0x80, 0x80, 0x80, 0x80, 0xB3, 0xB3, 0xB3, 0x80, 0x80, 0x80, 0x80, 0x83, 0x8C, 0xB0, 0xC0, 0x00, 0x00}; 0x00, 0x00, 0x00, 0xC0, 0xB0, 0x8C, 0x83, 0x80, 0x80, 0x80, 0x80, 0xB3, 0xB3, 0xB3, 0x80, 0x80, 0x80, 0x80, 0x83, 0x8C, 0xB0, 0xC0, 0x00, 0x00};
#if defined(MODEL_TS100) + defined(MODEL_Pinecil) >= 1 #if defined(MODEL_TS100) + defined(MODEL_Pinecil) > 0
const uint8_t buttonA[] = { const uint8_t buttonA[] = {
// width = 42 // width = 42
// height = 16 // height = 16
@@ -140,7 +140,7 @@ const uint8_t disconnectedTip[] = {
0x04, 0x31, 0x38, 0x1c, 0x0e, 0x04, 0x01, 0x03, 0x07, 0x0e, 0x1c, 0x39, 0x30, 0x01, 0x03, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x09, 0x0f, 0x00}; 0x04, 0x31, 0x38, 0x1c, 0x0e, 0x04, 0x01, 0x03, 0x07, 0x0e, 0x1c, 0x39, 0x30, 0x01, 0x03, 0x00, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x04, 0x09, 0x0f, 0x00};
#endif #endif
#if defined(MODEL_TS80) + defined(MODEL_TS80P) >= 1 #if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0
const uint8_t buttonA[] = { const uint8_t buttonA[] = {
// width = 42 // width = 42
// height = 16 // height = 16