Merge branch 'dev' into ui
This commit is contained in:
		| @@ -59,6 +59,12 @@ | ||||
|  */ | ||||
| #define ADC_PT1000_UPPER_WATCHDOG 4000U | ||||
|  | ||||
| /** | ||||
|  * @brief Number of ADC samples the value has to be outside the Watchdog limit (@ref ADC_PT1000_UPPER_WATCHDOG and @ref ADC_PT1000_LOWER_WATCHDOG) | ||||
|  * in order to produce a watchdog error | ||||
|  */ | ||||
| #define ADC_PT1000_WATCHDOG_SAMPLE_COUNT 25U | ||||
|  | ||||
| enum adc_pt1000_error {ADC_PT1000_NO_ERR= 0, ADC_PT1000_WATCHDOG_ERROR=(1UL<<0), ADC_PT1000_OVERFLOW=(1UL<<1), ADC_PT1000_INACTIVE = (1UL<<2)}; | ||||
|  | ||||
| /** | ||||
|   | ||||
| @@ -0,0 +1,24 @@ | ||||
| /* 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 __SETTINGS_SETTINGS_SD_CARD_H__ | ||||
| #define __SETTINGS_SETTINGS_SD_CARD_H__ | ||||
|  | ||||
| #endif /* __SETTINGS_SETTINGS_SD_CARD_H__ */ | ||||
							
								
								
									
										27
									
								
								stm-firmware/include/reflow-controller/settings/settings.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								stm-firmware/include/reflow-controller/settings/settings.h
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,27 @@ | ||||
| /* 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 __SETTINGS_SETTINGS_H__ | ||||
| #define __SETTINGS_SETTINGS_H__ | ||||
|  | ||||
| settings_save_calibration(); | ||||
|  | ||||
| #endif /* __SETTINGS_SETTINGS_H__ */ | ||||
| @@ -30,4 +30,6 @@ void shell_handle_input(shellmatta_handle_t shell, const char *data, size_t len) | ||||
|  | ||||
| void shell_print_string(shellmatta_handle_t shell, const char *string); | ||||
|  | ||||
| void shell_print_motd(shellmatta_handle_t shell); | ||||
|  | ||||
| #endif /* __SHELL_H__ */ | ||||
|   | ||||
| @@ -29,6 +29,18 @@ int32_t stack_check_get_usage(); | ||||
|  | ||||
| int32_t stack_check_get_free(); | ||||
|  | ||||
| static inline int stack_check_collision() | ||||
| { | ||||
| 	int ret = 0; | ||||
| 	int32_t free_space = stack_check_get_free(); | ||||
|  | ||||
| 	if ((unsigned int)free_space < STACK_CHECK_MIN_HEAP_GAP) { | ||||
| 			ret = -1; | ||||
| 	} | ||||
|  | ||||
| 	return ret; | ||||
| } | ||||
|  | ||||
| static inline uint32_t read_stack_pointer() | ||||
| { | ||||
| 	uint32_t stack_pointer; | ||||
|   | ||||
| @@ -8,7 +8,7 @@ | ||||
|  * it under the terms of the GNU General Public License version 2 as | ||||
|  * published by the Free Software Foundation. | ||||
|  * | ||||
|  * GDSII-Converter is distributed in the hope that it will be useful, | ||||
|  * 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. | ||||
|   | ||||
		Reference in New Issue
	
	Block a user