57 Commits

Author SHA1 Message Date
e77a74ea76 answer can without delay 2022-10-19 14:51:38 +02:00
7e51c00229 Merge branch 'new-PC' into 'master'
init new PC

See merge request coldbox/tec!2
2022-10-19 12:49:28 +00:00
952e36b3cb Merge branch 'master' into 'new-PC'
# Conflicts:
#   .mxproject
#   .vscode/c_cpp_properties.json
#   .vscode/settings.json
#   Core/Application/INIT_Initialization.c
#   Core/Application/MAIN_MainApplication.c
#   Core/Application/PECO_PeltierController.c
#   Core/Application/VARH_VariableHandler.c
#   Core/Application/VARH_VariableHandler.h
#   Core/Drivers/ANPI_AnalogPortsIn.c
#   Core/Drivers/CAND_CanDriver.c
#   Core/Drivers/CAND_CanDriver.h
#   Core/Drivers/TEMP_Temperature.c
#   Core/Drivers/TEMP_Temperature.h
#   Core/Inc/FreeRTOSConfig.h
#   Core/Inc/main.h
#   Core/Inc/stm32l4xx_hal_conf.h
#   Core/Inc/stm32l4xx_it.h
#   Core/Src/freertos.c
#   Core/Src/main.c
#   Core/Src/stm32l4xx_hal_msp.c
#   Core/Src/stm32l4xx_it.c
#   Core/Toolbox/UTIL_Utility.c
#   Core/Toolbox/UTIL_Utility.h
#   Makefile
#   PeltierControllerV3 Debug.launch
#   PeltierControllerV3.ioc
#   STM32Make.make
2022-10-19 12:47:30 +00:00
b0e950332c init new PC 2022-10-19 14:34:01 +02:00
39607106d2 PECO update 2022-10-19 14:12:32 +02:00
ded2dc6ef9 PECO update temp 2022-10-19 14:12:04 +02:00
312f6fcf9c filters CAN bus 2022-07-07 18:19:51 +02:00
b8d62e02e0 Merge branch 'master' of https://gitlab.psi.ch/coldbox/tec 2022-07-07 18:00:32 +02:00
8cced68543 update headers 2022-07-07 18:00:11 +02:00
81781e568f Merge branch 'pique_n-master-patch-62057' into 'master'
Update README.md

See merge request coldbox/tec!1
2022-07-07 15:58:46 +00:00
349f230eff Update README.md 2022-07-07 15:57:46 +00:00
11e6c6a0fc implement watchdog raspi 2022-06-24 12:27:25 +02:00
96b27b020b error handler init, internal watchdog add 2022-06-22 14:54:21 +02:00
17ccf56463 can prot test final 2022-06-21 11:58:13 +02:00
8521a34897 update can protocol 2022-06-21 11:34:45 +02:00
2d99902346 edit userflash, not used yet 2022-06-10 15:44:37 +02:00
315b3ad752 Merge branch 'master' of https://gitlab.psi.ch/coldbox/tec 2022-06-10 15:40:55 +02:00
75840c7d51 update new protocol and new hardware 2022-06-10 15:40:49 +02:00
8524c59f17 Update USFL_UserFlash.c 2022-05-08 15:14:35 +02:00
d6e9c78497 New Can protocol implemented 2022-01-20 16:01:04 +01:00
5ed17f4c4d protocol change 2022-01-20 14:51:37 +01:00
a9286b1b92 del warnings 2022-01-20 13:32:35 +01:00
Noah Piqué
c6deb28e5d add vs code 2022-01-20 13:12:28 +01:00
fd665a9d94 canbus adding filters 2022-01-20 12:39:41 +01:00
852f344c7f New VARH einbinden + Code verschönern,syntax check 2022-01-14 17:06:48 +01:00
c05923444e update header 2022-01-14 15:41:56 +01:00
a46f4eb1f7 update header 2022-01-14 15:41:22 +01:00
a0088db532 add VARH functions seperate type 2022-01-14 15:40:52 +01:00
Noah Piqué
1ca4418292 change calculation 2022-01-13 16:20:58 +01:00
Noah Piqué
07bf51be74 build complete 2022-01-13 08:15:52 +01:00
26522970e7 implemented PID Loop 2022-01-09 14:23:22 +01:00
ff5a05d32b add VARH to PECO 2021-12-21 16:51:13 +01:00
3464b100f3 Add Vars and PECO_Cycling 2021-12-21 16:50:49 +01:00
e4179d3f3e add Mode Var 2021-12-21 15:12:43 +01:00
Noah Piqué
00cb91d7b5 ANPI delete ControlVoltage 2021-12-17 17:39:31 +01:00
5dc13acb5c add ANPI to VARH 2021-12-17 17:30:41 +01:00
0a2750f3b6 change VARH system/normal set func, del notify 2021-12-17 16:58:46 +01:00
d85ece47b7 add flags to var array 2021-12-17 16:03:09 +01:00
4ab90de28a added Variablehandler for Temp 2021-12-15 13:57:58 +01:00
Noah Piqué
de0ddf839a added and changed the variable Handler 2021-12-10 11:23:47 +01:00
Noah Piqué
8672cb52c8 Add VARH Files 2021-12-10 09:00:22 +01:00
Noah Piqué
167f69a9cc delete old temp converter 2021-12-08 09:17:13 +01:00
Noah Piqué
53ec4e3f2b changes analog ports in 2021-12-01 16:11:28 +01:00
Noah Piqué
85d12f2da5 error deletinnng enum adc 2021-11-30 14:14:02 +01:00
Noah Piqué
c8bcffdc57 optimizing analog port in formula 2021-11-29 10:33:58 +01:00
Noah Piqué
7613d510fb hw patch voltage out
now hasthe calculation changed
2021-11-24 16:22:08 +01:00
Noah Piqué
4d3215d765 UserFlash Module add 2021-11-24 08:07:52 +01:00
Noah Piqué
d7b1b28616 bugs offset measurements 2021-11-19 15:29:10 +01:00
Noah Piqué
8c54032298 ADC Fault Detection (not tested yet) 2021-11-17 16:27:30 +01:00
Noah Piqué
d4516f83d2 add PECO Timer & Task 2021-11-17 15:25:31 +01:00