rlacroix
|
a8bbc5600c
|
Merge remote-tracking branch 'origin/Heure'
# Conflicts:
# Listings/Projet1_Simulation.map
# Objects/Projet1_Réel.dep
# Objects/Projet1_Simulation.axf
# Objects/Projet1_Simulation.build_log.htm
# Objects/Projet1_Simulation.htm
# Objects/batterie.o
# Objects/driver_gpio.o
# Objects/main.crf
# Objects/main.o
# Objects/myadc.o
# Objects/mygirouette.crf
# Objects/mygirouette.o
# Objects/mytimer.o
# Objects/myvoile.o
# Objects/plateau.o
# Objects/system_stm32f10x.o
# Objects/telecommande.o
|
2022-11-25 16:47:48 +01:00 |
|
alejeune
|
f455fed0de
|
added main timer
|
2022-11-25 16:41:48 +01:00 |
|
joelimgu
|
7487e08f58
|
interrupt girouette
|
2022-11-25 16:11:27 +01:00 |
|
joelimgu
|
c462af7535
|
Girouette defaillante
|
2022-11-14 18:59:43 +01:00 |
|
Newg
|
4a8421eb37
|
Merge remote-tracking branch 'origin/girouette'
# Conflicts:
# FileInclude/MyTimer.c
# Listings/Projet1_Simulation.map
# Listings/startup_stm32f10x_md.lst
# Objects/Projet1_Réel.dep
# Objects/Projet1_SImulation.dep
# Objects/Projet1_Simulation.axf
# Objects/Projet1_Simulation.build_log.htm
# Objects/Projet1_Simulation.htm
# Objects/Projet1_Simulation.lnp
# Objects/driver_gpio.crf
# Objects/driver_gpio.d
# Objects/driver_gpio.o
# Objects/main.crf
# Objects/main.d
# Objects/main.o
# Objects/myadc.crf
# Objects/myadc.d
# Objects/myadc.o
# Objects/mytimer.crf
# Objects/mytimer.d
# Objects/mytimer.o
# Objects/startup_stm32f10x_md.o
# Objects/system_stm32f10x.crf
# Objects/system_stm32f10x.d
# Objects/system_stm32f10x.o
# Projet1.uvoptx
# Projet1.uvprojx
# RTE/Device/STM32F103RB/system_stm32f10x.c
# Sources/main.c
|
2022-11-14 18:45:28 +01:00 |
|
Newg
|
b0ee0b6acd
|
Merge remote-tracking branch 'origin/Telecommande-Plateau'
# Conflicts:
# FileInclude/MyTimer.c
# FileInclude/MyTimer.h
# Objects/main.crf
# Objects/main.d
# Objects/main.o
# Projet1.uvoptx
# Projet1.uvprojx
|
2022-11-14 18:34:28 +01:00 |
|
joelimgu
|
cc9194aa8f
|
EXTI0 PB0
|
2022-11-14 18:29:14 +01:00 |
|
alejeune
|
37c4222374
|
fin UART telecommande et batterie et moteur plateau
|
2022-11-14 17:50:04 +01:00 |
|
joelimgu
|
117a40bad4
|
voile finie!
|
2022-11-07 11:57:14 +01:00 |
|
joelimgu
|
1426897f2e
|
Servo
|
2022-10-28 15:23:39 +02:00 |
|
joelimgu
|
1f33eb62e8
|
Driver Girouette Setup
|
2022-10-28 13:24:00 +02:00 |
|
alejeune
|
43cb31a9ac
|
Init du .h de la telecommande
|
2022-10-28 10:34:41 +02:00 |
|
alejeune
|
207ee64a7f
|
Driver plateau done untested
|
2022-10-28 10:04:14 +02:00 |
|
alejeune
|
f2db597d97
|
Avancement du début de la config du plateau
|
2022-10-21 18:13:51 +02:00 |
|
alejeune
|
f81610a89a
|
Début de la config du plateau
|
2022-10-21 17:04:57 +02:00 |
|
joelimgu
|
31c1d3de43
|
added Get_Timer_Count function
|
2022-10-21 16:49:52 +02:00 |
|
Newg
|
7a1dd7bbdb
|
Update PWM Drivers
|
2022-10-21 16:25:45 +02:00 |
|
alejeune
|
e6ac888a18
|
fin TP (on espère)
|
2022-10-14 15:09:31 +02:00 |
|
alejeune
|
8c759be872
|
Version pré-Ex3
|
2022-10-14 13:00:20 +02:00 |
|