Commit Graph

277 Commits

Author SHA1 Message Date
b65d94b0e8 Fix ADC measurement to run at 1000 Hz and fix wrong error handling for PT1000 Watchdog. Add function for flags to shell 2020-07-28 22:55:02 +02:00
97fc04399e Fix recursion loop in safety controller 2020-07-28 21:00:37 +02:00
da96daa767 Reworked measurement ADC to use safety controller 2020-07-27 22:15:01 +02:00
a9e300bf5b Make error structures volatile 2020-07-27 21:32:25 +02:00
4f3016649d First draft of safety controller 2020-07-27 21:29:15 +02:00
a04e894518 Further work on safety controller 2020-07-26 21:40:09 +02:00
9136dc196c Further rewrite safety handling 2020-07-09 22:31:42 +02:00
5eb51f08b6 Start safety implementation. Completely dumped old stuff 2020-07-07 20:47:22 +02:00
06a75559f0 Add structure for safety controller config. 2020-07-07 19:26:00 +02:00
248707055e Fix watchdog init code 2020-07-06 21:37:36 +02:00
67a32cdc20 Safety Controller:
* Add watchdog code
* Add file structure for safety controller
* Lay groundstones to move all error flags to the safety controller
* Improve doxygen
2020-07-06 21:12:18 +02:00
8a365ab5e0 Move safety ADC to safety subfolder 2020-07-06 20:13:01 +02:00
7cd05e1582 Update shellmatta 2020-06-25 23:54:36 +02:00
0e97d57883 Improve menu function 2020-06-25 23:52:58 +02:00
cced874460 Add Pullup to uart RX pin 2020-06-21 01:29:50 +02:00
49927a25cf Add Omega as unit for Ohm in LCD menu 2020-06-16 20:05:32 +02:00
a7c91cee0e GUI: About menu: Add '[DEBUG]' text if code is build in debug mode 2020-06-15 22:00:47 +02:00
acbde24c2f Makefile: Add program-debug option for flashing debug elf 2020-06-15 21:57:36 +02:00
47d8df052a Makefile: Make a separate memory mapfile for each build configuration (release or debug) 2020-06-15 21:48:37 +02:00
3705cc09d1 SDIO driver: Fix minor issues in SDIO driver 2020-06-15 21:31:49 +02:00
ecd8d2537d Append -release to release output elf 2020-06-15 21:24:27 +02:00
56439a3b13 Makefile: Add differnet targets for debug and release builds 2020-06-15 21:22:05 +02:00
78417e0c8c Progress in error handling 2020-06-14 23:36:49 +02:00
62a3e06baa Fixx style problems and design errors in main.c 2020-06-14 23:22:35 +02:00
485b887b54 fix too long lines 2020-06-14 22:56:34 +02:00
fe75b93ec7 Fix logical or operator 2020-06-14 20:26:32 +02:00
ab157bfb5a Fix empty line 2020-06-14 19:15:02 +02:00
f0bf10d91d use correct LED for error blinking 2020-06-14 19:13:50 +02:00
cbd28f9a12 Add safety management in PID handler and main loop 2020-06-14 19:10:09 +02:00
a33154b2d0 Move shadow buffer of LCD to CCMRAM 2020-06-14 18:02:45 +02:00
828b47f3be Fix error in power handling of LCD FSM 2020-06-14 17:52:27 +02:00
7b426c93c9 About GUI menu: Improve rotary handling 2020-06-14 16:26:32 +02:00
20fd7b41e6 Edit about menu: Add new entry for serial number and compile info 2020-06-14 16:19:42 +02:00
f60545f664 make convenience pointer to global structs const 2020-06-14 14:50:27 +02:00
679d4534cb Add formatted prinbt function for LCD menu and use systick vonversion in uptime shell command 2020-06-14 14:45:58 +02:00
372be53471 make uptime in LCD UI use systick function for converting uptime 2020-06-14 14:16:12 +02:00
0cdc7448e4 Systick: Add function to calculate uptime in days, hours, minutes, and seconds from global tick 2020-06-14 13:35:47 +02:00
43b4fd1e77 Changes for menu
* Make Systick a 100us Timer. Millisecond ticks are still untouched.
* LCD now has a 100us resolution tick
* LCD uses 500us delay for waitstate
* Make 'About' menu verbose:
	* Add 3 page menu
	* 1st page: Generic info
	* 2nd page: Version info
	* 3rd page: Uptime in seconds
2020-06-14 13:25:47 +02:00
d178910594 Fix last change to make controller WFI in LCD_FMS_NOP state 2020-06-14 01:34:42 +02:00
6f4363e021 Change return value of reflow_menu_handle 2020-06-14 01:31:44 +02:00
0fca4c6c20 LCD Timing changes 2020-06-14 01:04:21 +02:00
7595e6ced8 Fix smaller code mistake in LCD FSM 2020-06-13 23:37:04 +02:00
2547c134f2 Add PID controller to oven driver module 2020-06-13 23:23:59 +02:00
a6dc4f9b46 Add about command to menu and restructure code. Delete preliminary code from mainloop. Better code will follow 2020-06-13 22:47:45 +02:00
e627cb67a5 fix smaller bugs in Menu code and implement first test of main menu with one functional sunbmenu for the safety parameters 2020-06-12 01:35:37 +02:00
d6e489bb61 Add defines for special LCD characters 2020-06-11 23:58:51 +02:00
3b2d8c14c3 Change division to multiplication in floating point operation 2020-06-09 23:01:04 +02:00
949d16cd03 Add display buffer to ccm ram 2020-06-09 22:53:13 +02:00
917497e7e4 implement display update function for lcd menu 2020-06-09 22:50:20 +02:00
7db5f02067 implemnt scrollable menu field. Not yet tested 2020-06-09 22:43:00 +02:00
70730fd0f0 Add qtproejct target to Makefile which generates a usable qtcreator project folder 2020-06-09 21:50:37 +02:00
c63986e271 Add further testing code for rotary encoder and lcd 2020-06-09 19:03:33 +02:00
9615fdb39d Further menu implementations 2020-06-04 21:53:00 +02:00
fc2372f754 Fix possible error in menu implementation 2020-06-04 21:47:31 +02:00
92c0c5cd8c shrink shellmatta history buffer 2020-06-04 21:46:45 +02:00
25bb341fa4 Implement preliminary menu functions 2020-06-04 21:20:59 +02:00
0d44d25ec9 Add reminder to implement checking of safety ADC 2020-06-04 21:20:43 +02:00
6b4029f8c2 Make startup file unix like and add a hardcoded enable for the FPU 2020-06-04 21:20:17 +02:00
76f5a4e9be Fix error in safety ADC 2020-06-01 22:59:27 +02:00
f493b823b3 Add lcd-menu module as specific implementation module for the menu on the LCD 2020-06-01 21:45:36 +02:00
d508402aa8 Add basic definitions for menu entries 2020-06-01 21:42:31 +02:00
6477950eea Merge branch 'dev' into ui 2020-06-01 20:53:43 +02:00
5819a0736c Add defines for safety adc conversions 2020-06-01 20:53:28 +02:00
f956968cb4 Make reading the global ms tick atomic in order to prevent glitches 2020-06-01 20:45:27 +02:00
1751db31c5 Fix typo 2020-06-01 20:44:58 +02:00
e659c6d097 make PID controller mathemtaically correct 2020-05-25 01:56:54 +02:00
355e81ba44 Add multitone support for loudspeaker 2020-05-24 23:35:17 +02:00
c18acba48b Merge branch 'dev' into ui 2020-05-16 21:08:24 +02:00
e97092042b Add preliminary safety ADC which measures the Controller temperature and checks the reference voltage against the STM's internal reference voltage 2020-05-16 21:00:55 +02:00
dc8beefb63 Move PT1000 Measurement from ADC1 to ADC3 in order to make ADC1 free for Safety ADC implementation 2020-05-16 20:59:51 +02:00
6c013d5aa3 Merge branch 'dev' into ui 2020-05-11 21:59:25 +02:00
2614cea431 Make claibration routine non blocking 2020-05-11 21:59:08 +02:00
b9857745b1 Fix parentheses in macros 2020-05-11 21:52:11 +02:00
13bdd6b8eb Cleanup main function 2020-05-11 21:51:32 +02:00
0b83125ab5 Merge branch 'dev' into ui 2020-05-10 23:13:47 +02:00
8d6c81441d Add oven PWM controller 2020-05-10 23:13:03 +02:00
5fcb5305f8 Implement dummy for calibration save function 2020-05-09 20:51:30 +02:00
d6d8973800 Fix typo in comment 2020-05-09 20:51:06 +02:00
99ae5f9bc1 Add lcd to menu 2020-05-09 20:50:15 +02:00
4f05c084d9 Make ptdump command async: Main loop will continue if comamnd is called 2020-05-09 20:40:31 +02:00
8f2418eb7c Merge branch 'dev' into ui 2020-05-09 20:01:56 +02:00
a25d3bc8c9 make display faster 2020-05-09 19:56:47 +02:00
8a0572d698 Move main loop implementation torwards target 2020-05-05 18:55:55 +02:00
2187c1a712 Write a few doxygen headers 2020-05-05 18:19:49 +02:00
60602008d4 Update 'stm-firmware/ui/lcd.c' 2020-05-05 08:07:24 +02:00
04389b1df6 Use correct format specifier in printf for uint32_t 2020-05-05 00:01:09 +02:00
90da880386 Makefile: Cleanup whole obj/ dir when clean 2020-05-05 00:00:44 +02:00
bd82f55966 Show rotary encode value on display 2020-05-04 21:36:53 +02:00
3d48bfb6a6 Fix lenght of LCD from 20 chars to 16 chars 2020-05-04 21:36:37 +02:00
ea3d0121cc Add selected functions to optimization for faster interrupt handling 2020-05-04 21:31:02 +02:00
e2c2be6e30 Implement state machine controlled async LCD writing 2020-05-04 21:21:49 +02:00
df82f14206 Make LCD code working. Add FSM for LCD in order to write it in mainloop 2020-05-02 19:10:20 +02:00
e237776810 Fix parenthesis in macros 2020-05-02 19:09:17 +02:00
88062dc8e4 Add systick function that checks for passed ticks with correct wrap around 2020-05-02 19:06:42 +02:00
67899c8f02 Merge branch 'dev' into ui 2020-05-01 19:53:43 +02:00
cfaffc7d50 Update shellmatta to newset version 2020-05-01 19:52:46 +02:00
fe51c80248 Merge branch 'dev' into ui 2020-04-27 21:53:27 +02:00
e7106b54c4 Add cat command 2020-04-27 21:52:52 +02:00
119aa1b0ff Add main loop counter 2020-04-27 21:08:53 +02:00
415979e211 Merge branch 'dev' into ui 2020-04-27 20:20:03 +02:00