From b85abe43bb5bc567f45b07e4e33eed1cbae7973c Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Sat, 30 Jan 2021 17:56:50 +0100 Subject: [PATCH] changes, not working --- cube/.mxproject | 2 +- cube/Core/Inc/main.h | 24 +- cube/Core/Src/gpio.c | 9 +- cube/Core/Src/spi.c | 8 +- cube/Makefile | 92 ++++---- cube/Makefile-bak | 2 +- cube/User/Inc/oled-fonts.h | 226 ------------------ cube/User/Inc/oled.h | 32 --- cube/User/Src/main2.c | 13 +- cube/User/Src/oled.c | 461 ------------------------------------- cube/User/Src/wizHelper.c | 6 - cube/cube.ioc | 49 ++-- tools/upload.sh | 2 +- 13 files changed, 90 insertions(+), 836 deletions(-) delete mode 100644 cube/User/Inc/oled-fonts.h delete mode 100644 cube/User/Inc/oled.h delete mode 100644 cube/User/Src/oled.c diff --git a/cube/.mxproject b/cube/.mxproject index 87036df..7f282d1 100644 --- a/cube/.mxproject +++ b/cube/.mxproject @@ -1,5 +1,5 @@ [PreviousLibFiles] -LibFiles=Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h;Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h;Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/system_stm32f1xx.c;Drivers/CMSIS/Include/core_cm3.h;Drivers/CMSIS/Include/core_sc000.h;Drivers/CMSIS/Include/core_cm0plus.h;Drivers/CMSIS/Include/cmsis_gcc.h;Drivers/CMSIS/Include/core_cm7.h;Drivers/CMSIS/Include/core_armv8mbl.h;Drivers/CMSIS/Include/core_armv8mml.h;Drivers/CMSIS/Include/mpu_armv8.h;Drivers/CMSIS/Include/mpu_armv7.h;Drivers/CMSIS/Include/core_cm4.h;Drivers/CMSIS/Include/core_cm23.h;Drivers/CMSIS/Include/core_cm0.h;Drivers/CMSIS/Include/cmsis_armcc.h;Drivers/CMSIS/Include/cmsis_armclang.h;Drivers/CMSIS/Include/core_cm33.h;Drivers/CMSIS/Include/core_cm1.h;Drivers/CMSIS/Include/cmsis_iccarm.h;Drivers/CMSIS/Include/cmsis_compiler.h;Drivers/CMSIS/Include/cmsis_version.h;Drivers/CMSIS/Include/tz_context.h;Drivers/CMSIS/Include/core_sc300.h; +LibFiles=Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h;Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_iwdg.h;Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_exti.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_spi.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/system_stm32f1xx.c;Drivers/CMSIS/Include/cmsis_armclang.h;Drivers/CMSIS/Include/core_armv8mml.h;Drivers/CMSIS/Include/core_cm0plus.h;Drivers/CMSIS/Include/tz_context.h;Drivers/CMSIS/Include/core_cm0.h;Drivers/CMSIS/Include/cmsis_compiler.h;Drivers/CMSIS/Include/core_cm3.h;Drivers/CMSIS/Include/core_sc000.h;Drivers/CMSIS/Include/core_cm23.h;Drivers/CMSIS/Include/core_cm1.h;Drivers/CMSIS/Include/mpu_armv7.h;Drivers/CMSIS/Include/core_cm33.h;Drivers/CMSIS/Include/cmsis_gcc.h;Drivers/CMSIS/Include/core_armv8mbl.h;Drivers/CMSIS/Include/cmsis_armcc.h;Drivers/CMSIS/Include/core_sc300.h;Drivers/CMSIS/Include/cmsis_iccarm.h;Drivers/CMSIS/Include/core_cm4.h;Drivers/CMSIS/Include/mpu_armv8.h;Drivers/CMSIS/Include/cmsis_version.h;Drivers/CMSIS/Include/core_cm7.h; [PreviousUsedMakefileFiles] SourceFiles=Core/Src/main.c;Core/Src/gpio.c;Core/Src/iwdg.c;Core/Src/spi.c;Core/Src/tim.c;Core/Src/usart.c;Core/Src/stm32f1xx_it.c;Core/Src/stm32f1xx_hal_msp.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c;Core/Src/system_stm32f1xx.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c;Core/Src/system_stm32f1xx.c;Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/system_stm32f1xx.c;; diff --git a/cube/Core/Inc/main.h b/cube/Core/Inc/main.h index 0c83cf1..473f15a 100644 --- a/cube/Core/Inc/main.h +++ b/cube/Core/Inc/main.h @@ -59,7 +59,7 @@ void Error_Handler(void); /* Private defines -----------------------------------------------------------*/ #define eepromSpi hspi1 -#define displaySpi hspi2 +#define etherSpi hspi2 #define debugUart huart1 #define LED_Red_Pin GPIO_PIN_13 #define LED_Red_GPIO_Port GPIOC @@ -73,18 +73,16 @@ void Error_Handler(void); #define EEPROM_MISO_GPIO_Port GPIOA #define EEPROM_MOSI_Pin GPIO_PIN_7 #define EEPROM_MOSI_GPIO_Port GPIOA -#define Display_RES_Pin GPIO_PIN_10 -#define Display_RES_GPIO_Port GPIOB -#define Display_DC_Pin GPIO_PIN_11 -#define Display_DC_GPIO_Port GPIOB -#define Display_CS_Pin GPIO_PIN_12 -#define Display_CS_GPIO_Port GPIOB -#define Display_SCK_Pin GPIO_PIN_13 -#define Display_SCK_GPIO_Port GPIOB -#define Display_MISO_Pin GPIO_PIN_14 -#define Display_MISO_GPIO_Port GPIOB -#define Display_MOSI_Pin GPIO_PIN_15 -#define Display_MOSI_GPIO_Port GPIOB +#define ETHER_RES_Pin GPIO_PIN_11 +#define ETHER_RES_GPIO_Port GPIOB +#define ETHER_CS_Pin GPIO_PIN_12 +#define ETHER_CS_GPIO_Port GPIOB +#define ETHER_SCK_Pin GPIO_PIN_13 +#define ETHER_SCK_GPIO_Port GPIOB +#define ETHER_MISO_Pin GPIO_PIN_14 +#define ETHER_MISO_GPIO_Port GPIOB +#define ETHER_MOSI_Pin GPIO_PIN_15 +#define ETHER_MOSI_GPIO_Port GPIOB #define Debug_TX_Pin GPIO_PIN_9 #define Debug_TX_GPIO_Port GPIOA #define Debug_RX_Pin GPIO_PIN_10 diff --git a/cube/Core/Src/gpio.c b/cube/Core/Src/gpio.c index 34bbd2d..cb74492 100644 --- a/cube/Core/Src/gpio.c +++ b/cube/Core/Src/gpio.c @@ -55,8 +55,7 @@ void MX_GPIO_Init(void) HAL_GPIO_WritePin(EEPROM_CS_GPIO_Port, EEPROM_CS_Pin, GPIO_PIN_RESET); /*Configure GPIO pin Output Level */ - HAL_GPIO_WritePin(GPIOB, Display_RES_Pin|Display_DC_Pin|Display_CS_Pin|Debug_Signal_2_Pin - |Debug_Signal_1_Pin, GPIO_PIN_RESET); + HAL_GPIO_WritePin(GPIOB, ETHER_RES_Pin|ETHER_CS_Pin|Debug_Signal_2_Pin|Debug_Signal_1_Pin, GPIO_PIN_RESET); /*Configure GPIO pins : PCPin PCPin */ GPIO_InitStruct.Pin = LED_Red_Pin|LED_Green_Pin; @@ -72,10 +71,8 @@ void MX_GPIO_Init(void) GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; HAL_GPIO_Init(EEPROM_CS_GPIO_Port, &GPIO_InitStruct); - /*Configure GPIO pins : PBPin PBPin PBPin PBPin - PBPin */ - GPIO_InitStruct.Pin = Display_RES_Pin|Display_DC_Pin|Display_CS_Pin|Debug_Signal_2_Pin - |Debug_Signal_1_Pin; + /*Configure GPIO pins : PBPin PBPin PBPin PBPin */ + GPIO_InitStruct.Pin = ETHER_RES_Pin|ETHER_CS_Pin|Debug_Signal_2_Pin|Debug_Signal_1_Pin; GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; GPIO_InitStruct.Pull = GPIO_NOPULL; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; diff --git a/cube/Core/Src/spi.c b/cube/Core/Src/spi.c index dedc6e8..05fc754 100644 --- a/cube/Core/Src/spi.c +++ b/cube/Core/Src/spi.c @@ -121,15 +121,15 @@ void HAL_SPI_MspInit(SPI_HandleTypeDef* spiHandle) PB14 ------> SPI2_MISO PB15 ------> SPI2_MOSI */ - GPIO_InitStruct.Pin = Display_SCK_Pin|Display_MOSI_Pin; + GPIO_InitStruct.Pin = ETHER_SCK_Pin|ETHER_MOSI_Pin; GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH; HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); - GPIO_InitStruct.Pin = Display_MISO_Pin; + GPIO_InitStruct.Pin = ETHER_MISO_Pin; GPIO_InitStruct.Mode = GPIO_MODE_INPUT; GPIO_InitStruct.Pull = GPIO_NOPULL; - HAL_GPIO_Init(Display_MISO_GPIO_Port, &GPIO_InitStruct); + HAL_GPIO_Init(ETHER_MISO_GPIO_Port, &GPIO_InitStruct); /* USER CODE BEGIN SPI2_MspInit 1 */ @@ -174,7 +174,7 @@ void HAL_SPI_MspDeInit(SPI_HandleTypeDef* spiHandle) PB14 ------> SPI2_MISO PB15 ------> SPI2_MOSI */ - HAL_GPIO_DeInit(GPIOB, Display_SCK_Pin|Display_MISO_Pin|Display_MOSI_Pin); + HAL_GPIO_DeInit(GPIOB, ETHER_SCK_Pin|ETHER_MISO_Pin|ETHER_MOSI_Pin); /* USER CODE BEGIN SPI2_MspDeInit 1 */ diff --git a/cube/Makefile b/cube/Makefile index 4d30e94..bf58c91 100644 --- a/cube/Makefile +++ b/cube/Makefile @@ -1,6 +1,6 @@ -# Processed by ../tools/insertMyCode.sh +# Processed by ../tools/insertMyCode.sh ########################################################################################################################## -# File automatically-generated by tool: [projectgenerator] version: [3.10.0-B14] date: [Sat Jan 09 23:29:46 CET 2021] +# File automatically-generated by tool: [projectgenerator] version: [3.10.0-B14] date: [Sat Jan 30 17:49:10 CET 2021] ########################################################################################################################## # ------------------------------------------------ @@ -36,36 +36,36 @@ BUILD_DIR = build # source ###################################### # C sources -C_SOURCES = \ -User/Src/adminCmds.c User/Src/cmdHandler.c User/Src/config.c User/Src/configCmds.c User/Src/eeprom.c User/Src/logger.c User/Src/main2.c User/Src/oled.c User/Src/ports.c User/Src/regularCmds.c User/Src/ringbuffer.c User/Src/show.c User/Src/utils.c User/Src/wizHelper.c hottislib/PontCoopScheduler.c \ -Core/Src/main.c \ -Core/Src/gpio.c \ -Core/Src/iwdg.c \ -Core/Src/spi.c \ -Core/Src/tim.c \ -Core/Src/usart.c \ -Core/Src/stm32f1xx_it.c \ -Core/Src/stm32f1xx_hal_msp.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \ -Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \ +C_SOURCES = \ +User/Src/adminCmds.c User/Src/cmdHandler.c User/Src/config.c User/Src/configCmds.c User/Src/eeprom.c User/Src/logger.c User/Src/main2.c User/Src/ports.c User/Src/regularCmds.c User/Src/ringbuffer.c User/Src/show.c User/Src/utils.c User/Src/wizHelper.c hottislib/PontCoopScheduler.c \ +Core/Src/main.c \ +Core/Src/gpio.c \ +Core/Src/iwdg.c \ +Core/Src/spi.c \ +Core/Src/tim.c \ +Core/Src/usart.c \ +Core/Src/stm32f1xx_it.c \ +Core/Src/stm32f1xx_hal_msp.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_iwdg.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_spi.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \ +Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c \ Core/Src/system_stm32f1xx.c # ASM sources -ASM_SOURCES = \ +ASM_SOURCES = \ startup_stm32f103xb.s @@ -109,8 +109,8 @@ MCU = $(CPU) -mthumb $(FPU) $(FLOAT-ABI) AS_DEFS = # C defines -C_DEFS = \ --DUSE_HAL_DRIVER \ +C_DEFS = \ +-DUSE_HAL_DRIVER \ -DSTM32F103xB @@ -118,17 +118,17 @@ C_DEFS = \ AS_INCLUDES = # C includes -C_INCLUDES = \ --Ihottislib \ --IUser/Inc \ --IioLibrary_Driver/Internet/DNS \ --IioLibrary_Driver/Internet/DHCP \ --IioLibrary_Driver/Ethernet \ --ICore/Inc \ --IDrivers/STM32F1xx_HAL_Driver/Inc \ --IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \ --IDrivers/CMSIS/Device/ST/STM32F1xx/Include \ --IDrivers/CMSIS/Include \ +C_INCLUDES = \ +-Ihottislib \ +-IUser/Inc \ +-IioLibrary_Driver/Internet/DNS \ +-IioLibrary_Driver/Internet/DHCP \ +-IioLibrary_Driver/Ethernet \ +-ICore/Inc \ +-IDrivers/STM32F1xx_HAL_Driver/Inc \ +-IDrivers/STM32F1xx_HAL_Driver/Inc/Legacy \ +-IDrivers/CMSIS/Device/ST/STM32F1xx/Include \ +-IDrivers/CMSIS/Include \ -IDrivers/CMSIS/Include @@ -167,14 +167,14 @@ all: $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET # list of objects OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(C_SOURCES:.c=.o))) vpath %.c $(sort $(dir $(C_SOURCES))) -OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a pubsubc.a) +OBJECTS += $(addprefix $(BUILD_DIR)/,w5500.a) # list of ASM program objects OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o))) vpath %.s $(sort $(dir $(ASM_SOURCES))) -$(BUILD_DIR)/w5500.a: - (cd ioLibrary_Driver && $(MAKE) && cp w5500.a ../$(BUILD_DIR) && cd ..) - +$(BUILD_DIR)/w5500.a: + (cd ioLibrary_Driver && $(MAKE) && cp w5500.a ../$(BUILD_DIR) && cd ..) + $(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR) $(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@ diff --git a/cube/Makefile-bak b/cube/Makefile-bak index 09043c3..2380869 100644 --- a/cube/Makefile-bak +++ b/cube/Makefile-bak @@ -1,5 +1,5 @@ ########################################################################################################################## -# File automatically-generated by tool: [projectgenerator] version: [3.10.0-B14] date: [Sat Jan 09 23:29:46 CET 2021] +# File automatically-generated by tool: [projectgenerator] version: [3.10.0-B14] date: [Sat Jan 30 17:49:10 CET 2021] ########################################################################################################################## # ------------------------------------------------ diff --git a/cube/User/Inc/oled-fonts.h b/cube/User/Inc/oled-fonts.h deleted file mode 100644 index b0d935c..0000000 --- a/cube/User/Inc/oled-fonts.h +++ /dev/null @@ -1,226 +0,0 @@ -/* - * oled-fonts.h - * - * Created on: May 29, 2017 - * Author: wn - */ - -#ifndef OLED_FONTS_H_ -#define OLED_FONTS_H_ - - -/* - * Code found at http://www.instructables.com/id/How-to-use-OLED-display-arduino-module/ - * Thank you very much! - * Adapted from Arduino to STM32 HAL by wollud1969 - */ - - - -const unsigned char F6x8[][6] = -{ - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // sp - { 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00 }, // ! - { 0x00, 0x00, 0x07, 0x00, 0x07, 0x00 }, // " - { 0x00, 0x14, 0x7f, 0x14, 0x7f, 0x14 }, // # - { 0x00, 0x24, 0x2a, 0x7f, 0x2a, 0x12 }, // $ - { 0x00, 0x62, 0x64, 0x08, 0x13, 0x23 }, // % - { 0x00, 0x36, 0x49, 0x55, 0x22, 0x50 }, // & - { 0x00, 0x00, 0x05, 0x03, 0x00, 0x00 }, // ' - { 0x00, 0x00, 0x1c, 0x22, 0x41, 0x00 }, // ( - { 0x00, 0x00, 0x41, 0x22, 0x1c, 0x00 }, // ) - { 0x00, 0x14, 0x08, 0x3E, 0x08, 0x14 }, // * - { 0x00, 0x08, 0x08, 0x3E, 0x08, 0x08 }, // + - { 0x00, 0x00, 0x00, 0xA0, 0x60, 0x00 }, // , - { 0x00, 0x08, 0x08, 0x08, 0x08, 0x08 }, // - - { 0x00, 0x00, 0x60, 0x60, 0x00, 0x00 }, // . - { 0x00, 0x20, 0x10, 0x08, 0x04, 0x02 }, // / - { 0x00, 0x3E, 0x51, 0x49, 0x45, 0x3E }, // 0 - { 0x00, 0x00, 0x42, 0x7F, 0x40, 0x00 }, // 1 - { 0x00, 0x42, 0x61, 0x51, 0x49, 0x46 }, // 2 - { 0x00, 0x21, 0x41, 0x45, 0x4B, 0x31 }, // 3 - { 0x00, 0x18, 0x14, 0x12, 0x7F, 0x10 }, // 4 - { 0x00, 0x27, 0x45, 0x45, 0x45, 0x39 }, // 5 - { 0x00, 0x3C, 0x4A, 0x49, 0x49, 0x30 }, // 6 - { 0x00, 0x01, 0x71, 0x09, 0x05, 0x03 }, // 7 - { 0x00, 0x36, 0x49, 0x49, 0x49, 0x36 }, // 8 - { 0x00, 0x06, 0x49, 0x49, 0x29, 0x1E }, // 9 - { 0x00, 0x00, 0x36, 0x36, 0x00, 0x00 }, // : - { 0x00, 0x00, 0x56, 0x36, 0x00, 0x00 }, // ; - { 0x00, 0x08, 0x14, 0x22, 0x41, 0x00 }, // < - { 0x00, 0x14, 0x14, 0x14, 0x14, 0x14 }, // = - { 0x00, 0x00, 0x41, 0x22, 0x14, 0x08 }, // > - { 0x00, 0x02, 0x01, 0x51, 0x09, 0x06 }, // ? - { 0x00, 0x32, 0x49, 0x59, 0x51, 0x3E }, // @ - { 0x00, 0x7C, 0x12, 0x11, 0x12, 0x7C }, // A - { 0x00, 0x7F, 0x49, 0x49, 0x49, 0x36 }, // B - { 0x00, 0x3E, 0x41, 0x41, 0x41, 0x22 }, // C - { 0x00, 0x7F, 0x41, 0x41, 0x22, 0x1C }, // D - { 0x00, 0x7F, 0x49, 0x49, 0x49, 0x41 }, // E - { 0x00, 0x7F, 0x09, 0x09, 0x09, 0x01 }, // F - { 0x00, 0x3E, 0x41, 0x49, 0x49, 0x7A }, // G - { 0x00, 0x7F, 0x08, 0x08, 0x08, 0x7F }, // H - { 0x00, 0x00, 0x41, 0x7F, 0x41, 0x00 }, // I - { 0x00, 0x20, 0x40, 0x41, 0x3F, 0x01 }, // J - { 0x00, 0x7F, 0x08, 0x14, 0x22, 0x41 }, // K - { 0x00, 0x7F, 0x40, 0x40, 0x40, 0x40 }, // L - { 0x00, 0x7F, 0x02, 0x0C, 0x02, 0x7F }, // M - { 0x00, 0x7F, 0x04, 0x08, 0x10, 0x7F }, // N - { 0x00, 0x3E, 0x41, 0x41, 0x41, 0x3E }, // O - { 0x00, 0x7F, 0x09, 0x09, 0x09, 0x06 }, // P - { 0x00, 0x3E, 0x41, 0x51, 0x21, 0x5E }, // Q - { 0x00, 0x7F, 0x09, 0x19, 0x29, 0x46 }, // R - { 0x00, 0x46, 0x49, 0x49, 0x49, 0x31 }, // S - { 0x00, 0x01, 0x01, 0x7F, 0x01, 0x01 }, // T - { 0x00, 0x3F, 0x40, 0x40, 0x40, 0x3F }, // U - { 0x00, 0x1F, 0x20, 0x40, 0x20, 0x1F }, // V - { 0x00, 0x3F, 0x40, 0x38, 0x40, 0x3F }, // W - { 0x00, 0x63, 0x14, 0x08, 0x14, 0x63 }, // X - { 0x00, 0x07, 0x08, 0x70, 0x08, 0x07 }, // Y - { 0x00, 0x61, 0x51, 0x49, 0x45, 0x43 }, // Z - { 0x00, 0x00, 0x7F, 0x41, 0x41, 0x00 }, // [ 91 - { 0x00, 0x02, 0x04 ,0x08, 0x10, 0x20 }, // \92 - { 0x00, 0x00, 0x41, 0x41, 0x7F, 0x00 }, // ] - { 0x00, 0x04, 0x02, 0x01, 0x02, 0x04 }, // ^ - { 0x00, 0x40, 0x40, 0x40, 0x40, 0x40 }, // _ - { 0x00, 0x00, 0x01, 0x02, 0x04, 0x00 }, // ' - { 0x00, 0x20, 0x54, 0x54, 0x54, 0x78 }, // a - { 0x00, 0x7F, 0x48, 0x44, 0x44, 0x38 }, // b - { 0x00, 0x38, 0x44, 0x44, 0x44, 0x20 }, // c - { 0x00, 0x38, 0x44, 0x44, 0x48, 0x7F }, // d - { 0x00, 0x38, 0x54, 0x54, 0x54, 0x18 }, // e - { 0x00, 0x08, 0x7E, 0x09, 0x01, 0x02 }, // f - { 0x00, 0x18, 0xA4, 0xA4, 0xA4, 0x7C }, // g - { 0x00, 0x7F, 0x08, 0x04, 0x04, 0x78 }, // h - { 0x00, 0x00, 0x44, 0x7D, 0x40, 0x00 }, // i - { 0x00, 0x40, 0x80, 0x84, 0x7D, 0x00 }, // j - { 0x00, 0x7F, 0x10, 0x28, 0x44, 0x00 }, // k - { 0x00, 0x00, 0x41, 0x7F, 0x40, 0x00 }, // l - { 0x00, 0x7C, 0x04, 0x18, 0x04, 0x78 }, // m - { 0x00, 0x7C, 0x08, 0x04, 0x04, 0x78 }, // n - { 0x00, 0x38, 0x44, 0x44, 0x44, 0x38 }, // o - { 0x00, 0xFC, 0x24, 0x24, 0x24, 0x18 }, // p - { 0x00, 0x18, 0x24, 0x24, 0x18, 0xFC }, // q - { 0x00, 0x7C, 0x08, 0x04, 0x04, 0x08 }, // r - { 0x00, 0x48, 0x54, 0x54, 0x54, 0x20 }, // s - { 0x00, 0x04, 0x3F, 0x44, 0x40, 0x20 }, // t - { 0x00, 0x3C, 0x40, 0x40, 0x20, 0x7C }, // u - { 0x00, 0x1C, 0x20, 0x40, 0x20, 0x1C }, // v - { 0x00, 0x3C, 0x40, 0x30, 0x40, 0x3C }, // w - { 0x00, 0x44, 0x28, 0x10, 0x28, 0x44 }, // x - { 0x00, 0x1C, 0xA0, 0xA0, 0xA0, 0x7C }, // y - { 0x00, 0x44, 0x64, 0x54, 0x4C, 0x44 }, // z - { 0x14, 0x14, 0x14, 0x14, 0x14, 0x14 } // horiz lines -}; - - - - - - - - -const unsigned char F8X16[]= -{ - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,// 0 - 0x00,0x00,0x00,0xF8,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x33,0x30,0x00,0x00,0x00,//!1 - 0x00,0x10,0x0C,0x06,0x10,0x0C,0x06,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,//"2 - 0x40,0xC0,0x78,0x40,0xC0,0x78,0x40,0x00,0x04,0x3F,0x04,0x04,0x3F,0x04,0x04,0x00,//#3 - 0x00,0x70,0x88,0xFC,0x08,0x30,0x00,0x00,0x00,0x18,0x20,0xFF,0x21,0x1E,0x00,0x00,//$4 - 0xF0,0x08,0xF0,0x00,0xE0,0x18,0x00,0x00,0x00,0x21,0x1C,0x03,0x1E,0x21,0x1E,0x00,//%5 - 0x00,0xF0,0x08,0x88,0x70,0x00,0x00,0x00,0x1E,0x21,0x23,0x24,0x19,0x27,0x21,0x10,//&6 - 0x10,0x16,0x0E,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,//'7 - 0x00,0x00,0x00,0xE0,0x18,0x04,0x02,0x00,0x00,0x00,0x00,0x07,0x18,0x20,0x40,0x00,//(8 - 0x00,0x02,0x04,0x18,0xE0,0x00,0x00,0x00,0x00,0x40,0x20,0x18,0x07,0x00,0x00,0x00,//)9 - 0x40,0x40,0x80,0xF0,0x80,0x40,0x40,0x00,0x02,0x02,0x01,0x0F,0x01,0x02,0x02,0x00,//*10 - 0x00,0x00,0x00,0xF0,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x1F,0x01,0x01,0x01,0x00,//+11 - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0xB0,0x70,0x00,0x00,0x00,0x00,0x00,//,12 - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x01,0x01,0x01,0x01,0x01,0x01,//-13 - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,0x00,0x00,//.14 - 0x00,0x00,0x00,0x00,0x80,0x60,0x18,0x04,0x00,0x60,0x18,0x06,0x01,0x00,0x00,0x00,///15 - 0x00,0xE0,0x10,0x08,0x08,0x10,0xE0,0x00,0x00,0x0F,0x10,0x20,0x20,0x10,0x0F,0x00,//016 - 0x00,0x10,0x10,0xF8,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x3F,0x20,0x20,0x00,0x00,//117 - 0x00,0x70,0x08,0x08,0x08,0x88,0x70,0x00,0x00,0x30,0x28,0x24,0x22,0x21,0x30,0x00,//218 - 0x00,0x30,0x08,0x88,0x88,0x48,0x30,0x00,0x00,0x18,0x20,0x20,0x20,0x11,0x0E,0x00,//319 - 0x00,0x00,0xC0,0x20,0x10,0xF8,0x00,0x00,0x00,0x07,0x04,0x24,0x24,0x3F,0x24,0x00,//420 - 0x00,0xF8,0x08,0x88,0x88,0x08,0x08,0x00,0x00,0x19,0x21,0x20,0x20,0x11,0x0E,0x00,//521 - 0x00,0xE0,0x10,0x88,0x88,0x18,0x00,0x00,0x00,0x0F,0x11,0x20,0x20,0x11,0x0E,0x00,//622 - 0x00,0x38,0x08,0x08,0xC8,0x38,0x08,0x00,0x00,0x00,0x00,0x3F,0x00,0x00,0x00,0x00,//723 - 0x00,0x70,0x88,0x08,0x08,0x88,0x70,0x00,0x00,0x1C,0x22,0x21,0x21,0x22,0x1C,0x00,//824 - 0x00,0xE0,0x10,0x08,0x08,0x10,0xE0,0x00,0x00,0x00,0x31,0x22,0x22,0x11,0x0F,0x00,//925 - 0x00,0x00,0x00,0xC0,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x30,0x00,0x00,0x00,//:26 - 0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x60,0x00,0x00,0x00,0x00,//;27 - 0x00,0x00,0x80,0x40,0x20,0x10,0x08,0x00,0x00,0x01,0x02,0x04,0x08,0x10,0x20,0x00,//<28 - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x04,0x04,0x04,0x04,0x04,0x04,0x04,0x00,//=29 - 0x00,0x08,0x10,0x20,0x40,0x80,0x00,0x00,0x00,0x20,0x10,0x08,0x04,0x02,0x01,0x00,//>30 - 0x00,0x70,0x48,0x08,0x08,0x08,0xF0,0x00,0x00,0x00,0x00,0x30,0x36,0x01,0x00,0x00,//?31 - 0xC0,0x30,0xC8,0x28,0xE8,0x10,0xE0,0x00,0x07,0x18,0x27,0x24,0x23,0x14,0x0B,0x00,//@32 - 0x00,0x00,0xC0,0x38,0xE0,0x00,0x00,0x00,0x20,0x3C,0x23,0x02,0x02,0x27,0x38,0x20,//A33 - 0x08,0xF8,0x88,0x88,0x88,0x70,0x00,0x00,0x20,0x3F,0x20,0x20,0x20,0x11,0x0E,0x00,//B34 - 0xC0,0x30,0x08,0x08,0x08,0x08,0x38,0x00,0x07,0x18,0x20,0x20,0x20,0x10,0x08,0x00,//C35 - 0x08,0xF8,0x08,0x08,0x08,0x10,0xE0,0x00,0x20,0x3F,0x20,0x20,0x20,0x10,0x0F,0x00,//D36 - 0x08,0xF8,0x88,0x88,0xE8,0x08,0x10,0x00,0x20,0x3F,0x20,0x20,0x23,0x20,0x18,0x00,//E37 - 0x08,0xF8,0x88,0x88,0xE8,0x08,0x10,0x00,0x20,0x3F,0x20,0x00,0x03,0x00,0x00,0x00,//F38 - 0xC0,0x30,0x08,0x08,0x08,0x38,0x00,0x00,0x07,0x18,0x20,0x20,0x22,0x1E,0x02,0x00,//G39 - 0x08,0xF8,0x08,0x00,0x00,0x08,0xF8,0x08,0x20,0x3F,0x21,0x01,0x01,0x21,0x3F,0x20,//H40 - 0x00,0x08,0x08,0xF8,0x08,0x08,0x00,0x00,0x00,0x20,0x20,0x3F,0x20,0x20,0x00,0x00,//I41 - 0x00,0x00,0x08,0x08,0xF8,0x08,0x08,0x00,0xC0,0x80,0x80,0x80,0x7F,0x00,0x00,0x00,//J42 - 0x08,0xF8,0x88,0xC0,0x28,0x18,0x08,0x00,0x20,0x3F,0x20,0x01,0x26,0x38,0x20,0x00,//K43 - 0x08,0xF8,0x08,0x00,0x00,0x00,0x00,0x00,0x20,0x3F,0x20,0x20,0x20,0x20,0x30,0x00,//L44 - 0x08,0xF8,0xF8,0x00,0xF8,0xF8,0x08,0x00,0x20,0x3F,0x00,0x3F,0x00,0x3F,0x20,0x00,//M45 - 0x08,0xF8,0x30,0xC0,0x00,0x08,0xF8,0x08,0x20,0x3F,0x20,0x00,0x07,0x18,0x3F,0x00,//N46 - 0xE0,0x10,0x08,0x08,0x08,0x10,0xE0,0x00,0x0F,0x10,0x20,0x20,0x20,0x10,0x0F,0x00,//O47 - 0x08,0xF8,0x08,0x08,0x08,0x08,0xF0,0x00,0x20,0x3F,0x21,0x01,0x01,0x01,0x00,0x00,//P48 - 0xE0,0x10,0x08,0x08,0x08,0x10,0xE0,0x00,0x0F,0x18,0x24,0x24,0x38,0x50,0x4F,0x00,//Q49 - 0x08,0xF8,0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x3F,0x20,0x00,0x03,0x0C,0x30,0x20,//R50 - 0x00,0x70,0x88,0x08,0x08,0x08,0x38,0x00,0x00,0x38,0x20,0x21,0x21,0x22,0x1C,0x00,//S51 - 0x18,0x08,0x08,0xF8,0x08,0x08,0x18,0x00,0x00,0x00,0x20,0x3F,0x20,0x00,0x00,0x00,//T52 - 0x08,0xF8,0x08,0x00,0x00,0x08,0xF8,0x08,0x00,0x1F,0x20,0x20,0x20,0x20,0x1F,0x00,//U53 - 0x08,0x78,0x88,0x00,0x00,0xC8,0x38,0x08,0x00,0x00,0x07,0x38,0x0E,0x01,0x00,0x00,//V54 - 0xF8,0x08,0x00,0xF8,0x00,0x08,0xF8,0x00,0x03,0x3C,0x07,0x00,0x07,0x3C,0x03,0x00,//W55 - 0x08,0x18,0x68,0x80,0x80,0x68,0x18,0x08,0x20,0x30,0x2C,0x03,0x03,0x2C,0x30,0x20,//X56 - 0x08,0x38,0xC8,0x00,0xC8,0x38,0x08,0x00,0x00,0x00,0x20,0x3F,0x20,0x00,0x00,0x00,//Y57 - 0x10,0x08,0x08,0x08,0xC8,0x38,0x08,0x00,0x20,0x38,0x26,0x21,0x20,0x20,0x18,0x00,//Z58 - 0x00,0x00,0x00,0xFE,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x7F,0x40,0x40,0x40,0x00,//[59 - 0x00,0x0C,0x30,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x06,0x38,0xC0,0x00,//\60 - 0x00,0x02,0x02,0x02,0xFE,0x00,0x00,0x00,0x00,0x40,0x40,0x40,0x7F,0x00,0x00,0x00,//]61 - 0x00,0x00,0x04,0x02,0x02,0x02,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,//^62 - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,//_63 - 0x00,0x02,0x02,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,//`64 - 0x00,0x00,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x19,0x24,0x22,0x22,0x22,0x3F,0x20,//a65 - 0x08,0xF8,0x00,0x80,0x80,0x00,0x00,0x00,0x00,0x3F,0x11,0x20,0x20,0x11,0x0E,0x00,//b66 - 0x00,0x00,0x00,0x80,0x80,0x80,0x00,0x00,0x00,0x0E,0x11,0x20,0x20,0x20,0x11,0x00,//c67 - 0x00,0x00,0x00,0x80,0x80,0x88,0xF8,0x00,0x00,0x0E,0x11,0x20,0x20,0x10,0x3F,0x20,//d68 - 0x00,0x00,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x1F,0x22,0x22,0x22,0x22,0x13,0x00,//e69 - 0x00,0x80,0x80,0xF0,0x88,0x88,0x88,0x18,0x00,0x20,0x20,0x3F,0x20,0x20,0x00,0x00,//f70 - 0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x6B,0x94,0x94,0x94,0x93,0x60,0x00,//g71 - 0x08,0xF8,0x00,0x80,0x80,0x80,0x00,0x00,0x20,0x3F,0x21,0x00,0x00,0x20,0x3F,0x20,//h72 - 0x00,0x80,0x98,0x98,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x3F,0x20,0x20,0x00,0x00,//i73 - 0x00,0x00,0x00,0x80,0x98,0x98,0x00,0x00,0x00,0xC0,0x80,0x80,0x80,0x7F,0x00,0x00,//j74 - 0x08,0xF8,0x00,0x00,0x80,0x80,0x80,0x00,0x20,0x3F,0x24,0x02,0x2D,0x30,0x20,0x00,//k75 - 0x00,0x08,0x08,0xF8,0x00,0x00,0x00,0x00,0x00,0x20,0x20,0x3F,0x20,0x20,0x00,0x00,//l76 - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x20,0x3F,0x20,0x00,0x3F,0x20,0x00,0x3F,//m77 - 0x80,0x80,0x00,0x80,0x80,0x80,0x00,0x00,0x20,0x3F,0x21,0x00,0x00,0x20,0x3F,0x20,//n78 - 0x00,0x00,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x1F,0x20,0x20,0x20,0x20,0x1F,0x00,//o79 - 0x80,0x80,0x00,0x80,0x80,0x00,0x00,0x00,0x80,0xFF,0xA1,0x20,0x20,0x11,0x0E,0x00,//p80 - 0x00,0x00,0x00,0x80,0x80,0x80,0x80,0x00,0x00,0x0E,0x11,0x20,0x20,0xA0,0xFF,0x80,//q81 - 0x80,0x80,0x80,0x00,0x80,0x80,0x80,0x00,0x20,0x20,0x3F,0x21,0x20,0x00,0x01,0x00,//r82 - 0x00,0x00,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x33,0x24,0x24,0x24,0x24,0x19,0x00,//s83 - 0x00,0x80,0x80,0xE0,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x1F,0x20,0x20,0x00,0x00,//t84 - 0x80,0x80,0x00,0x00,0x00,0x80,0x80,0x00,0x00,0x1F,0x20,0x20,0x20,0x10,0x3F,0x20,//unsigned char5 - 0x80,0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x00,0x01,0x0E,0x30,0x08,0x06,0x01,0x00,//v86 - 0x80,0x80,0x00,0x80,0x00,0x80,0x80,0x80,0x0F,0x30,0x0C,0x03,0x0C,0x30,0x0F,0x00,//w87 - 0x00,0x80,0x80,0x00,0x80,0x80,0x80,0x00,0x00,0x20,0x31,0x2E,0x0E,0x31,0x20,0x00,//x88 - 0x80,0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x80,0x81,0x8E,0x70,0x18,0x06,0x01,0x00,//y89 - 0x00,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x21,0x30,0x2C,0x22,0x21,0x30,0x00,//z90 - 0x00,0x00,0x00,0x00,0x80,0x7C,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x3F,0x40,0x40,//{91 - 0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,//|92 - 0x00,0x02,0x02,0x7C,0x80,0x00,0x00,0x00,0x00,0x40,0x40,0x3F,0x00,0x00,0x00,0x00,//}93 - 0x00,0x06,0x01,0x01,0x02,0x02,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,//~94 - -}; - - - - -#endif /* OLED_FONTS_H_ */ diff --git a/cube/User/Inc/oled.h b/cube/User/Inc/oled.h deleted file mode 100644 index 3a4c17c..0000000 --- a/cube/User/Inc/oled.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * oled.h - * - * Created on: May 29, 2017 - * Author: wn - */ - -#ifndef OLED_H_ -#define OLED_H_ - - -/* - * Code found at http://www.instructables.com/id/How-to-use-OLED-display-arduino-module/ - * Thank you very much! - * Adapted from Arduino to STM32 HAL by wollud1969 - */ - - - -typedef enum { - OLED_SCREEN0 = 0, - OLED_SCREEN1 -} oledScreen_t; - -void oledInit(void); -void oledClearActiveScreen(); -void oledClearAllScreens(); -void oledPrint(oledScreen_t screen, char msg[]); -void oledPrintf(oledScreen_t screen, const char *format, ...); -void oledSetActiveScreen(oledScreen_t screen); - -#endif /* OLED_H_ */ diff --git a/cube/User/Src/main2.c b/cube/User/Src/main2.c index 32ae44e..bc31913 100644 --- a/cube/User/Src/main2.c +++ b/cube/User/Src/main2.c @@ -14,7 +14,6 @@ #include #include #include -#include #include @@ -34,24 +33,14 @@ void my_setup_2() { show(LED_GREEN, BLINK); logMsg("Application starting"); - oledInit(); - oledClearAllScreens(); - oledSetActiveScreen(OLED_SCREEN0); - oledPrint(OLED_SCREEN0, "App starting"); - eepromInit(); - oledPrint(OLED_SCREEN0, "eeprom init"); configInit(); - oledPrint(OLED_SCREEN0, "config init"); wizInit(); - oledPrint(OLED_SCREEN0, "network init"); cmdHandlerInit(); - oledPrint(OLED_SCREEN0, "cmdhandler init"); - - oledPrint(OLED_SCREEN0, "App running"); + logMsg("Application running"); } void my_loop() { diff --git a/cube/User/Src/oled.c b/cube/User/Src/oled.c deleted file mode 100644 index 1221787..0000000 --- a/cube/User/Src/oled.c +++ /dev/null @@ -1,461 +0,0 @@ -/* - * Code found at http://www.instructables.com/id/How-to-use-OLED-display-arduino-module/ - * Thank you very much! - * Adapted from Arduino to STM32 HAL by wollud1969 - */ - -#include -#include - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - - -#define HIGH GPIO_PIN_SET -#define LOW GPIO_PIN_RESET - -static void __LEDPIN_RST(GPIO_PinState v) { - HAL_GPIO_WritePin(Display_RES_GPIO_Port, Display_RES_Pin, v); -} - -static void __LEDPIN_DC(GPIO_PinState v) { - HAL_GPIO_WritePin(Display_DC_GPIO_Port, Display_DC_Pin, v); -} - -static void __LEDPIN_CS(GPIO_PinState v) { - HAL_GPIO_WritePin(Display_CS_GPIO_Port, Display_CS_Pin, v); -} - -static void oled_WrDat(unsigned char data) -{ - __LEDPIN_CS(LOW); - __LEDPIN_DC(HIGH); - - HAL_SPI_Transmit(&displaySpi, &data, 1, 0); - - __LEDPIN_CS(HIGH); -} - -static void oled_WrCmd(unsigned char cmd) -{ - __LEDPIN_CS(LOW); - __LEDPIN_DC(LOW); - - HAL_SPI_Transmit(&displaySpi, &cmd, 1, 0); - - __LEDPIN_CS(HIGH); -} - -static void oled_Set_Pos(unsigned char x, unsigned char y) -{ - oled_WrCmd(0xb0+y); - oled_WrCmd(((x&0xf0)>>4)|0x10); - oled_WrCmd((x&0x0f)|0x00); -} - - -static void oled_Fill(unsigned char bmp_data) -{ - unsigned char y,x; - - for(y=0;y<8;y++) - { - oled_WrCmd(0xb0+y); - oled_WrCmd(0x00); - oled_WrCmd(0x10); - for(x=0;x<128;x++) - oled_WrDat(bmp_data); - } -} - - - -static void oled_CLS(void) -{ - unsigned char y,x; - for(y=0;y<8;y++) - { - oled_WrCmd(0xb0+y); - oled_WrCmd(0x00); - oled_WrCmd(0x10); - for(x=0;x<128;x++) - oled_WrDat(0); - } -} - -static void oled_DLY_ms(unsigned int ms) -{ - uint32_t start = HAL_GetTick(); - while (HAL_GetTick() < start + ms); -} - -/* - * unused -static void SetStartColumn(unsigned char d) -{ - oled_WrCmd(0x00+d%16); // Set Lower Column Start Address for Page Addressing Mode - // Default => 0x00 - oled_WrCmd(0x10+d/16); // Set Higher Column Start Address for Page Addressing Mode - // Default => 0x10 -} -*/ - -static void SetAddressingMode(unsigned char d) -{ - oled_WrCmd(0x20); // Set Memory Addressing Mode - oled_WrCmd(d); // Default => 0x02 - // 0x00 => Horizontal Addressing Mode - // 0x01 => Vertical Addressing Mode - // 0x02 => Page Addressing Mode -} - -/* - * unused -static void SetColumnAddress(unsigned char a, unsigned char b) -{ - oled_WrCmd(0x21); // Set Column Address - oled_WrCmd(a); // Default => 0x00 (Column Start Address) - oled_WrCmd(b); // Default => 0x7F (Column End Address) -} -*/ -/* - * unused -static void SetPageAddress(unsigned char a, unsigned char b) -{ - oled_WrCmd(0x22); // Set Page Address - oled_WrCmd(a); // Default => 0x00 (Page Start Address) - oled_WrCmd(b); // Default => 0x07 (Page End Address) -} -*/ - -static void SetStartLine(unsigned char d) -{ - oled_WrCmd(0x40|d); // Set Display Start Line - // Default => 0x40 (0x00) -} - -static void SetContrastControl(unsigned char d) -{ - oled_WrCmd(0x81); // Set Contrast Control - oled_WrCmd(d); // Default => 0x7F -} - -static void Set_Charge_Pump(unsigned char d) -{ - oled_WrCmd(0x8D); // Set Charge Pump - oled_WrCmd(0x10|d); // Default => 0x10 - // 0x10 (0x00) => Disable Charge Pump - // 0x14 (0x04) => Enable Charge Pump -} - -static void Set_Segment_Remap(unsigned char d) -{ - oled_WrCmd(0xA0|d); // Set Segment Re-Map - // Default => 0xA0 - // 0xA0 (0x00) => Column Address 0 Mapped to SEG0 - // 0xA1 (0x01) => Column Address 0 Mapped to SEG127 -} - -static void Set_Entire_Display(unsigned char d) -{ - oled_WrCmd(0xA4|d); // Set Entire Display On / Off - // Default => 0xA4 - // 0xA4 (0x00) => Normal Display - // 0xA5 (0x01) => Entire Display On -} - -static void Set_Inverse_Display(unsigned char d) -{ - oled_WrCmd(0xA6|d); // Set Inverse Display On/Off - // Default => 0xA6 - // 0xA6 (0x00) => Normal Display - // 0xA7 (0x01) => Inverse Display On -} - -static void Set_Multiplex_Ratio(unsigned char d) -{ - oled_WrCmd(0xA8); // Set Multiplex Ratio - oled_WrCmd(d); // Default => 0x3F (1/64 Duty) -} - -static void Set_Display_On_Off(unsigned char d) -{ - oled_WrCmd(0xAE|d); // Set Display On/Off - // Default => 0xAE - // 0xAE (0x00) => Display Off - // 0xAF (0x01) => Display On -} - -/* - * unused -static void SetStartPage(unsigned char d) -{ - oled_WrCmd(0xB0|d); // Set Page Start Address for Page Addressing Mode - // Default => 0xB0 (0x00) -} -*/ - -static void Set_Common_Remap(unsigned char d) -{ - oled_WrCmd(0xC0|d); // Set COM Output Scan Direction - // Default => 0xC0 - // 0xC0 (0x00) => Scan from COM0 to 63 - // 0xC8 (0x08) => Scan from COM63 to 0 -} - -static void Set_Display_Offset(unsigned char d) -{ - oled_WrCmd(0xD3); // Set Display Offset - oled_WrCmd(d); // Default => 0x00 -} - -static void Set_Display_Clock(unsigned char d) -{ - oled_WrCmd(0xD5); // Set Display Clock Divide Ratio / Oscillator Frequency - oled_WrCmd(d); // Default => 0x80 - // D[3:0] => Display Clock Divider - // D[7:4] => Oscillator Frequency -} - -static void Set_Precharge_Period(unsigned char d) -{ - oled_WrCmd(0xD9); // Set Pre-Charge Period - oled_WrCmd(d); // Default => 0x22 (2 Display Clocks [Phase 2] / 2 Display Clocks [Phase 1]) - // D[3:0] => Phase 1 Period in 1~15 Display Clocks - // D[7:4] => Phase 2 Period in 1~15 Display Clocks -} - -static void Set_Common_Config(unsigned char d) -{ - oled_WrCmd(0xDA); // Set COM Pins Hardware Configuration - oled_WrCmd(0x02|d); // Default => 0x12 (0x10) - // Alternative COM Pin Configuration - // Disable COM Left/Right Re-Map -} - -static void Set_VCOMH(unsigned char d) -{ - oled_WrCmd(0xDB); // Set VCOMH Deselect Level - oled_WrCmd(d); // Default => 0x20 (0.77*VCC) -} - -/* - * unused -static void Set_NOP(void) -{ - oled_WrCmd(0xE3); // Command for No Operation -} -*/ - -void oledInit(void) -{ - // LEDPIN_Init(); - // LED_PORT=0X0F; - //LED_SCLH;;; - //LED_RSTL;;; - //digitalWrite(SCL_PIN,HIGH);;; - __LEDPIN_RST(LOW); - // for(i=0;i<100;i++)asm("nop"); - oled_DLY_ms(50); - //LED_RSTH;;; - __LEDPIN_RST(HIGH); - - Set_Display_On_Off(0x00); // Display Off (0x00/0x01) - Set_Display_Clock(0x80); // Set Clock as 100 Frames/Sec - Set_Multiplex_Ratio(0x3F); // 1/64 Duty (0x0F~0x3F) - Set_Display_Offset(0x00); // Shift Mapping RAM Counter (0x00~0x3F) - SetStartLine(0x00); // Set Mapping RAM Display Start Line (0x00~0x3F) - Set_Charge_Pump(0x04); // Enable Embedded DC/DC Converter (0x00/0x04) - SetAddressingMode(0x02); // Set Page Addressing Mode (0x00/0x01/0x02) - Set_Segment_Remap(0x01); // Set SEG/Column Mapping - Set_Common_Remap(0x08); // Set COM/Row Scan Direction - Set_Common_Config(0x10); // Set Sequential Configuration (0x00/0x10) - SetContrastControl(0xCF); // Set SEG Output Current - Set_Precharge_Period(0xF1); // Set Pre-Charge as 15 Clocks & Discharge as 1 Clock - Set_VCOMH(0x40); // Set VCOM Deselect Level - Set_Entire_Display(0x00); // Disable Entire Display On (0x00/0x01) - Set_Inverse_Display(0x00); // Disable Inverse Display On (0x00/0x01) - Set_Display_On_Off(0x01); // Display On (0x00/0x01) - oled_Fill(0x00); //clear all - oled_Set_Pos(0,0); -} - -/* - * unused -static void oled_P6x8Char(unsigned char x,unsigned char y,unsigned char ch) -{ - unsigned char c=0,i=0; - - c =ch-32; - if(x>122) - { - x=0; - y++; - } - oled_Set_Pos(x,y); - for(i=0;i<6;i++) - { - oled_WrDat(F6x8[c][i]); - } -} -*/ - -static void oled_P6x8Str(unsigned char x,unsigned char y,char ch[]) -{ - // coloredMsg(LOG_BLUE, false, "OLED: %d %d %s", x, y, ch); - - unsigned char c=0,i=0,j=0; - while (ch[j]!='\0') - { - c =ch[j]-32; - if(x>126) - { - x=0; - y++; - } - oled_Set_Pos(x,y); - for(i=0;i<6;i++) - { - oled_WrDat(F6x8[c][i]); - } - x+=6; - j++; - } -} - -/* - * unused -static void oled_P8x16Str(unsigned char x,unsigned char y,char ch[]) -{ - unsigned char c=0,i=0,j=0; - while (ch[j]!='\0') - { - c =ch[j]-32; - if(x>120) - { - x=0; - y++; - } - oled_Set_Pos(x,y); - for(i=0;i<8;i++) - { - oled_WrDat(F8X16[(c<<4)+i]); - } - oled_Set_Pos(x,y+1); - for(i=0;i<8;i++) - { - oled_WrDat(F8X16[(c<<4)+i+8]); - } - x+=8; - j++; - } -} -*/ - - -/* - * unused -static void oled_PrintBMP(unsigned char x0,unsigned char y0,unsigned char x1,unsigned char y1,unsigned char bmp[]) -{ - int ii=0; - unsigned char x,y; - for(y=y0;y<=y1;y++) - { - oled_Set_Pos(x0,y); - for(x=x0;x #include #include -#include #include #include @@ -86,8 +85,6 @@ static void wizDHCPAssign() { networkAvailable = true; show(LED_GREEN, ON); coloredMsg(LOG_BLUE, false, "wizda, network is available"); - - oledPrintf(OLED_SCREEN0, "Addr:%d.%d.%d.%d", netInfo.ip[0], netInfo.ip[1], netInfo.ip[2], netInfo.ip[3]); } static void wizDHCPUpdate() { @@ -142,7 +139,6 @@ static void wizPhyLinkHandler(void *handle) { lastStablePhyLink = phyLink; if (phyLink == PHY_LINK_ON) { - oledPrint(OLED_SCREEN0, "Link available"); // start DHCP handler memset(dhcpBuffer, 0, DHCP_BUFFER_SIZE); reg_dhcp_cbfunc(wizDHCPAssign, wizDHCPUpdate, NULL); @@ -155,8 +151,6 @@ static void wizPhyLinkHandler(void *handle) { dhcpInitialized = true; } else { - oledPrint(OLED_SCREEN0, "Link lost"); - networkAvailable = false; show(LED_GREEN, BLINK); coloredMsg(LOG_BLUE, false, "wizplh, network is unavailable"); diff --git a/cube/cube.ioc b/cube/cube.ioc index 4f9591b..f5c5fcd 100644 --- a/cube/cube.ioc +++ b/cube/cube.ioc @@ -16,31 +16,30 @@ Mcu.Name=STM32F103C(8-B)Tx Mcu.Package=LQFP48 Mcu.Pin0=PC13-TAMPER-RTC Mcu.Pin1=PC14-OSC32_IN -Mcu.Pin10=PB12 -Mcu.Pin11=PB13 -Mcu.Pin12=PB14 -Mcu.Pin13=PB15 -Mcu.Pin14=PA8 -Mcu.Pin15=PA9 -Mcu.Pin16=PA10 -Mcu.Pin17=PA13 -Mcu.Pin18=PA14 -Mcu.Pin19=PB5 +Mcu.Pin10=PB13 +Mcu.Pin11=PB14 +Mcu.Pin12=PB15 +Mcu.Pin13=PA8 +Mcu.Pin14=PA9 +Mcu.Pin15=PA10 +Mcu.Pin16=PA13 +Mcu.Pin17=PA14 +Mcu.Pin18=PB5 +Mcu.Pin19=PB6 Mcu.Pin2=PD0-OSC_IN -Mcu.Pin20=PB6 -Mcu.Pin21=VP_IWDG_VS_IWDG -Mcu.Pin22=VP_SYS_VS_Systick -Mcu.Pin23=VP_TIM1_VS_ClockSourceINT +Mcu.Pin20=VP_IWDG_VS_IWDG +Mcu.Pin21=VP_SYS_VS_Systick +Mcu.Pin22=VP_TIM1_VS_ClockSourceINT Mcu.Pin3=PD1-OSC_OUT Mcu.Pin4=PA4 Mcu.Pin5=PA5 Mcu.Pin6=PA6 Mcu.Pin7=PA7 -Mcu.Pin8=PB10 -Mcu.Pin9=PB11 -Mcu.PinsNb=24 +Mcu.Pin8=PB11 +Mcu.Pin9=PB12 +Mcu.PinsNb=23 Mcu.ThirdPartyNb=0 -Mcu.UserConstants=eepromSpi,hspi1;displaySpi,hspi2;debugUart,huart1 +Mcu.UserConstants=eepromSpi,hspi1;etherSpi,hspi2;debugUart,huart1 Mcu.UserName=STM32F103C8Tx MxCube.Version=6.0.0 MxDb.Version=DB.6.0.0 @@ -86,28 +85,24 @@ PA9.GPIOParameters=GPIO_Label PA9.GPIO_Label=Debug_TX PA9.Mode=Asynchronous PA9.Signal=USART1_TX -PB10.GPIOParameters=GPIO_Label -PB10.GPIO_Label=Display_RES -PB10.Locked=true -PB10.Signal=GPIO_Output PB11.GPIOParameters=GPIO_Label -PB11.GPIO_Label=Display_DC +PB11.GPIO_Label=ETHER_RES PB11.Locked=true PB11.Signal=GPIO_Output PB12.GPIOParameters=GPIO_Label -PB12.GPIO_Label=Display_CS +PB12.GPIO_Label=ETHER_CS PB12.Locked=true PB12.Signal=GPIO_Output PB13.GPIOParameters=GPIO_Label -PB13.GPIO_Label=Display_SCK +PB13.GPIO_Label=ETHER_SCK PB13.Mode=Full_Duplex_Master PB13.Signal=SPI2_SCK PB14.GPIOParameters=GPIO_Label -PB14.GPIO_Label=Display_MISO +PB14.GPIO_Label=ETHER_MISO PB14.Mode=Full_Duplex_Master PB14.Signal=SPI2_MISO PB15.GPIOParameters=GPIO_Label -PB15.GPIO_Label=Display_MOSI +PB15.GPIO_Label=ETHER_MOSI PB15.Mode=Full_Duplex_Master PB15.Signal=SPI2_MOSI PB5.GPIOParameters=GPIO_Label diff --git a/tools/upload.sh b/tools/upload.sh index 95f6c56..2cb47bc 100755 --- a/tools/upload.sh +++ b/tools/upload.sh @@ -2,7 +2,7 @@ cat << EOF | nc localhost 4444 reset halt -flash write_image erase /home/wn/Workspaces/mbusgateway3variant/cube/build/cube.elf +flash write_image erase /home/wn/Workspaces/mains-frequency-counter-stm32/cube/build/cube.elf reset run exit EOF