diff --git a/peripherals/cc48x6/firmware/Src/main.c b/peripherals/cc48x6/firmware/Src/main.c index 1198d8d..782a9a4 100644 --- a/peripherals/cc48x6/firmware/Src/main.c +++ b/peripherals/cc48x6/firmware/Src/main.c @@ -68,7 +68,8 @@ uint16_t counter = 0; volatile bool dirty = true; //uint16_t mem[12] = {0xFFF, 0xFF, 0xFFF, 0xFF, 0xFFF, 0xFF, 0xFFF, 0xFF, 0xFFF, 0xFF, 0xFFF, 0xFF}; //uint16_t mem[12] = {0x300, 0x40, 0x300, 0x40, 0x300, 0x40, 0x300, 0x40, 0x300, 0x40, 0x300, 0x40}; -uint16_t mem[12] = {0xFFF, 0xFF, 0xFFF, 0xFF, 0xFFF, 0xFF, 0xFFF, 0xFF, 0xFFF, 0xFF, 0xFFF, 0xFF}; +//uint16_t mem[12] = {0xFFF, 0xFF, 0xFFF, 0xFF, 0xFFF, 0xFF, 0xFFF, 0xFF, 0xFFF, 0xFF, 0xFFF, 0xFF}; +uint16_t mem[12] = {0x400, 0xff, 0x400, 0xff, 0x400, 0xff, 0x400, 0xff, 0x400, 0xff, 0x400, 0xff}; uint16_t conf[8] = {version, 0, 0, 0, 0, 0, 0, 0}; @@ -88,50 +89,6 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin) { void HAL_SPI_CpltCallback(SPI_HandleTypeDef *hspi) { - if(RX_Buffer[0]) { - union { - struct { - unsigned data: 12; - unsigned chan: 4; - } __attribute__((packed)); - uint16_t raw; - - } frame = {.raw=RX_Buffer[0]}; - - toggle = !toggle; - counter++; - - if(toggle) { - HAL_GPIO_WritePin(SIGNAL_LED_GPIO_Port, SIGNAL_LED_Pin, GPIO_PIN_SET); - } else { - HAL_GPIO_WritePin(SIGNAL_LED_GPIO_Port, SIGNAL_LED_Pin, GPIO_PIN_RESET); - } - - if(frame.chan <= 6 && frame.chan >= 1) { - frame.chan--; - if(frame.data > 0x300) { - mem[frame.chan * 2 + 1] = 0xFF; - mem[frame.chan * 2] = frame.data; - } else { - mem[frame.chan * 2 + 1] = (frame.data * 0xFF) / 0x300; - mem[frame.chan * 2] = 0x300; - } - - dirty = true; - TX_Buffer[0] = RX_Buffer[0]; - - } else if(frame.chan == 15 && frame.data < 8) { - TX_Buffer[0] = conf[frame.data]; - } else { - TX_Buffer[0] = 0; - } - - } - - HAL_GPIO_WritePin(INIT_OUT_GPIO_Port, INIT_OUT_Pin, GPIO_PIN_SET); - for (volatile int i = 0; i < 3; i++); - HAL_GPIO_WritePin(INIT_OUT_GPIO_Port, INIT_OUT_Pin, GPIO_PIN_RESET); - } void HAL_SPI_RxCpltCallback(SPI_HandleTypeDef *hspi) { @@ -185,7 +142,7 @@ int main(void) { MX_TIM3_Init(); /* USER CODE BEGIN 2 */ MX_SPI1_Init(); - MX_SPI2_Init(); + //MX_SPI2_Init(); TIM1->ARR = 254; TIM1->CCR1 = 10; @@ -209,7 +166,48 @@ int main(void) { TIM3->BDTR |= TIM_BDTR_MOE; // Enable Main Output TIM3->CR1 |= TIM_CR1_CEN; // Enable Counter - HAL_GPIO_WritePin(SIGNAL_LED_GPIO_Port, SIGNAL_LED_Pin, GPIO_PIN_RESET); +/* + // GPIO CONFIG I2C2 + RCC->AHBENR |= RCC_AHBENR_GPIOBEN; // Eneable Clock + GPIOB->MODER &= ~(GPIO_MODER_MODER14_Msk | GPIO_MODER_MODER13_Msk); + GPIOB->MODER |= GPIO_MODER_MODER14_1 | GPIO_MODER_MODER13_1; // GPIOB 14 & 13 -> Alternate Function + GPIOB->AFR[1] &= ~(GPIO_AFRH_AFSEL14_Msk | GPIO_AFRH_AFSEL13_Msk); + GPIOB->AFR[1] |= (5 << GPIO_AFRH_AFSEL14_Pos) | (5 << GPIO_AFRH_AFSEL13_Pos); // AF5 (I2C2) + GPIOB->OTYPER |= (GPIO_OTYPER_OT_14 | GPIO_OTYPER_OT_13); // Output type: open drain + GPIOB->PUPDR &= ~(GPIO_PUPDR_PUPDR14_Msk | GPIO_PUPDR_PUPDR13_Msk); + GPIOB->PUPDR |= GPIO_PUPDR_PUPDR14_0 | GPIO_PUPDR_PUPDR13_0; // Enable Internal Pull up + + + // Enable I2C2 + RCC->APB1ENR |= RCC_APB1ENR_I2C2EN; // Eneable Clock + I2C2->CR1 &= ~I2C_CR1_PE; // Reset Periph. + //while(I2C2->CR1 & I2C_CR1_PE) {} + + I2C2->OAR1 = I2C_OAR1_OA1EN | (5 << 1); // Enable, Addr: 5 + I2C2->OAR2 = 0; + I2C2->CR1 |= I2C_CR1_NOSTRETCH; //Disable Clock stretching + I2C2->CR1 |= I2C_CR1_PE; // Enable Periph +*/ + + // GPIO CONFIG UART2 + RCC->AHBENR |= RCC_AHBENR_GPIOAEN; + GPIOA->MODER &= ~GPIO_MODER_MODER3_Msk; + GPIOA->MODER |= GPIO_MODER_MODER3_1; //GPIOA3 Alternate Function + GPIOA->AFR[0] &= ~GPIO_AFRL_AFSEL3_Msk; + GPIOA->AFR[0] |= 1 << GPIO_AFRL_AFSEL3_Pos; // AF1 -> UART2 + GPIOA->OTYPER |= GPIO_OTYPER_OT_3; + + // Enable UART2 + RCC->APB1ENR |= RCC_APB1ENR_USART2EN; + USART2->CR1 = 0; + USART2->CR2 = 0; + USART2->CR3 = 0; + + USART2->BRR = 48000000 / 115200; + //USART2->CR1 = USART_CR1_RE | USART_CR1_UE; + USART2->CR1 = USART_CR1_RXNEIE | USART_CR1_RE | USART_CR1_UE; + NVIC_EnableIRQ(USART2_IRQn); + uint16_t frame = 0b1001000000000000; // DAC128S085: Enable Write Through mode (Instant output change on write) HAL_SPI_Transmit(&hspi1, (uint8_t * ) & frame, 1, 100); @@ -241,6 +239,16 @@ int main(void) { /* USER CODE END WHILE */ /* USER CODE BEGIN 3 */ + //HAL_Delay(1000); + + GPIOA->ODR ^= 0x08; + + if (0) {//(USART2->ISR & USART_ISR_RXNE) { //(I2C2->ISR & I2C_ISR_ADDR) { + uint16_t v = USART2->RDR; + for(int i = 0; i < 12; i++) mem[i] = v; + for(int i = 0; i < 12; i+=2) mem[i] = 0xfff; + //mem[0] = 0xfff; mem[1] = 0xff; + } //if(dirty) { @@ -263,6 +271,30 @@ int main(void) { /* USER CODE END 3 */ } +volatile uint8_t uart_proto_state = 0; + +void USART2_IRQHandler(void) +{ + if (USART2->ISR & USART_ISR_RXNE) + { + uint16_t v = USART2->RDR; + if (uart_proto_state == 0) { + uart_proto_state = v; + if (v == 0) dirty = true; + }else{ + uint16_t idx = (uart_proto_state - 1) / 2; + if(uart_proto_state & 1) { + mem[idx] &= 0x00ff; + mem[idx] |= (v << 8) & 0xff00; + }else{ + mem[idx] &= 0xff00; + mem[idx] |= v & 0x00ff; + } + uart_proto_state = 0; + } + } +} + /** * @brief System Clock Configuration * @retval None