alejeune
|
7c6eb49e2c
|
update config file
|
1 year ago |
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
|
1 year ago |
alejeune
|
f455fed0de
|
added main timer
|
1 year ago |
joelimgu
|
7487e08f58
|
interrupt girouette
|
1 year ago |
joelimgu
|
c462af7535
|
Girouette defaillante
|
1 year ago |
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
|
1 year ago |
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
|
1 year ago |
joelimgu
|
cc9194aa8f
|
EXTI0 PB0
|
1 year ago |
alejeune
|
37c4222374
|
fin UART telecommande et batterie et moteur plateau
|
1 year ago |
joelimgu
|
117a40bad4
|
voile finie!
|
1 year ago |
joelimgu
|
1426897f2e
|
Servo
|
1 year ago |
joelimgu
|
1f33eb62e8
|
Driver Girouette Setup
|
1 year ago |
joelimgu
|
deaf1c5b9c
|
Arr = 360
|
1 year ago |
alejeune
|
43cb31a9ac
|
Init du .h de la telecommande
|
1 year ago |
alejeune
|
207ee64a7f
|
Driver plateau done untested
|
1 year ago |
joelimgu
|
ec7993d24b
|
encoder working
|
1 year ago |
alejeune
|
f2db597d97
|
Avancement du début de la config du plateau
|
1 year ago |
alejeune
|
f81610a89a
|
Début de la config du plateau
|
1 year ago |
joelimgu
|
31c1d3de43
|
added Get_Timer_Count function
|
1 year ago |
Newg
|
fe79171a55
|
correction d'une erreur
|
1 year ago |
Newg
|
7a1dd7bbdb
|
Update PWM Drivers
|
1 year ago |
alejeune
|
e6ac888a18
|
fin TP (on espère)
|
1 year ago |
alejeune
|
8c759be872
|
Version pré-Ex3
|
1 year ago |
raphael
|
93b9fb735c
|
first commit
|
1 year ago |
Raphael Lacroix
|
d83f845da7
|
Initial commit
|
1 year ago |