X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=Src%2Fmain.c;h=7b5b75d0e3921e514183d9feb8bd79c6cdc78492;hb=abb212223d07a11a335151a64e111d8a670e93f5;hp=0fe73530f17de6442dcdf974fcf79f10884e6086;hpb=4e21fb78c9abaf69adc651de506caae734ac0e3b;p=home-hw.git diff --git a/Src/main.c b/Src/main.c index 0fe7353..7b5b75d 100644 --- a/Src/main.c +++ b/Src/main.c @@ -4,62 +4,58 @@ * @file : main.c * @brief : Main program body ****************************************************************************** - * This notice applies to any and all portions of this file + ** This notice applies to any and all portions of this file * that are not between comment pairs USER CODE BEGIN and * USER CODE END. Other portions of this file, whether * inserted by the user or by software development tools * are owned by their respective copyright owners. * - * Copyright (c) 2018 STMicroelectronics International N.V. - * All rights reserved. + * COPYRIGHT(c) 2018 STMicroelectronics * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted, provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of STMicroelectronics nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. * - * 1. Redistribution of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. Neither the name of STMicroelectronics nor the names of other - * contributors to this software may be used to endorse or promote products - * derived from this software without specific written permission. - * 4. This software, including modifications and/or derivative works of this - * software, must execute solely and exclusively on microcontroller or - * microprocessor devices manufactured by or for STMicroelectronics. - * 5. Redistribution and use of this software other than as permitted under - * this license is void and will automatically terminate your rights under - * this license. - * - * THIS SOFTWARE IS PROVIDED BY STMICROELECTRONICS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS, IMPLIED OR STATUTORY WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A - * PARTICULAR PURPOSE AND NON-INFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY - * RIGHTS ARE DISCLAIMED TO THE FULLEST EXTENT PERMITTED BY LAW. IN NO EVENT - * SHALL STMICROELECTRONICS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, - * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ****************************************************************************** */ /* Includes ------------------------------------------------------------------*/ #include "main.h" #include "stm32f1xx_hal.h" -#include "usb_device.h" /* USER CODE BEGIN Includes */ +#include "util.h" +#include "usb.h" +#include "app.h" + +#include /* USER CODE END Includes */ /* Private variables ---------------------------------------------------------*/ +PCD_HandleTypeDef hpcd_USB_FS; + /* USER CODE BEGIN PV */ /* Private variables ---------------------------------------------------------*/ -USBD_HandleTypeDef USBD_Device; +struct usb usb; /* USER CODE END PV */ @@ -68,6 +64,8 @@ void SystemClock_Config(void); static void MX_GPIO_Init(void); static void MX_I2C1_Init(void); static void MX_I2C2_Init(void); +static void MX_USB_PCD_Init(void); +static void MX_TIM4_Init(void); /* USER CODE BEGIN PFP */ /* Private function prototypes -----------------------------------------------*/ @@ -102,15 +100,43 @@ int main(void) SystemClock_Config(); /* USER CODE BEGIN SysInit */ + usb_init(&usb, &hpcd_USB_FS); /* USER CODE END SysInit */ /* Initialize all configured peripherals */ MX_GPIO_Init(); + + // A hack to let USB host reset us + LL_GPIO_InitTypeDef gpio; + gpio.Pin = LL_GPIO_PIN_12 | LL_GPIO_PIN_13; + gpio.Mode = LL_GPIO_MODE_OUTPUT; + gpio.Speed = LL_GPIO_SPEED_FREQ_HIGH; + gpio.OutputType = LL_GPIO_OUTPUT_OPENDRAIN; + LL_GPIO_Init(GPIOA, &gpio); + LL_GPIO_ResetOutputPin(GPIOA, LL_GPIO_PIN_12); + LL_GPIO_ResetOutputPin(GPIOA, LL_GPIO_PIN_13); + LL_mDelay(1000); + MX_I2C1_Init(); MX_I2C2_Init(); - MX_USB_DEVICE_Init(); + MX_USB_PCD_Init(); + MX_TIM4_Init(); /* USER CODE BEGIN 2 */ + //display_init(); + usb_start(&usb); + bmp_init(); + + LL_TIM_EnableCounter(TIM4); + LL_TIM_EnableIT_UPDATE(TIM4); + LL_TIM_GenerateEvent_UPDATE(TIM4); + +#if 0 + { + byte buf[5] = { 0xff, 0xff, 10, 0xff, 0xff }; + display_buffer(buf); + } +#endif /* USER CODE END 2 */ @@ -118,10 +144,32 @@ int main(void) /* USER CODE BEGIN WHILE */ while (1) { - LL_GPIO_SetOutputPin(LED_GPIO_Port, LED_Pin); - LL_mDelay(1000); - LL_GPIO_ResetOutputPin(LED_GPIO_Port, LED_Pin); - LL_mDelay(1000); + if (rx_packet_state == 1 && !tx_packet_state) + { + static byte led_state; + if (led_state) + LL_GPIO_SetOutputPin(LED_GPIO_Port, LED_Pin); + else + LL_GPIO_ResetOutputPin(LED_GPIO_Port, LED_Pin); + led_state ^= 1; + + // display_buffer(rx_packet); + tx_packet_state = 1; + tx_packet[0] = adjusted_temp >> 8; + tx_packet[1] = adjusted_temp & 0xff; + tx_packet[2] = adjusted_press >> 8; + tx_packet[3] = adjusted_press & 0xff; + usb_ep_send(&usb, 0x82, tx_packet, 8); + rx_packet_state = 0; + usb_ep_receive(&usb, 0x01, rx_packet, 64); + } + + bmp_step(); + + // debug_printf("Counter = %d\n", cnt); + // display_counter(cnt); + + __WFI(); /* USER CODE END WHILE */ @@ -268,6 +316,63 @@ static void MX_I2C2_Init(void) } +/* TIM4 init function */ +static void MX_TIM4_Init(void) +{ + + LL_TIM_InitTypeDef TIM_InitStruct; + LL_TIM_OC_InitTypeDef TIM_OC_InitStruct; + + /* Peripheral clock enable */ + LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_TIM4); + + /* TIM4 interrupt Init */ + NVIC_SetPriority(TIM4_IRQn, NVIC_EncodePriority(NVIC_GetPriorityGrouping(),0, 0)); + NVIC_EnableIRQ(TIM4_IRQn); + + TIM_InitStruct.Prescaler = 7200; + TIM_InitStruct.CounterMode = LL_TIM_COUNTERMODE_UP; + TIM_InitStruct.Autoreload = 1000; + TIM_InitStruct.ClockDivision = LL_TIM_CLOCKDIVISION_DIV1; + LL_TIM_Init(TIM4, &TIM_InitStruct); + + LL_TIM_DisableARRPreload(TIM4); + + LL_TIM_SetClockSource(TIM4, LL_TIM_CLOCKSOURCE_INTERNAL); + + TIM_OC_InitStruct.OCMode = LL_TIM_OCMODE_FROZEN; + TIM_OC_InitStruct.OCState = LL_TIM_OCSTATE_DISABLE; + TIM_OC_InitStruct.OCNState = LL_TIM_OCSTATE_DISABLE; + TIM_OC_InitStruct.CompareValue = 0; + TIM_OC_InitStruct.OCPolarity = LL_TIM_OCPOLARITY_HIGH; + LL_TIM_OC_Init(TIM4, LL_TIM_CHANNEL_CH1, &TIM_OC_InitStruct); + + LL_TIM_OC_DisableFast(TIM4, LL_TIM_CHANNEL_CH1); + + LL_TIM_SetTriggerOutput(TIM4, LL_TIM_TRGO_RESET); + + LL_TIM_DisableMasterSlaveMode(TIM4); + +} + +/* USB init function */ +static void MX_USB_PCD_Init(void) +{ + + hpcd_USB_FS.Instance = USB; + hpcd_USB_FS.Init.dev_endpoints = 8; + hpcd_USB_FS.Init.speed = PCD_SPEED_FULL; + hpcd_USB_FS.Init.ep0_mps = DEP0CTL_MPS_64; + hpcd_USB_FS.Init.low_power_enable = DISABLE; + hpcd_USB_FS.Init.lpm_enable = DISABLE; + hpcd_USB_FS.Init.battery_charging_enable = DISABLE; + if (HAL_PCD_Init(&hpcd_USB_FS) != HAL_OK) + { + _Error_Handler(__FILE__, __LINE__); + } + +} + /** Configure pins as * Analog * Input