Merge branch 'dev' into ui

stm-firmware/include/reflow-controller/onewire-if.h

@@ -0,0 +1,34 @@
+/* Reflow Oven Controller
+*
+* Copyright (C) 2020  Mario Hüttel <mario.huettel@gmx.net>
+*
+* This file is part of the Reflow Oven Controller Project.
+*
+* The reflow oven controller is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+* The Reflow Oven Control Firmware is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with the reflow oven controller project.
+* If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef __ONEWIRE_IF_H__
+#define __ONEWIRE_IF_H__
+
+#include <stm-periph/uart.h>
+
+int onewire_if_init_uart(struct stm_uart *uart, uint32_t brr_val, USART_TypeDef *onewire_uart, volatile uint32_t *rcc_reg, uint8_t rcc_bit_num);
+
+void onewire_if_disable(struct stm_uart *uart);
+
+int onewire_if_send_byte(struct stm_uart *uart);
+
+int onewire_if_receive_byte(struct stm_uart *uart);
+
+#endif /* __ONEWIRE_IF_H__ */

stm-firmware/include/reflow-controller/onewire-temp-sensors.h

@@ -0,0 +1,47 @@
+/* Reflow Oven Controller
+*
+* Copyright (C) 2020  Mario Hüttel <mario.huettel@gmx.net>
+*
+* This file is part of the Reflow Oven Controller Project.
+*
+* The reflow oven controller is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License version 2 as
+* published by the Free Software Foundation.
+*
+* The Reflow Oven Control Firmware is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with the reflow oven controller project.
+* If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <stddef.h>
+#include <stdint.h>
+
+#ifndef __ONEWIRE_TEMP_SENSORS_H__
+#define __ONEWIRE_TEMP_SENSORS_H__
+
+#define ONEWIRE_TEMP_PORT GPIOB
+#define ONEWIRE_TEMP_RCC_MASK RCC_AHB1ENR_GPIOBEN
+#define ONEWIRE_TEMP_TX_PIN 10U
+#define ONEWIRE_TEMP_RX_PIN 11U
+#define ONEWIRE_TEMP_AF_NUM 7U
+
+#define ONEWIRE_UART_DEV USART3
+
+void onewire_temp_sensors_setup_hw();
+
+/**
+ * @brief onewire_temp_sensors_discover
+ * @param id_list
+ * @param list_len
+ * @return Negative: error, >= 0: amount of discovered sensors
+ */
+int onewire_temp_sensors_discover(uint32_t *id_list, size_t list_len);
+
+float onewire_temp_sensor_read_temp(uint32_t id);
+
+#endif /* __ONEWIRE_TEMP_SENSORS_H__ */

stm-firmware/include/reflow-controller/shell-uart-config.h

@@ -0,0 +1,33 @@
+#ifndef __SHELL_UART_CONFIG_H__
+#define __SHELL_UART_CONFIG_H__
+
+#define SHELL_UART_RECEIVE_DMA_STREAM DMA2_Stream5
+
+#define SHELL_UART_SEND_DMA_STREAM DMA2_Stream7
+
+#define SHELL_UART_PERIPH USART1
+#define SHELL_UART_RCC_REG RCC->APB2ENR
+#define SHELL_UART_RCC_MASK RCC_APB2ENR_USART1EN
+
+#define SHELL_UART_RX_DMA_TRIGGER 4U
+#define SHELL_UART_TX_DMA_TRIGGER 4U
+
+#ifdef DEBUGBUILD
+
+#define SHELL_UART_PORT GPIOA
+#define SHELL_UART_PORT_RCC_MASK RCC_AHB1ENR_GPIOAEN
+#define SHELL_UART_RX_PIN 10
+#define SHELL_UART_TX_PIN 9
+#define SHELL_UART_RX_PIN_ALTFUNC 7
+#define SHELL_UART_TX_PIN_ALTFUNC 7
+#else
+
+#endif
+
+/* UART_DIV is 45.5625 => 115200 @ 84 MHz */
+#define SHELL_UART_DIV_FRACTION 9U /* Equals 9/16 = 0.5625 */
+#define SHELL_UART_DIV_MANTISSA 45U /* Equals 45 */
+
+#define SHELL_UART_BRR_REG_VALUE ((SHELL_UART_DIV_MANTISSA<<4) | SHELL_UART_DIV_FRACTION);
+
+#endif /* __SHELL_UART_CONFIG_H__ */

stm-firmware/include/reflow-controller/shell.h

@@ -24,7 +24,7 @@
 #include <stddef.h>
 #include <shellmatta.h>
 
-shellmatta_handle_t shell_init(void);
+shellmatta_handle_t shell_init(shellmatta_write_t write_func);
 
 void shell_handle_input(shellmatta_handle_t shell, const char *data, size_t len);