Commit Graph

274 Commits

Author SHA1 Message Date
Mario Hüttel 372be53471 make uptime in LCD UI use systick function for converting uptime 2020-06-14 14:16:12 +02:00
Mario Hüttel 0cdc7448e4 Systick: Add function to calculate uptime in days, hours, minutes, and seconds from global tick 2020-06-14 13:35:47 +02:00
Mario Hüttel 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
Mario Hüttel d178910594 Fix last change to make controller WFI in LCD_FMS_NOP state 2020-06-14 01:34:42 +02:00
Mario Hüttel 6f4363e021 Change return value of reflow_menu_handle 2020-06-14 01:31:44 +02:00
Mario Hüttel 0fca4c6c20 LCD Timing changes 2020-06-14 01:04:21 +02:00
Mario Hüttel 7595e6ced8 Fix smaller code mistake in LCD FSM 2020-06-13 23:37:04 +02:00
Mario Hüttel 2547c134f2 Add PID controller to oven driver module 2020-06-13 23:23:59 +02:00
Mario Hüttel 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
Mario Hüttel 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
Mario Hüttel d6e489bb61 Add defines for special LCD characters 2020-06-11 23:58:51 +02:00
Mario Hüttel 3b2d8c14c3 Change division to multiplication in floating point operation 2020-06-09 23:01:04 +02:00
Mario Hüttel 9f0d81cc76 Merge branch 'dev' into ui 2020-06-09 22:59:20 +02:00
Mario Hüttel b9c1968dc4 Merge branch 'master' into dev 2020-06-09 22:58:56 +02:00
Mario Hüttel 7553cfa310 Add qtproejct target to Makefile which generates a usable qtcreator project folder 2020-06-09 22:58:17 +02:00
Mario Hüttel af04da6eca update to new shellmatta 2020-06-09 22:55:53 +02:00
Mario Hüttel 949d16cd03 Add display buffer to ccm ram 2020-06-09 22:53:13 +02:00
Mario Hüttel 917497e7e4 implement display update function for lcd menu 2020-06-09 22:50:20 +02:00
Mario Hüttel 7db5f02067 implemnt scrollable menu field. Not yet tested 2020-06-09 22:43:00 +02:00
Mario Hüttel 3c3715effa Merge branch 'dev' into ui 2020-06-09 21:56:02 +02:00
Mario Hüttel a016681d08 Merge branch 'dev' of git.shimatta.de:mhu/reflow-oven-control-sw into dev 2020-06-09 21:52:17 +02:00
Mario Hüttel 5fc4220ecf Add qtproejct target to Makefile which generates a usable qtcreator project folder 2020-06-09 21:51:33 +02:00
Mario Hüttel 70730fd0f0 Add qtproejct target to Makefile which generates a usable qtcreator project folder 2020-06-09 21:50:37 +02:00
Mario Hüttel c63986e271 Add further testing code for rotary encoder and lcd 2020-06-09 19:03:33 +02:00
Mario Hüttel 9615fdb39d Further menu implementations 2020-06-04 21:53:00 +02:00
Mario Hüttel fc2372f754 Fix possible error in menu implementation 2020-06-04 21:47:31 +02:00
Mario Hüttel 92c0c5cd8c shrink shellmatta history buffer 2020-06-04 21:46:45 +02:00
Mario Hüttel 25bb341fa4 Implement preliminary menu functions 2020-06-04 21:20:59 +02:00
Mario Hüttel 0d44d25ec9 Add reminder to implement checking of safety ADC 2020-06-04 21:20:43 +02:00
Mario Hüttel 6b4029f8c2 Make startup file unix like and add a hardcoded enable for the FPU 2020-06-04 21:20:17 +02:00
Mario Hüttel 76f5a4e9be Fix error in safety ADC 2020-06-01 22:59:27 +02:00
Mario Hüttel f493b823b3 Add lcd-menu module as specific implementation module for the menu on the LCD 2020-06-01 21:45:36 +02:00
Mario Hüttel d508402aa8 Add basic definitions for menu entries 2020-06-01 21:42:31 +02:00
Mario Hüttel 6477950eea Merge branch 'dev' into ui 2020-06-01 20:53:43 +02:00
Mario Hüttel 5819a0736c Add defines for safety adc conversions 2020-06-01 20:53:28 +02:00
Mario Hüttel f956968cb4 Make reading the global ms tick atomic in order to prevent glitches 2020-06-01 20:45:27 +02:00
Mario Hüttel 1751db31c5 Fix typo 2020-06-01 20:44:58 +02:00
Mario Hüttel e659c6d097 make PID controller mathemtaically correct 2020-05-25 01:56:54 +02:00
Mario Hüttel 355e81ba44 Add multitone support for loudspeaker 2020-05-24 23:35:17 +02:00
Mario Hüttel c18acba48b Merge branch 'dev' into ui 2020-05-16 21:08:24 +02:00
Mario Hüttel 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
Mario Hüttel 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
Mario Hüttel b9b899b4f6 Edit test calculations in jupyter notebook 2020-05-16 20:58:49 +02:00
Mario Hüttel 6c013d5aa3 Merge branch 'dev' into ui 2020-05-11 21:59:25 +02:00
Mario Hüttel 2614cea431 Make claibration routine non blocking 2020-05-11 21:59:08 +02:00
Mario Hüttel b9857745b1 Fix parentheses in macros 2020-05-11 21:52:11 +02:00
Mario Hüttel 13bdd6b8eb Cleanup main function 2020-05-11 21:51:32 +02:00
Mario Hüttel 0b83125ab5 Merge branch 'dev' into ui 2020-05-10 23:13:47 +02:00
Mario Hüttel 8d6c81441d Add oven PWM controller 2020-05-10 23:13:03 +02:00
Mario Hüttel 5fcb5305f8 Implement dummy for calibration save function 2020-05-09 20:51:30 +02:00