From 14eb587856da80f708cdb9c1cd91cc413ef6bf0e Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Wed, 4 May 2022 00:10:44 +0200 Subject: [PATCH 1/3] Update Pins.h --- source/Core/BSP/Miniware/Pins.h | 184 +++++++++++++------------------- 1 file changed, 76 insertions(+), 108 deletions(-) diff --git a/source/Core/BSP/Miniware/Pins.h b/source/Core/BSP/Miniware/Pins.h index 079c904928..fd89dea3cf 100644 --- a/source/Core/BSP/Miniware/Pins.h +++ b/source/Core/BSP/Miniware/Pins.h @@ -6,119 +6,87 @@ */ #ifndef BSP_MINIWARE_PINS_H_ -#define BSP_MINIWARE_PINS_H_ -#include "configuration.h" + #define BSP_MINIWARE_PINS_H_ + #include "configuration.h" -#ifdef MODEL_TS100 + #ifdef MODEL_TS100 -#define KEY_B_Pin GPIO_PIN_6 -#define KEY_B_GPIO_Port GPIOA -#define TMP36_INPUT_Pin GPIO_PIN_7 -#define TMP36_INPUT_GPIO_Port GPIOA -#define TMP36_ADC1_CHANNEL ADC_CHANNEL_7 -#define TMP36_ADC2_CHANNEL ADC_CHANNEL_7 -#define TIP_TEMP_Pin GPIO_PIN_0 -#define TIP_TEMP_GPIO_Port GPIOB -#define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_8 -#define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_8 -#define VIN_Pin GPIO_PIN_1 -#define VIN_GPIO_Port GPIOB -#define VIN_ADC1_CHANNEL ADC_CHANNEL_9 -#define VIN_ADC2_CHANNEL ADC_CHANNEL_9 -#define OLED_RESET_Pin GPIO_PIN_8 -#define OLED_RESET_GPIO_Port GPIOA -#define KEY_A_Pin GPIO_PIN_9 -#define KEY_A_GPIO_Port GPIOA -#define INT_Orientation_Pin GPIO_PIN_3 -#define INT_Orientation_GPIO_Port GPIOB -#define PWM_Out_Pin GPIO_PIN_4 -#define PWM_Out_GPIO_Port GPIOB -#define PWM_Out_CHANNEL TIM_CHANNEL_1 -#define PWM_Out_CCR -#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 -#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 KEY_B_Pin GPIO_PIN_6 + #define KEY_B_GPIO_Port GPIOA + #define TMP36_INPUT_Pin GPIO_PIN_7 + #define TMP36_INPUT_GPIO_Port GPIOA + #define TMP36_ADC1_CHANNEL ADC_CHANNEL_7 + #define TMP36_ADC2_CHANNEL ADC_CHANNEL_7 + #define TIP_TEMP_Pin GPIO_PIN_0 + #define TIP_TEMP_GPIO_Port GPIOB + #define TIP_TEMP_ADC1_CHANNEL ADC_CHANNEL_8 + #define TIP_TEMP_ADC2_CHANNEL ADC_CHANNEL_8 + #define VIN_Pin GPIO_PIN_1 + #define VIN_GPIO_Port GPIOB + #define VIN_ADC1_CHANNEL ADC_CHANNEL_9 + #define VIN_ADC2_CHANNEL ADC_CHANNEL_9 + #define OLED_RESET_Pin GPIO_PIN_8 + #define OLED_RESET_GPIO_Port GPIOA + #define KEY_A_Pin GPIO_PIN_9 + #define KEY_A_GPIO_Port GPIOA + #define INT_Orientation_Pin GPIO_PIN_3 + #define INT_Orientation_GPIO_Port GPIOB + #define PWM_Out_Pin GPIO_PIN_4 + #define PWM_Out_GPIO_Port GPIOB + #define PWM_Out_CHANNEL TIM_CHANNEL_1 + #define PWM_Out_CCR + #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 + #endif -#define VIN_Pin GPIO_PIN_2 -#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 + #if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0 + // TS80 & TS80P 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 -#endif -#ifdef MODEL_TS80P -// TS80P 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 + #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 VIN_Pin GPIO_PIN_2 -#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 -#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_ */ From a5975b3385a00c8385f7699151b6ccbc4c0acacd Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Wed, 4 May 2022 00:13:46 +0200 Subject: [PATCH 2/3] Update Power.cpp --- source/Core/BSP/Miniware/Power.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/source/Core/BSP/Miniware/Power.cpp b/source/Core/BSP/Miniware/Power.cpp index b72d984beb..84772772f4 100644 --- a/source/Core/BSP/Miniware/Power.cpp +++ b/source/Core/BSP/Miniware/Power.cpp @@ -22,11 +22,7 @@ void power_check() { } bool getIsPoweredByDCIN() { -#ifdef MODEL_TS80 - return false; -#endif - -#ifdef MODEL_TS80P +#if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0 return false; #endif From 9ec92298f35869ca3f5cb70be12caa448fad5cef Mon Sep 17 00:00:00 2001 From: discip <53649486+discip@users.noreply.github.com> Date: Wed, 4 May 2022 00:17:34 +0200 Subject: [PATCH 3/3] Update Font.h --- source/Core/Drivers/Font.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Core/Drivers/Font.h b/source/Core/Drivers/Font.h index 7c9cc24762..d3fc1723b0 100644 --- a/source/Core/Drivers/Font.h +++ b/source/Core/Drivers/Font.h @@ -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, 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[] = { // width = 42 // 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}; #endif -#if defined(MODEL_TS80) + defined(MODEL_TS80P) >= 1 +#if defined(MODEL_TS80) + defined(MODEL_TS80P) > 0 const uint8_t buttonA[] = { // width = 42 // height = 16