diff --git a/V1.5/STM32F103_App1/HardWare/OLED/oled.c b/V1.5/STM32F103_App1/HardWare/OLED/oled.c index fa7877f..264e0d7 100644 --- a/V1.5/STM32F103_App1/HardWare/OLED/oled.c +++ b/V1.5/STM32F103_App1/HardWare/OLED/oled.c @@ -17,6 +17,8 @@ #define OLED_FSO_PIN GPIO_PIN_6 #define OLED_CS2_PORT GPIOB #define OLED_CS2_PIN GPIO_PIN_15 +#define OLED_RST_PORT GPIOB +#define OLED_RST_PIN GPIO_PIN_14 /* 复位脚,低电平复位(板内上拉,默认拉高即可) */ #define lcd_cs1(a) HAL_GPIO_WritePin(OLED_CS1_PORT, OLED_CS1_PIN, (GPIO_PinState)(a)) #define lcd_dc(a) HAL_GPIO_WritePin(OLED_DC_PORT, OLED_DC_PIN, (GPIO_PinState)(a)) @@ -73,6 +75,14 @@ static void oled_gpio_init(void) g.Pin = OLED_CS1_PIN; HAL_GPIO_Init(OLED_CS1_PORT, &g); g.Pin = OLED_CS2_PIN; HAL_GPIO_Init(OLED_CS2_PORT, &g); + /* RST(PB14):推挽输出,默认高(板内上拉,这里也主动拉高) */ + HAL_GPIO_WritePin(OLED_RST_PORT, OLED_RST_PIN, GPIO_PIN_SET); + g.Pin = OLED_RST_PIN; + g.Mode = GPIO_MODE_OUTPUT_PP; + g.Pull = GPIO_NOPULL; + g.Speed = GPIO_SPEED_FREQ_LOW; + HAL_GPIO_Init(OLED_RST_PORT, &g); + fso_output(); } @@ -124,6 +134,12 @@ void oled_init(void) { HAL_Delay(400); /* 等屏幕/字库上电稳定 */ oled_gpio_init(); + + /* 硬件复位一次屏幕(RST 低 10ms),保证从确定状态开始初始化 */ + HAL_GPIO_WritePin(OLED_RST_PORT, OLED_RST_PIN, GPIO_PIN_RESET); + HAL_Delay(10); + HAL_GPIO_WritePin(OLED_RST_PORT, OLED_RST_PIN, GPIO_PIN_SET); + HAL_Delay(120); lcd_cs1(0); rom_cs2(1); oled_write(0, 0xAE); /* display off */ diff --git a/V1.5/STM32F103_App1/Inc/main.h b/V1.5/STM32F103_App1/Inc/main.h index ff78f72..5ec4b9d 100644 --- a/V1.5/STM32F103_App1/Inc/main.h +++ b/V1.5/STM32F103_App1/Inc/main.h @@ -31,7 +31,7 @@ extern UART_HandleTypeDef huart3; * 由平台侧自行计时控制 */ /*===== 固件版本号(开机横幅打印用,改版本只动这里) =====*/ -#define FIRMWARE_VERSION_STR "1.5.8" +#define FIRMWARE_VERSION_STR "1.5.9" #define PRODUCT_WITH_FEED_SCALE 1 /* 默认带秤(EEPROM 172 可改,蓝牙 SCALE0/1 切换) */ @@ -54,14 +54,14 @@ extern UART_HandleTypeDef huart3; //#define MQTT_PASSWORD "b612c2839c135934" ////RTOS版-投料机-无蠕变磅秤-01 -//#define MQTT_CLIENT_ID "46c080c385c3652e" -//#define MQTT_USERNAME "766990788193702677" -//#define MQTT_PASSWORD "6ae9622b7034326b" +#define MQTT_CLIENT_ID "46c080c385c3652e" +#define MQTT_USERNAME "766990788193702677" +#define MQTT_PASSWORD "6ae9622b7034326b" //RTOS版-投料机-无蠕变磅秤-03 -#define MQTT_CLIENT_ID "5791a8579d459290" -#define MQTT_USERNAME "766990788193702677" -#define MQTT_PASSWORD "5f6cd7748ec9db35" +//#define MQTT_CLIENT_ID "5791a8579d459290" +//#define MQTT_USERNAME "766990788193702677" +//#define MQTT_PASSWORD "5f6cd7748ec9db35" #define MQTT_SERVER_IP "58.17.14.95" #define MQTT_SERVER_PORT 1880 diff --git a/V1.5/鐗堟湰璇存槑.md b/V1.5/鐗堟湰璇存槑.md index 6ef2474..5a07a78 100644 --- a/V1.5/鐗堟湰璇存槑.md +++ b/V1.5/鐗堟湰璇存槑.md @@ -207,3 +207,4 @@ - 鏂數鏃跺簭寰皟锛氱‘璁ゆ柇鐢靛悗鍏堝叧 OLED 灞忓啀鍙戞帀鐢垫秷鎭紙榛戝睆鏇村揩+缁欐ā缁勭暀鏇村鍙戦佺數閲忥級 - 鏂數鏃跺簭鏀逛负锛氬厛鍙戞帀鐢垫秷鎭(绛塐K) 鈫 灞忓箷鏄剧ず"鍙戠敓鎺夌數浜嬩欢!"浜 3 绉 鈫 鐔勫睆澶嶄綅 - 钃濈墮璁剧疆娴佺▼寮澶村厛纭浣嶆ā鍧楋紙BT_RST/PA7 鎷夐珮 100ms锛夛紝闃叉ā鍧楃姸鎬佸紓甯告椂 PC5 杩涗笉浜 AT 妯″紡 +- OLED 鏂板澶嶄綅鑴 PB14锛氬垵濮嬪寲鍓嶇粰 10ms 浣庤剦鍐茬‖浠跺浣嶅睆骞曪紝闃叉涓婄數鏃跺簭寮傚父鑺卞睆