forked from acco/chti23
Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
7f62cad9a7 |
30 changed files with 530 additions and 3526 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -108,3 +108,4 @@ RTE
|
||||||
|
|
||||||
# To explicitly override the above, define any exceptions here; e.g.:
|
# To explicitly override the above, define any exceptions here; e.g.:
|
||||||
# !my_customized_scatter_file.sct
|
# !my_customized_scatter_file.sct
|
||||||
|
*.slprj
|
||||||
31
scriptDFT.m
31
scriptDFT.m
|
|
@ -1,31 +0,0 @@
|
||||||
close all;
|
|
||||||
T = 1/7; %durée d'obs = M*Te. On doit avoir T = k*To = k*Tsin
|
|
||||||
M = 32;
|
|
||||||
Te = T/M;
|
|
||||||
Fe = 1/Te;
|
|
||||||
deltaF = Fe/M; % pas fréquentiel
|
|
||||||
Tsim = T-Te; %durée de la simulation
|
|
||||||
Fsin = 14; %Fsin = Fo --> fréq du sinus
|
|
||||||
Res=sim('simulDFT');
|
|
||||||
figure(1);
|
|
||||||
plot(Res.Sinus_Continu);
|
|
||||||
hold on; % permet de superposer la courbe à suivre
|
|
||||||
plot(Res.Sinus_Echanti,'o');
|
|
||||||
grid;
|
|
||||||
title('signaux temporels');
|
|
||||||
%help fft;
|
|
||||||
figure(2);
|
|
||||||
yt = fft(Res.Sinus_Echanti.Data);
|
|
||||||
stem(abs(yt)/M);
|
|
||||||
grid;
|
|
||||||
figure(3);
|
|
||||||
xt = linspace(0,31,32);
|
|
||||||
stem(xt,abs(yt)/M);
|
|
||||||
grid;
|
|
||||||
figure(4);
|
|
||||||
x = deltaF*[0:1:M-1];
|
|
||||||
y = fft(Res.Sinus_Echanti.Data);
|
|
||||||
stem(x,abs(y)/M);
|
|
||||||
grid;
|
|
||||||
title('module de la tfd');
|
|
||||||
|
|
||||||
26
scriptq3_2.m
26
scriptq3_2.m
|
|
@ -1,26 +0,0 @@
|
||||||
close all;
|
|
||||||
T = 0.0002;
|
|
||||||
t1=T/5;
|
|
||||||
Fe = 320000;
|
|
||||||
Te = 1/Fe;
|
|
||||||
Tsim = T-Te;
|
|
||||||
M = 64;
|
|
||||||
deltaF = 5000;
|
|
||||||
F1 = 85005.9;
|
|
||||||
F2 = 90000;
|
|
||||||
F3 = 94986.8;
|
|
||||||
F4 = 100000;
|
|
||||||
F5 = 115015.9;
|
|
||||||
F6 = 120000;
|
|
||||||
Res=sim('simul3_2');
|
|
||||||
|
|
||||||
figure(1);
|
|
||||||
plot(Res.Sinus_Echanti);
|
|
||||||
grid;
|
|
||||||
title('tracé temporel');
|
|
||||||
|
|
||||||
freq =deltaF*[0:1:M-1];
|
|
||||||
yt = fft(Res.Sinus_Echanti.Data);
|
|
||||||
figure(2);
|
|
||||||
stem(freq,abs(yt)/M,'r*');
|
|
||||||
grid;
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
close all;
|
|
||||||
T = 0.0002;
|
|
||||||
Fe = 320000;
|
|
||||||
Te = 1/Fe;
|
|
||||||
Tsim = T-Te;
|
|
||||||
M = 64;
|
|
||||||
deltaF = 5000;
|
|
||||||
|
|
||||||
Res=sim('simul_carre');
|
|
||||||
|
|
||||||
figure(1);
|
|
||||||
plot(Res.Sinus_Echanti);
|
|
||||||
grid;
|
|
||||||
title('tracé temporel');
|
|
||||||
|
|
||||||
freq =deltaF*[0:1:M-1];
|
|
||||||
yt = fft(Res.Sinus_Echanti.Data);
|
|
||||||
figure(2);
|
|
||||||
stem(freq,abs(yt)/M,'r*');
|
|
||||||
grid;
|
|
||||||
|
|
||||||
figure(3);
|
|
||||||
num = [1];
|
|
||||||
den = [1.783*10.^(-23) 7.6663*10.^(-18) 1.162*10.^(-11) 3.0332*10.^(-6) 1];
|
|
||||||
h = tf(num,den);
|
|
||||||
bode(h);
|
|
||||||
|
|
@ -1,31 +1,40 @@
|
||||||
clear all;
|
clear all;
|
||||||
close all;
|
close all;
|
||||||
|
%% Paramêtres utilisatrice
|
||||||
|
%
|
||||||
|
|
||||||
%% Paramètres
|
T = 0.25; % Fenêtre d'observation [s]
|
||||||
T = 0.25; % Fenêtre d'observation
|
M=32; % Nombre d'échantillons dans la fenêtre
|
||||||
M=32; % Nombre d'échantillons dans la fenêtre
|
Fsin = 4 ; % Fréquence d'un sinus [Hz]
|
||||||
|
%% Paramêtres déduits
|
||||||
|
|
||||||
%% Paramètres déduits
|
|
||||||
Te = T/M; % Période d'échantillonnage
|
|
||||||
Tsim = T-Te; % Instant final de simulation
|
|
||||||
Fsin = 4 ;
|
|
||||||
%% Calculs préliminaires
|
|
||||||
|
|
||||||
|
|
||||||
|
Te = T/M; % Période d'échantillonnage [s]
|
||||||
|
Tsim = T-Te; % Instant final de simulation avec M points [s]
|
||||||
|
fprintf("Fréquence = %f Hz", 1/Te)
|
||||||
|
%% Calculs préliminaires
|
||||||
%% Lancement de simulink
|
%% Lancement de simulink
|
||||||
out=sim("simDFT")
|
|
||||||
|
|
||||||
|
tic
|
||||||
|
out=sim("simDFT");
|
||||||
|
toc
|
||||||
%% Visualisations temporelle
|
%% Visualisations temporelle
|
||||||
|
|
||||||
plot(out.sin_continu,'.-');
|
plot(out.sin_continu,'.-');
|
||||||
hold on;
|
hold on;
|
||||||
plot(out.sin_echanti,'o');
|
|
||||||
grid on;
|
|
||||||
|
|
||||||
|
t = out.sin_echanti.Time;
|
||||||
|
sig = out.sin_echanti.Data;
|
||||||
|
|
||||||
|
stem(t, sig , 'o');
|
||||||
|
grid on;
|
||||||
%% Calcul DFT
|
%% Calcul DFT
|
||||||
|
|
||||||
|
Tfd = fft(sig);
|
||||||
|
abscisses=1:length(Tfd);
|
||||||
|
|
||||||
%% visualisation DFT
|
%% visualisation DFT
|
||||||
figure();
|
|
||||||
|
|
||||||
|
|
||||||
|
figure()
|
||||||
|
plot(abscisses,abs(Tfd),'o-');
|
||||||
|
ylabel("Module Transformée de Fourier")
|
||||||
|
xlabel("??? indices de tableau Matlab de 1 à 32 ???")
|
||||||
BIN
signal/matlab/scriptDFT.mlx
Normal file
BIN
signal/matlab/scriptDFT.mlx
Normal file
Binary file not shown.
Binary file not shown.
|
|
@ -1,345 +0,0 @@
|
||||||
/**
|
|
||||||
* Bibliotheque DriverJeuLaser (ancienne gassp72 adaptée 2021 - TR)
|
|
||||||
*
|
|
||||||
* GPIO - ADC - Sequenceur - System Timer - PWM - 72 MHz
|
|
||||||
* Modifs :
|
|
||||||
* enlèvement de tout ce qui est inutile dans le .h
|
|
||||||
* ajout de fonctions GPIO dans le .c pour utilisation en ASM ou en C :
|
|
||||||
* - GPIOA_Set(char Broche), GPIOB_Set(char Broche), GPIOC_Set(char Broche)
|
|
||||||
* - GPIOA_Clear(char Broche), GPIOB_Clear(char Broche), GPIOC_Clear(char Broche)
|
|
||||||
*
|
|
||||||
* ajout d'une fonction qui impose une valeur de PWM (TIM3_CCR3)
|
|
||||||
* PWM_Set_Value_On_TIM3_C3( int Val)
|
|
||||||
* permet en ASM ou en C de fixer la valeur de PWM
|
|
||||||
|
|
||||||
* Ajout de commentaires
|
|
||||||
|
|
||||||
*/
|
|
||||||
#ifndef DRIVERJEULASER_H__
|
|
||||||
#define DRIVERJEULASER_H__
|
|
||||||
|
|
||||||
#include "stm32f10x.h"
|
|
||||||
|
|
||||||
//**********************************************************************************************************
|
|
||||||
//--------------------- CONFIGURATION CLOCK DU STM32 --------------------------------------
|
|
||||||
//**********************************************************************************************************
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Configure l'ensemble des horloges du uC
|
|
||||||
* @note horloge systeme (config statique a 72 MHz pour le STM32F103)
|
|
||||||
* @param None
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
void CLOCK_Configure(void);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//**********************************************************************************************************
|
|
||||||
//--------------------- LES TIMERS GENERAL PURPOSE TIM1 à TIM 4 ------------------------------
|
|
||||||
//**********************************************************************************************************
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Configure un Timer TIM1 à TIM4 avec une périodicité donnée
|
|
||||||
* @note L' horloge des 4 timers a une fréquence de 72MHz
|
|
||||||
* @param *Timer = TIM1 ou TIM2 ou TIM3 ou TIM4
|
|
||||||
* @param Durée_ticks : nombre de pas (tick) comptés à 72 MHz pour faire déborder le timer
|
|
||||||
* La période de débordement du Timer est donc T = Durée_ticks * Tck, avec Tck = 1/72 000 000
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
void Timer_1234_Init_ff( TIM_TypeDef *Timer, u32 Duree_ticks );
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Macros de base pour utiliser les timers
|
|
||||||
*/
|
|
||||||
// bloque le timer
|
|
||||||
#define Bloque_Timer(Timer) Timer->CR1=(Timer->CR1)&~(1<<0)
|
|
||||||
// Lance timer
|
|
||||||
#define Run_Timer(Timer) Timer->CR1=(Timer->CR1)|(1<<0)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Associe une fonction d'interruption (callback) lors du débordement d'un timer
|
|
||||||
* @note
|
|
||||||
* @param *Timer = TIM1 ou TIM2 ou TIM3 ou TIM4
|
|
||||||
* @param Prio : niveau de priorité de l'interruption (0 -> priorité max, 15 -> priorité min)
|
|
||||||
* @param IT_function : le nom de la fonction Callback à appeler lors de l'interruption
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
void Active_IT_Debordement_Timer( TIM_TypeDef *Timer, char Prio, void (*IT_function)(void) );
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//*********************************************************************************************************
|
|
||||||
//--------------------- PWM TIM1 to TIM 4 ------------------------------
|
|
||||||
//*********************************************************************************************************
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Configure un timer en PWM
|
|
||||||
* @note
|
|
||||||
* @param *Timer = TIM1 ou TIM2 ou TIM3 ou TIM4
|
|
||||||
* @param voie : un des 4 canaux possibles 1 à 4.
|
|
||||||
* @param Periode_ticks : nombre de pas (tick) comptés à 72 MHz pour faire déborder le timer
|
|
||||||
* La période de débordement du Timer est donc T = Durée_ticks * Tck, avec Tck = 1/72 000 000
|
|
||||||
* @retval Retourne la période en tick (normalement la même que le param d'entrée sauf si PSC utilisé
|
|
||||||
*/
|
|
||||||
unsigned short int PWM_Init_ff( TIM_TypeDef *Timer, char Voie, u32 Periode_ticks );
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Fixe une valeur de PWM, Val, en tick horloge. La rapport cyclique effectif
|
|
||||||
* est donc : rcy = Thaut_ticks / Periode_ticks
|
|
||||||
* @note spécifique Jeu Laser, PWM liée exclusivement au TIM3, chan3
|
|
||||||
* @param Thaut_ticks : durée de l'état haut d'une impulsion en Ticks
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
void PWM_Set_Value_TIM3_Ch3( unsigned short int Thaut_ticks);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//**********************************************************************************************************
|
|
||||||
//--------------------- LE SYSTICK TIMER, Part of Cortex M3 ------------------------------
|
|
||||||
//**********************************************************************************************************
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Configure le timer Systick avec une périodicité donnée
|
|
||||||
* @note Ce timer ne peut servir qu'à créer des temporisations ou générer des interruption
|
|
||||||
* ce n'est pas à proprement parler un périphérique, il fait partie du Cortex M3
|
|
||||||
* Ce timer est un 24 bits
|
|
||||||
* @param Periode_ticks : nombre de pas (tick) comptés à 72 MHz pour établir la périodicité
|
|
||||||
* La période de débordement du Timer est donc T = Durée_ticks * Tck, avec Tck = 1/72 000 000
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
void Systick_Period_ff( unsigned int Periode_ticks );
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Associe une fonction d'interruption (callback) lors du débordement du Systick
|
|
||||||
* @note
|
|
||||||
* @param Prio : niveau de priorité de l'interruption (0 -> priorité max, 15 -> priorité min)
|
|
||||||
* @param IT_function : le nom de la fonction Callback à appeler lors de l'interruption
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
void Systick_Prio_IT( char Prio, void (*Systick_function)(void) );
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Macros de base pour utiliser le Systick
|
|
||||||
*/
|
|
||||||
#define SysTick_On ((SysTick->CTRL)=(SysTick->CTRL)|1<<0)
|
|
||||||
#define SysTick_Off ((SysTick->CTRL)=(SysTick->CTRL)& ~(1<<0))
|
|
||||||
#define SysTick_Enable_IT ((SysTick->CTRL)=(SysTick->CTRL)|1<<1)
|
|
||||||
#define SysTick_Disable_IT ((SysTick->CTRL)=(SysTick->CTRL)& ~(1<<1))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//**********************************************************************************************************
|
|
||||||
//--------------------- LE SYSTICK TIMER, Part of Cortex M3 ------------------------------
|
|
||||||
//**********************************************************************************************************
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Active l'ADC du STM32, configure la durée de prélèvement de l'échantillon (temps
|
|
||||||
* de fermeture du switch d'acquisition
|
|
||||||
* @note
|
|
||||||
* @param ADC : précise de quel ADC il s'agit, ADC1 ou ADC2
|
|
||||||
* @param Duree_Ech_ticks : dirée de fermeture du switch d'échantillonnage en Tick d'horloge CPU
|
|
||||||
* exemple pour 1µs on choisira 72.
|
|
||||||
* @retval Nombre de Tick réellement pris en compte
|
|
||||||
*/
|
|
||||||
unsigned int Init_TimingADC_ActiveADC_ff( ADC_TypeDef * ADC, u32 Duree_Ech_ticks );
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Sélectionne la voie à convertir
|
|
||||||
* @note Attention, la voie va de 0 à 15 et n'est pas directement lié au n°de GPIO
|
|
||||||
* @param ADC : précise de quel ADC il s'agit, ADC1 ou ADC2
|
|
||||||
* @param Voie_ADC : 1 à 15
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
void Single_Channel_ADC( ADC_TypeDef * ADC, char Voie_ADC );
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Permet lier le déclenchement au débordement d'un timer, spécifie également
|
|
||||||
* la période de débordement du timer
|
|
||||||
* @note pas besoin de régler le timer avec une autre fonction dédiée timer
|
|
||||||
* @param ADC : précise de quel ADC il s'agit, ADC1 ou ADC2
|
|
||||||
* @param Source : indique le timer qui déclenche l'ADC choix dans les define ci-dessous
|
|
||||||
* @param Periode_ticks : nombre de pas (tick) comptés à 72 MHz pour faire déborder le timer
|
|
||||||
* La période de débordement du Timer est donc T = Durée_ticks * Tck, avec Tck = 1/72 000 000
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
|
|
||||||
// param pour Source :
|
|
||||||
#define TIM1_CC1 0
|
|
||||||
#define TIM1_CC2 1
|
|
||||||
#define TIM1_CC3 2
|
|
||||||
#define TIM2_CC2 3
|
|
||||||
#define TIM4_CC4 5
|
|
||||||
void Init_Conversion_On_Trig_Timer_ff( ADC_TypeDef * ADC, char Source, u32 Periode_ticks );
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//**********************************************************************************************************
|
|
||||||
//--------------------- ANALOG INPUT ADC & DMA ------------------------------
|
|
||||||
//**********************************************************************************************************
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Permer de lier l'ADC à un tableau en RAM pour une DMA
|
|
||||||
* @note
|
|
||||||
* @param Circ : circular. Si '0', en fin de DMA le ptr d'@ reste inchangé
|
|
||||||
* si '1' le ptr d'@ se recale à celle du début.
|
|
||||||
* @param Ptr_Table_DMA : contient l'@ de début de zone RAM à écrire
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
void Init_ADC1_DMA1(char Circ, short int *Ptr_Table_DMA);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Lance une DMA sur le nombre de points spécifie. Les resultats seront stockes
|
|
||||||
* dans la zone de RAM écrite est indiquée lors de l'appel de la fonction Init_ADC1_DMA1
|
|
||||||
* @note
|
|
||||||
* @param NbEchDMA est le nombre d'échantillons à stocker.
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
void Start_DMA1( u16 NbEchDMA );
|
|
||||||
|
|
||||||
// arret DMA
|
|
||||||
#define Stop_DMA1 DMA1_Channel1->CCR =(DMA1_Channel1->CCR) &~0x1;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Attend la fin d'un cycle de DMA. la duree depend de la periode d'acquisition
|
|
||||||
* et du nombre d'echantillons
|
|
||||||
* @note fonction d'attente (bloquante)
|
|
||||||
* @param None
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
void Wait_On_End_Of_DMA1(void);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//**********************************************************************************************************
|
|
||||||
//--------------------- GPIO ------------------------------
|
|
||||||
//**********************************************************************************************************
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Initialisation d'un GPIO (A à C), pin x.
|
|
||||||
* peut être configuré :
|
|
||||||
* -> Input ou output
|
|
||||||
* -> architecture technologique (push-pull, open drain...)
|
|
||||||
|
|
||||||
* @note
|
|
||||||
* @param Port : GPIOA, GPIOB, GPIOC
|
|
||||||
* @param Broche : 0 à 15
|
|
||||||
* @param Sens : INPUT ou OUTPUT
|
|
||||||
* @param Techno : voir define ci dessous
|
|
||||||
* @retval 1 erreur, 0 si OK
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Sens
|
|
||||||
#define INPUT 'i'
|
|
||||||
#define OUTPUT 'o'
|
|
||||||
|
|
||||||
// Techno pour pin en entrée (INPUT)
|
|
||||||
#define ANALOG 0
|
|
||||||
#define INPUT_FLOATING 1
|
|
||||||
#define INPUT_PULL_DOWN_UP 2
|
|
||||||
|
|
||||||
// Techno pour pin en sortie (OUTPUT)
|
|
||||||
#define OUTPUT_PPULL 0
|
|
||||||
#define OUTPUT_OPDRAIN 1
|
|
||||||
#define ALT_PPULL 2
|
|
||||||
#define ALT_OPDRAIN 3
|
|
||||||
|
|
||||||
// Exemple :
|
|
||||||
// Port_IO_Init(GPIOB, 8, OUTPUT, OUTPUT_PPULL);
|
|
||||||
// Place le bit 8 du port B en sortie Push-pull
|
|
||||||
char GPIO_Configure(GPIO_TypeDef * Port, int Broche, int Sens, int Techno);
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Mise à 1 d'une broche GPIO
|
|
||||||
* @note Une fonction par GPIO
|
|
||||||
* @param Broche : 0 à 15
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
|
|
||||||
void GPIOA_Set(char Broche);
|
|
||||||
void GPIOB_Set(char Broche);
|
|
||||||
void GPIOC_Set(char Broche);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Mise à 0 d'une broche GPIO
|
|
||||||
* @note Une fonction par GPIO
|
|
||||||
* @param Broche : 0 à 15
|
|
||||||
* @retval None
|
|
||||||
*/
|
|
||||||
|
|
||||||
void GPIOA_Clear(char Broche);
|
|
||||||
void GPIOB_Clear(char Broche);
|
|
||||||
void GPIOC_Clear(char Broche);
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1,56 +0,0 @@
|
||||||
|
|
||||||
; Bibliotheque DriverJeuLaser (ancienne gassp72 adaptée 2021 - TR)
|
|
||||||
; Accès en aux fonctions suivantes :
|
|
||||||
; GPIO :
|
|
||||||
; GPIOA_Set(char Broche), GPIOB_Set(char Broche), GPIOC_Set(char Broche)
|
|
||||||
; GPIOA_Clear(char Broche), GPIOB_Clear(char Broche), GPIOC_Clear(char Broche)
|
|
||||||
|
|
||||||
; PWM :
|
|
||||||
;/**
|
|
||||||
; * @brief Fixe une valeur de PWM, Val, en tick horloge. La rapport cyclique effectif
|
|
||||||
; * est donc : rcy = Thaut_ticks / Periode_ticks
|
|
||||||
; * @note spécifique Jeu Laser, PWM liée exclusivement au TIM3, chan3
|
|
||||||
; * @param Thaut_ticks : durée de l'état haut d'une impulsion en Ticks
|
|
||||||
; * @retval None
|
|
||||||
; */
|
|
||||||
|
|
||||||
;void PWM_Set_Value_TIM3_Ch3( unsigned short int Thaut_ticks);
|
|
||||||
import PWM_Set_Value_TIM3_Ch3
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;/**
|
|
||||||
; * @brief Mise à 1 d'une broche GPIO
|
|
||||||
; * @note Une fonction par GPIO
|
|
||||||
; * @param Broche : 0 à 15
|
|
||||||
; * @retval None
|
|
||||||
; */
|
|
||||||
|
|
||||||
;void GPIOA_Set(char Broche);
|
|
||||||
import GPIOA_Set
|
|
||||||
|
|
||||||
;void GPIOB_Set(char Broche);
|
|
||||||
import GPIOB_Set
|
|
||||||
|
|
||||||
;void GPIOC_Set(char Broche);
|
|
||||||
import GPIOC_Set
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;/**
|
|
||||||
; * @brief Mise à 0 d'une broche GPIO
|
|
||||||
; * @note Une fonction par GPIO
|
|
||||||
; * @param Broche : 0 à 15
|
|
||||||
; * @retval None
|
|
||||||
; */
|
|
||||||
|
|
||||||
;void GPIOA_Clear(char Broche);
|
|
||||||
import GPIOA_Clear
|
|
||||||
|
|
||||||
;void GPIOB_Clear(char Broche);
|
|
||||||
import GPIOB_Clear
|
|
||||||
|
|
||||||
;void GPIOC_Clear(char Broche);
|
|
||||||
import GPIOC_Clear
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
@ -1,166 +0,0 @@
|
||||||
PRESERVE8
|
|
||||||
THUMB
|
|
||||||
|
|
||||||
|
|
||||||
; ====================== zone de réservation de données, ======================================
|
|
||||||
;Section RAM (read only) :
|
|
||||||
area mesdata,data,readonly
|
|
||||||
|
|
||||||
|
|
||||||
;Section RAM (read write):
|
|
||||||
area maram,data,readwrite
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
; ===============================================================================================
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;Section ROM code (read only) :
|
|
||||||
area moncode,code,readonly
|
|
||||||
; écrire le code ici
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;Section ROM code (read only) :
|
|
||||||
AREA Trigo, DATA, READONLY
|
|
||||||
; codage fractionnaire 1.15
|
|
||||||
|
|
||||||
TabCos
|
|
||||||
DCW 32767 ; 0 0x7fff 0.99997
|
|
||||||
DCW 32610 ; 1 0x7f62 0.99518
|
|
||||||
DCW 32138 ; 2 0x7d8a 0.98077
|
|
||||||
DCW 31357 ; 3 0x7a7d 0.95694
|
|
||||||
DCW 30274 ; 4 0x7642 0.92389
|
|
||||||
DCW 28899 ; 5 0x70e3 0.88193
|
|
||||||
DCW 27246 ; 6 0x6a6e 0.83148
|
|
||||||
DCW 25330 ; 7 0x62f2 0.77301
|
|
||||||
DCW 23170 ; 8 0x5a82 0.70709
|
|
||||||
DCW 20788 ; 9 0x5134 0.63440
|
|
||||||
DCW 18205 ; 10 0x471d 0.55557
|
|
||||||
DCW 15447 ; 11 0x3c57 0.47141
|
|
||||||
DCW 12540 ; 12 0x30fc 0.38269
|
|
||||||
DCW 9512 ; 13 0x2528 0.29028
|
|
||||||
DCW 6393 ; 14 0x18f9 0.19510
|
|
||||||
DCW 3212 ; 15 0x0c8c 0.09802
|
|
||||||
DCW 0 ; 16 0x0000 0.00000
|
|
||||||
DCW -3212 ; 17 0xf374 -0.09802
|
|
||||||
DCW -6393 ; 18 0xe707 -0.19510
|
|
||||||
DCW -9512 ; 19 0xdad8 -0.29028
|
|
||||||
DCW -12540 ; 20 0xcf04 -0.38269
|
|
||||||
DCW -15447 ; 21 0xc3a9 -0.47141
|
|
||||||
DCW -18205 ; 22 0xb8e3 -0.55557
|
|
||||||
DCW -20788 ; 23 0xaecc -0.63440
|
|
||||||
DCW -23170 ; 24 0xa57e -0.70709
|
|
||||||
DCW -25330 ; 25 0x9d0e -0.77301
|
|
||||||
DCW -27246 ; 26 0x9592 -0.83148
|
|
||||||
DCW -28899 ; 27 0x8f1d -0.88193
|
|
||||||
DCW -30274 ; 28 0x89be -0.92389
|
|
||||||
DCW -31357 ; 29 0x8583 -0.95694
|
|
||||||
DCW -32138 ; 30 0x8276 -0.98077
|
|
||||||
DCW -32610 ; 31 0x809e -0.99518
|
|
||||||
DCW -32768 ; 32 0x8000 -1.00000
|
|
||||||
DCW -32610 ; 33 0x809e -0.99518
|
|
||||||
DCW -32138 ; 34 0x8276 -0.98077
|
|
||||||
DCW -31357 ; 35 0x8583 -0.95694
|
|
||||||
DCW -30274 ; 36 0x89be -0.92389
|
|
||||||
DCW -28899 ; 37 0x8f1d -0.88193
|
|
||||||
DCW -27246 ; 38 0x9592 -0.83148
|
|
||||||
DCW -25330 ; 39 0x9d0e -0.77301
|
|
||||||
DCW -23170 ; 40 0xa57e -0.70709
|
|
||||||
DCW -20788 ; 41 0xaecc -0.63440
|
|
||||||
DCW -18205 ; 42 0xb8e3 -0.55557
|
|
||||||
DCW -15447 ; 43 0xc3a9 -0.47141
|
|
||||||
DCW -12540 ; 44 0xcf04 -0.38269
|
|
||||||
DCW -9512 ; 45 0xdad8 -0.29028
|
|
||||||
DCW -6393 ; 46 0xe707 -0.19510
|
|
||||||
DCW -3212 ; 47 0xf374 -0.09802
|
|
||||||
DCW 0 ; 48 0x0000 0.00000
|
|
||||||
DCW 3212 ; 49 0x0c8c 0.09802
|
|
||||||
DCW 6393 ; 50 0x18f9 0.19510
|
|
||||||
DCW 9512 ; 51 0x2528 0.29028
|
|
||||||
DCW 12540 ; 52 0x30fc 0.38269
|
|
||||||
DCW 15447 ; 53 0x3c57 0.47141
|
|
||||||
DCW 18205 ; 54 0x471d 0.55557
|
|
||||||
DCW 20788 ; 55 0x5134 0.63440
|
|
||||||
DCW 23170 ; 56 0x5a82 0.70709
|
|
||||||
DCW 25330 ; 57 0x62f2 0.77301
|
|
||||||
DCW 27246 ; 58 0x6a6e 0.83148
|
|
||||||
DCW 28899 ; 59 0x70e3 0.88193
|
|
||||||
DCW 30274 ; 60 0x7642 0.92389
|
|
||||||
DCW 31357 ; 61 0x7a7d 0.95694
|
|
||||||
DCW 32138 ; 62 0x7d8a 0.98077
|
|
||||||
DCW 32610 ; 63 0x7f62 0.99518
|
|
||||||
TabSin
|
|
||||||
DCW 0 ; 0 0x0000 0.00000
|
|
||||||
DCW 3212 ; 1 0x0c8c 0.09802
|
|
||||||
DCW 6393 ; 2 0x18f9 0.19510
|
|
||||||
DCW 9512 ; 3 0x2528 0.29028
|
|
||||||
DCW 12540 ; 4 0x30fc 0.38269
|
|
||||||
DCW 15447 ; 5 0x3c57 0.47141
|
|
||||||
DCW 18205 ; 6 0x471d 0.55557
|
|
||||||
DCW 20788 ; 7 0x5134 0.63440
|
|
||||||
DCW 23170 ; 8 0x5a82 0.70709
|
|
||||||
DCW 25330 ; 9 0x62f2 0.77301
|
|
||||||
DCW 27246 ; 10 0x6a6e 0.83148
|
|
||||||
DCW 28899 ; 11 0x70e3 0.88193
|
|
||||||
DCW 30274 ; 12 0x7642 0.92389
|
|
||||||
DCW 31357 ; 13 0x7a7d 0.95694
|
|
||||||
DCW 32138 ; 14 0x7d8a 0.98077
|
|
||||||
DCW 32610 ; 15 0x7f62 0.99518
|
|
||||||
DCW 32767 ; 16 0x7fff 0.99997
|
|
||||||
DCW 32610 ; 17 0x7f62 0.99518
|
|
||||||
DCW 32138 ; 18 0x7d8a 0.98077
|
|
||||||
DCW 31357 ; 19 0x7a7d 0.95694
|
|
||||||
DCW 30274 ; 20 0x7642 0.92389
|
|
||||||
DCW 28899 ; 21 0x70e3 0.88193
|
|
||||||
DCW 27246 ; 22 0x6a6e 0.83148
|
|
||||||
DCW 25330 ; 23 0x62f2 0.77301
|
|
||||||
DCW 23170 ; 24 0x5a82 0.70709
|
|
||||||
DCW 20788 ; 25 0x5134 0.63440
|
|
||||||
DCW 18205 ; 26 0x471d 0.55557
|
|
||||||
DCW 15447 ; 27 0x3c57 0.47141
|
|
||||||
DCW 12540 ; 28 0x30fc 0.38269
|
|
||||||
DCW 9512 ; 29 0x2528 0.29028
|
|
||||||
DCW 6393 ; 30 0x18f9 0.19510
|
|
||||||
DCW 3212 ; 31 0x0c8c 0.09802
|
|
||||||
DCW 0 ; 32 0x0000 0.00000
|
|
||||||
DCW -3212 ; 33 0xf374 -0.09802
|
|
||||||
DCW -6393 ; 34 0xe707 -0.19510
|
|
||||||
DCW -9512 ; 35 0xdad8 -0.29028
|
|
||||||
DCW -12540 ; 36 0xcf04 -0.38269
|
|
||||||
DCW -15447 ; 37 0xc3a9 -0.47141
|
|
||||||
DCW -18205 ; 38 0xb8e3 -0.55557
|
|
||||||
DCW -20788 ; 39 0xaecc -0.63440
|
|
||||||
DCW -23170 ; 40 0xa57e -0.70709
|
|
||||||
DCW -25330 ; 41 0x9d0e -0.77301
|
|
||||||
DCW -27246 ; 42 0x9592 -0.83148
|
|
||||||
DCW -28899 ; 43 0x8f1d -0.88193
|
|
||||||
DCW -30274 ; 44 0x89be -0.92389
|
|
||||||
DCW -31357 ; 45 0x8583 -0.95694
|
|
||||||
DCW -32138 ; 46 0x8276 -0.98077
|
|
||||||
DCW -32610 ; 47 0x809e -0.99518
|
|
||||||
DCW -32768 ; 48 0x8000 -1.00000
|
|
||||||
DCW -32610 ; 49 0x809e -0.99518
|
|
||||||
DCW -32138 ; 50 0x8276 -0.98077
|
|
||||||
DCW -31357 ; 51 0x8583 -0.95694
|
|
||||||
DCW -30274 ; 52 0x89be -0.92389
|
|
||||||
DCW -28899 ; 53 0x8f1d -0.88193
|
|
||||||
DCW -27246 ; 54 0x9592 -0.83148
|
|
||||||
DCW -25330 ; 55 0x9d0e -0.77301
|
|
||||||
DCW -23170 ; 56 0xa57e -0.70709
|
|
||||||
DCW -20788 ; 57 0xaecc -0.63440
|
|
||||||
DCW -18205 ; 58 0xb8e3 -0.55557
|
|
||||||
DCW -15447 ; 59 0xc3a9 -0.47141
|
|
||||||
DCW -12540 ; 60 0xcf04 -0.38269
|
|
||||||
DCW -9512 ; 61 0xdad8 -0.29028
|
|
||||||
DCW -6393 ; 62 0xe707 -0.19510
|
|
||||||
DCW -3212 ; 63 0xf374 -0.09802
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
END
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
AREA Signal, DATA, READONLY
|
|
||||||
export LeSignal
|
|
||||||
LeSignal
|
|
||||||
DCW 0x0fff ; 0 4095 0.99976
|
|
||||||
DCW 0x0ff6 ; 1 4086 0.99756
|
|
||||||
DCW 0x0fd9 ; 2 4057 0.99048
|
|
||||||
DCW 0x0fa8 ; 3 4008 0.97852
|
|
||||||
DCW 0x0f64 ; 4 3940 0.96191
|
|
||||||
DCW 0x0f0e ; 5 3854 0.94092
|
|
||||||
DCW 0x0ea7 ; 6 3751 0.91577
|
|
||||||
DCW 0x0e2f ; 7 3631 0.88647
|
|
||||||
DCW 0x0da8 ; 8 3496 0.85352
|
|
||||||
DCW 0x0d13 ; 9 3347 0.81714
|
|
||||||
DCW 0x0c72 ; 10 3186 0.77783
|
|
||||||
DCW 0x0bc5 ; 11 3013 0.73560
|
|
||||||
DCW 0x0b10 ; 12 2832 0.69141
|
|
||||||
DCW 0x0a53 ; 13 2643 0.64526
|
|
||||||
DCW 0x0990 ; 14 2448 0.59766
|
|
||||||
DCW 0x08c9 ; 15 2249 0.54907
|
|
||||||
DCW 0x0800 ; 16 2048 0.50000
|
|
||||||
DCW 0x0737 ; 17 1847 0.45093
|
|
||||||
DCW 0x0670 ; 18 1648 0.40234
|
|
||||||
DCW 0x05ad ; 19 1453 0.35474
|
|
||||||
DCW 0x04f0 ; 20 1264 0.30859
|
|
||||||
DCW 0x043b ; 21 1083 0.26440
|
|
||||||
DCW 0x038e ; 22 910 0.22217
|
|
||||||
DCW 0x02ed ; 23 749 0.18286
|
|
||||||
DCW 0x0258 ; 24 600 0.14648
|
|
||||||
DCW 0x01d1 ; 25 465 0.11353
|
|
||||||
DCW 0x0159 ; 26 345 0.08423
|
|
||||||
DCW 0x00f2 ; 27 242 0.05908
|
|
||||||
DCW 0x009c ; 28 156 0.03809
|
|
||||||
DCW 0x0058 ; 29 88 0.02148
|
|
||||||
DCW 0x0027 ; 30 39 0.00952
|
|
||||||
DCW 0x000a ; 31 10 0.00244
|
|
||||||
DCW 0x0000 ; 32 0 0.00000
|
|
||||||
DCW 0x000a ; 33 10 0.00244
|
|
||||||
DCW 0x0027 ; 34 39 0.00952
|
|
||||||
DCW 0x0058 ; 35 88 0.02148
|
|
||||||
DCW 0x009c ; 36 156 0.03809
|
|
||||||
DCW 0x00f2 ; 37 242 0.05908
|
|
||||||
DCW 0x0159 ; 38 345 0.08423
|
|
||||||
DCW 0x01d1 ; 39 465 0.11353
|
|
||||||
DCW 0x0258 ; 40 600 0.14648
|
|
||||||
DCW 0x02ed ; 41 749 0.18286
|
|
||||||
DCW 0x038e ; 42 910 0.22217
|
|
||||||
DCW 0x043b ; 43 1083 0.26440
|
|
||||||
DCW 0x04f0 ; 44 1264 0.30859
|
|
||||||
DCW 0x05ad ; 45 1453 0.35474
|
|
||||||
DCW 0x0670 ; 46 1648 0.40234
|
|
||||||
DCW 0x0737 ; 47 1847 0.45093
|
|
||||||
DCW 0x0800 ; 48 2048 0.50000
|
|
||||||
DCW 0x08c9 ; 49 2249 0.54907
|
|
||||||
DCW 0x0990 ; 50 2448 0.59766
|
|
||||||
DCW 0x0a53 ; 51 2643 0.64526
|
|
||||||
DCW 0x0b10 ; 52 2832 0.69141
|
|
||||||
DCW 0x0bc5 ; 53 3013 0.73560
|
|
||||||
DCW 0x0c72 ; 54 3186 0.77783
|
|
||||||
DCW 0x0d13 ; 55 3347 0.81714
|
|
||||||
DCW 0x0da8 ; 56 3496 0.85352
|
|
||||||
DCW 0x0e2f ; 57 3631 0.88647
|
|
||||||
DCW 0x0ea7 ; 58 3751 0.91577
|
|
||||||
DCW 0x0f0e ; 59 3854 0.94092
|
|
||||||
DCW 0x0f64 ; 60 3940 0.96191
|
|
||||||
DCW 0x0fa8 ; 61 4008 0.97852
|
|
||||||
DCW 0x0fd9 ; 62 4057 0.99048
|
|
||||||
DCW 0x0ff6 ; 63 4086 0.99756
|
|
||||||
END
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
|
|
||||||
|
|
||||||
#include "DriverJeuLaser.h"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int main(void)
|
|
||||||
{
|
|
||||||
|
|
||||||
// ===========================================================================
|
|
||||||
// ============= INIT PERIPH (faites qu'une seule fois) =====================
|
|
||||||
// ===========================================================================
|
|
||||||
|
|
||||||
// Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers
|
|
||||||
CLOCK_Configure();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//============================================================================
|
|
||||||
|
|
||||||
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,335 +0,0 @@
|
||||||
;******************** (C) COPYRIGHT 2011 STMicroelectronics ********************
|
|
||||||
;* File Name : startup_stm32f10x_md.s
|
|
||||||
;* Author : MCD Application Team
|
|
||||||
;* Version : V3.5.0
|
|
||||||
;* Date : 11-March-2011
|
|
||||||
;* Description : STM32F10x Medium Density Devices vector table for MDK-ARM
|
|
||||||
;* toolchain.
|
|
||||||
;* This module performs:
|
|
||||||
;* - Set the initial SP
|
|
||||||
;* - Set the initial PC == Reset_Handler
|
|
||||||
;* - Set the vector table entries with the exceptions ISR address
|
|
||||||
;* - Configure the clock system
|
|
||||||
;* - Branches to __main in the C library (which eventually
|
|
||||||
;* calls main()).
|
|
||||||
;* After Reset the CortexM3 processor is in Thread mode,
|
|
||||||
;* priority is Privileged, and the Stack is set to Main.
|
|
||||||
;* <<< Use Configuration Wizard in Context Menu >>>
|
|
||||||
;*******************************************************************************
|
|
||||||
; THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
|
|
||||||
; WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE TIME.
|
|
||||||
; AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY DIRECT,
|
|
||||||
; INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING FROM THE
|
|
||||||
; CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE CODING
|
|
||||||
; INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
|
|
||||||
;*******************************************************************************
|
|
||||||
|
|
||||||
; Amount of memory (in bytes) allocated for Stack
|
|
||||||
; Tailor this value to your application needs
|
|
||||||
; <h> Stack Configuration
|
|
||||||
; <o> Stack Size (in Bytes) <0x0-0xFFFFFFFF:8>
|
|
||||||
; </h>
|
|
||||||
|
|
||||||
Stack_Size EQU 0x00000400
|
|
||||||
|
|
||||||
AREA STACK, NOINIT, READWRITE, ALIGN=3
|
|
||||||
Stack_Mem SPACE Stack_Size
|
|
||||||
__initial_sp
|
|
||||||
|
|
||||||
|
|
||||||
; <h> Heap Configuration
|
|
||||||
; <o> Heap Size (in Bytes) <0x0-0xFFFFFFFF:8>
|
|
||||||
; </h>
|
|
||||||
|
|
||||||
Heap_Size EQU 0x00000200
|
|
||||||
|
|
||||||
AREA HEAP, NOINIT, READWRITE, ALIGN=3
|
|
||||||
__heap_base
|
|
||||||
Heap_Mem SPACE Heap_Size
|
|
||||||
__heap_limit
|
|
||||||
|
|
||||||
PRESERVE8
|
|
||||||
THUMB
|
|
||||||
|
|
||||||
|
|
||||||
; Vector Table Mapped to Address 0 at Reset
|
|
||||||
AREA RESET, DATA, READONLY
|
|
||||||
EXPORT __Vectors
|
|
||||||
EXPORT __Vectors_End
|
|
||||||
EXPORT __Vectors_Size
|
|
||||||
|
|
||||||
__Vectors DCD __initial_sp ; Top of Stack
|
|
||||||
DCD Reset_Handler ; Reset Handler
|
|
||||||
DCD NMI_Handler ; NMI Handler
|
|
||||||
DCD HardFault_Handler ; Hard Fault Handler
|
|
||||||
DCD MemManage_Handler ; MPU Fault Handler
|
|
||||||
DCD BusFault_Handler ; Bus Fault Handler
|
|
||||||
DCD UsageFault_Handler ; Usage Fault Handler
|
|
||||||
DCD 0 ; Reserved
|
|
||||||
DCD 0 ; Reserved
|
|
||||||
DCD 0 ; Reserved
|
|
||||||
DCD 0 ; Reserved
|
|
||||||
DCD SVC_Handler ; SVCall Handler
|
|
||||||
DCD DebugMon_Handler ; Debug Monitor Handler
|
|
||||||
DCD 0 ; Reserved
|
|
||||||
DCD PendSV_Handler ; PendSV Handler
|
|
||||||
DCD SysTick_Handler ; SysTick Handler
|
|
||||||
|
|
||||||
; External Interrupts
|
|
||||||
DCD WWDG_IRQHandler ; Window Watchdog
|
|
||||||
DCD PVD_IRQHandler ; PVD through EXTI Line detect
|
|
||||||
DCD TAMPER_IRQHandler ; Tamper
|
|
||||||
DCD RTC_IRQHandler ; RTC
|
|
||||||
DCD FLASH_IRQHandler ; Flash
|
|
||||||
DCD RCC_IRQHandler ; RCC
|
|
||||||
DCD EXTI0_IRQHandler ; EXTI Line 0
|
|
||||||
DCD EXTI1_IRQHandler ; EXTI Line 1
|
|
||||||
DCD EXTI2_IRQHandler ; EXTI Line 2
|
|
||||||
DCD EXTI3_IRQHandler ; EXTI Line 3
|
|
||||||
DCD EXTI4_IRQHandler ; EXTI Line 4
|
|
||||||
DCD DMA1_Channel1_IRQHandler ; DMA1 Channel 1
|
|
||||||
DCD DMA1_Channel2_IRQHandler ; DMA1 Channel 2
|
|
||||||
DCD DMA1_Channel3_IRQHandler ; DMA1 Channel 3
|
|
||||||
DCD DMA1_Channel4_IRQHandler ; DMA1 Channel 4
|
|
||||||
DCD DMA1_Channel5_IRQHandler ; DMA1 Channel 5
|
|
||||||
DCD DMA1_Channel6_IRQHandler ; DMA1 Channel 6
|
|
||||||
DCD DMA1_Channel7_IRQHandler ; DMA1 Channel 7
|
|
||||||
DCD ADC1_2_IRQHandler ; ADC1_2
|
|
||||||
DCD USB_HP_CAN1_TX_IRQHandler ; USB High Priority or CAN1 TX
|
|
||||||
DCD USB_LP_CAN1_RX0_IRQHandler ; USB Low Priority or CAN1 RX0
|
|
||||||
DCD CAN1_RX1_IRQHandler ; CAN1 RX1
|
|
||||||
DCD CAN1_SCE_IRQHandler ; CAN1 SCE
|
|
||||||
DCD EXTI9_5_IRQHandler ; EXTI Line 9..5
|
|
||||||
DCD TIM1_BRK_IRQHandler ; TIM1 Break
|
|
||||||
DCD TIM1_UP_IRQHandler ; TIM1 Update
|
|
||||||
DCD TIM1_TRG_COM_IRQHandler ; TIM1 Trigger and Commutation
|
|
||||||
DCD TIM1_CC_IRQHandler ; TIM1 Capture Compare
|
|
||||||
DCD TIM2_IRQHandler ; TIM2
|
|
||||||
DCD TIM3_IRQHandler ; TIM3
|
|
||||||
DCD TIM4_IRQHandler ; TIM4
|
|
||||||
DCD I2C1_EV_IRQHandler ; I2C1 Event
|
|
||||||
DCD I2C1_ER_IRQHandler ; I2C1 Error
|
|
||||||
DCD I2C2_EV_IRQHandler ; I2C2 Event
|
|
||||||
DCD I2C2_ER_IRQHandler ; I2C2 Error
|
|
||||||
DCD SPI1_IRQHandler ; SPI1
|
|
||||||
DCD SPI2_IRQHandler ; SPI2
|
|
||||||
DCD USART1_IRQHandler ; USART1
|
|
||||||
DCD USART2_IRQHandler ; USART2
|
|
||||||
DCD USART3_IRQHandler ; USART3
|
|
||||||
DCD EXTI15_10_IRQHandler ; EXTI Line 15..10
|
|
||||||
DCD RTCAlarm_IRQHandler ; RTC Alarm through EXTI Line
|
|
||||||
DCD USBWakeUp_IRQHandler ; USB Wakeup from suspend
|
|
||||||
__Vectors_End
|
|
||||||
|
|
||||||
__Vectors_Size EQU __Vectors_End - __Vectors
|
|
||||||
|
|
||||||
AREA |.text|, CODE, READONLY
|
|
||||||
|
|
||||||
; Reset handler
|
|
||||||
Reset_Handler PROC
|
|
||||||
EXPORT Reset_Handler [WEAK]
|
|
||||||
IMPORT __main
|
|
||||||
|
|
||||||
LDR R0, =SystemInit
|
|
||||||
BLX R0
|
|
||||||
|
|
||||||
;
|
|
||||||
; Enable UsageFault, MemFault and Busfault interrupts
|
|
||||||
;
|
|
||||||
_SHCSR EQU 0xE000ED24 ; SHCSR is located at address 0xE000ED24
|
|
||||||
LDR.W R0, =_SHCSR
|
|
||||||
LDR R1, [R0] ; Read CPACR
|
|
||||||
ORR R1, R1, #(0x7 << 16) ; Set bits 16,17,18 to enable usagefault, busfault, memfault interrupts
|
|
||||||
STR R1, [R0] ; Write back the modified value to the CPACR
|
|
||||||
DSB ; Wait for store to complete
|
|
||||||
|
|
||||||
;
|
|
||||||
; Set priority grouping (PRIGROUP) in AIRCR to 3 (16 levels for group priority and 0 for subpriority)
|
|
||||||
;
|
|
||||||
_AIRCR EQU 0xE000ED0C
|
|
||||||
_AIRCR_VAL EQU 0x05FA0300
|
|
||||||
LDR.W R0, =_AIRCR
|
|
||||||
LDR.W R1, =_AIRCR_VAL
|
|
||||||
STR R1,[R0]
|
|
||||||
|
|
||||||
;
|
|
||||||
; Finaly, jump to main function (void main (void))
|
|
||||||
;
|
|
||||||
LDR R0, =__main
|
|
||||||
BX R0
|
|
||||||
ENDP
|
|
||||||
|
|
||||||
SystemInit PROC
|
|
||||||
EXPORT SystemInit [WEAK]
|
|
||||||
BX LR
|
|
||||||
ENDP
|
|
||||||
|
|
||||||
; Dummy Exception Handlers (infinite loops which can be modified)
|
|
||||||
|
|
||||||
NMI_Handler PROC
|
|
||||||
EXPORT NMI_Handler [WEAK]
|
|
||||||
B .
|
|
||||||
ENDP
|
|
||||||
HardFault_Handler\
|
|
||||||
PROC
|
|
||||||
EXPORT HardFault_Handler [WEAK]
|
|
||||||
B .
|
|
||||||
ENDP
|
|
||||||
MemManage_Handler\
|
|
||||||
PROC
|
|
||||||
EXPORT MemManage_Handler [WEAK]
|
|
||||||
B .
|
|
||||||
ENDP
|
|
||||||
BusFault_Handler\
|
|
||||||
PROC
|
|
||||||
EXPORT BusFault_Handler [WEAK]
|
|
||||||
B .
|
|
||||||
ENDP
|
|
||||||
UsageFault_Handler\
|
|
||||||
PROC
|
|
||||||
EXPORT UsageFault_Handler [WEAK]
|
|
||||||
B .
|
|
||||||
ENDP
|
|
||||||
SVC_Handler PROC
|
|
||||||
EXPORT SVC_Handler [WEAK]
|
|
||||||
B .
|
|
||||||
ENDP
|
|
||||||
DebugMon_Handler\
|
|
||||||
PROC
|
|
||||||
EXPORT DebugMon_Handler [WEAK]
|
|
||||||
B .
|
|
||||||
ENDP
|
|
||||||
PendSV_Handler PROC
|
|
||||||
EXPORT PendSV_Handler [WEAK]
|
|
||||||
B .
|
|
||||||
ENDP
|
|
||||||
SysTick_Handler PROC
|
|
||||||
EXPORT SysTick_Handler [WEAK]
|
|
||||||
B .
|
|
||||||
ENDP
|
|
||||||
|
|
||||||
Default_Handler PROC
|
|
||||||
|
|
||||||
EXPORT WWDG_IRQHandler [WEAK]
|
|
||||||
EXPORT PVD_IRQHandler [WEAK]
|
|
||||||
EXPORT TAMPER_IRQHandler [WEAK]
|
|
||||||
EXPORT RTC_IRQHandler [WEAK]
|
|
||||||
EXPORT FLASH_IRQHandler [WEAK]
|
|
||||||
EXPORT RCC_IRQHandler [WEAK]
|
|
||||||
EXPORT EXTI0_IRQHandler [WEAK]
|
|
||||||
EXPORT EXTI1_IRQHandler [WEAK]
|
|
||||||
EXPORT EXTI2_IRQHandler [WEAK]
|
|
||||||
EXPORT EXTI3_IRQHandler [WEAK]
|
|
||||||
EXPORT EXTI4_IRQHandler [WEAK]
|
|
||||||
EXPORT DMA1_Channel1_IRQHandler [WEAK]
|
|
||||||
EXPORT DMA1_Channel2_IRQHandler [WEAK]
|
|
||||||
EXPORT DMA1_Channel3_IRQHandler [WEAK]
|
|
||||||
EXPORT DMA1_Channel4_IRQHandler [WEAK]
|
|
||||||
EXPORT DMA1_Channel5_IRQHandler [WEAK]
|
|
||||||
EXPORT DMA1_Channel6_IRQHandler [WEAK]
|
|
||||||
EXPORT DMA1_Channel7_IRQHandler [WEAK]
|
|
||||||
EXPORT ADC1_2_IRQHandler [WEAK]
|
|
||||||
EXPORT USB_HP_CAN1_TX_IRQHandler [WEAK]
|
|
||||||
EXPORT USB_LP_CAN1_RX0_IRQHandler [WEAK]
|
|
||||||
EXPORT CAN1_RX1_IRQHandler [WEAK]
|
|
||||||
EXPORT CAN1_SCE_IRQHandler [WEAK]
|
|
||||||
EXPORT EXTI9_5_IRQHandler [WEAK]
|
|
||||||
EXPORT TIM1_BRK_IRQHandler [WEAK]
|
|
||||||
EXPORT TIM1_UP_IRQHandler [WEAK]
|
|
||||||
EXPORT TIM1_TRG_COM_IRQHandler [WEAK]
|
|
||||||
EXPORT TIM1_CC_IRQHandler [WEAK]
|
|
||||||
EXPORT TIM2_IRQHandler [WEAK]
|
|
||||||
EXPORT TIM3_IRQHandler [WEAK]
|
|
||||||
EXPORT TIM4_IRQHandler [WEAK]
|
|
||||||
EXPORT I2C1_EV_IRQHandler [WEAK]
|
|
||||||
EXPORT I2C1_ER_IRQHandler [WEAK]
|
|
||||||
EXPORT I2C2_EV_IRQHandler [WEAK]
|
|
||||||
EXPORT I2C2_ER_IRQHandler [WEAK]
|
|
||||||
EXPORT SPI1_IRQHandler [WEAK]
|
|
||||||
EXPORT SPI2_IRQHandler [WEAK]
|
|
||||||
EXPORT USART1_IRQHandler [WEAK]
|
|
||||||
EXPORT USART2_IRQHandler [WEAK]
|
|
||||||
EXPORT USART3_IRQHandler [WEAK]
|
|
||||||
EXPORT EXTI15_10_IRQHandler [WEAK]
|
|
||||||
EXPORT RTCAlarm_IRQHandler [WEAK]
|
|
||||||
EXPORT USBWakeUp_IRQHandler [WEAK]
|
|
||||||
|
|
||||||
WWDG_IRQHandler
|
|
||||||
PVD_IRQHandler
|
|
||||||
TAMPER_IRQHandler
|
|
||||||
RTC_IRQHandler
|
|
||||||
FLASH_IRQHandler
|
|
||||||
RCC_IRQHandler
|
|
||||||
EXTI0_IRQHandler
|
|
||||||
EXTI1_IRQHandler
|
|
||||||
EXTI2_IRQHandler
|
|
||||||
EXTI3_IRQHandler
|
|
||||||
EXTI4_IRQHandler
|
|
||||||
DMA1_Channel1_IRQHandler
|
|
||||||
DMA1_Channel2_IRQHandler
|
|
||||||
DMA1_Channel3_IRQHandler
|
|
||||||
DMA1_Channel4_IRQHandler
|
|
||||||
DMA1_Channel5_IRQHandler
|
|
||||||
DMA1_Channel6_IRQHandler
|
|
||||||
DMA1_Channel7_IRQHandler
|
|
||||||
ADC1_2_IRQHandler
|
|
||||||
USB_HP_CAN1_TX_IRQHandler
|
|
||||||
USB_LP_CAN1_RX0_IRQHandler
|
|
||||||
CAN1_RX1_IRQHandler
|
|
||||||
CAN1_SCE_IRQHandler
|
|
||||||
EXTI9_5_IRQHandler
|
|
||||||
TIM1_BRK_IRQHandler
|
|
||||||
TIM1_UP_IRQHandler
|
|
||||||
TIM1_TRG_COM_IRQHandler
|
|
||||||
TIM1_CC_IRQHandler
|
|
||||||
TIM2_IRQHandler
|
|
||||||
TIM3_IRQHandler
|
|
||||||
TIM4_IRQHandler
|
|
||||||
I2C1_EV_IRQHandler
|
|
||||||
I2C1_ER_IRQHandler
|
|
||||||
I2C2_EV_IRQHandler
|
|
||||||
I2C2_ER_IRQHandler
|
|
||||||
SPI1_IRQHandler
|
|
||||||
SPI2_IRQHandler
|
|
||||||
USART1_IRQHandler
|
|
||||||
USART2_IRQHandler
|
|
||||||
USART3_IRQHandler
|
|
||||||
EXTI15_10_IRQHandler
|
|
||||||
RTCAlarm_IRQHandler
|
|
||||||
USBWakeUp_IRQHandler
|
|
||||||
|
|
||||||
B .
|
|
||||||
|
|
||||||
ENDP
|
|
||||||
|
|
||||||
ALIGN
|
|
||||||
|
|
||||||
;*******************************************************************************
|
|
||||||
; User Stack and Heap initialization
|
|
||||||
;*******************************************************************************
|
|
||||||
IF :DEF:__MICROLIB
|
|
||||||
|
|
||||||
EXPORT __initial_sp
|
|
||||||
EXPORT __heap_base
|
|
||||||
EXPORT __heap_limit
|
|
||||||
|
|
||||||
ELSE
|
|
||||||
|
|
||||||
IMPORT __use_two_region_memory
|
|
||||||
EXPORT __user_initial_stackheap
|
|
||||||
|
|
||||||
__user_initial_stackheap
|
|
||||||
|
|
||||||
LDR R0, = Heap_Mem
|
|
||||||
LDR R1, =(Stack_Mem + Stack_Size)
|
|
||||||
LDR R2, = (Heap_Mem + Heap_Size)
|
|
||||||
LDR R3, = Stack_Mem
|
|
||||||
BX LR
|
|
||||||
|
|
||||||
ALIGN
|
|
||||||
|
|
||||||
ENDIF
|
|
||||||
|
|
||||||
END
|
|
||||||
|
|
||||||
;******************* (C) COPYRIGHT 2011 STMicroelectronics *****END OF FILE*****
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,7 +1,6 @@
|
||||||
PRESERVE8
|
PRESERVE8
|
||||||
THUMB
|
THUMB
|
||||||
|
|
||||||
export DFT_ModuleAuCarre
|
|
||||||
|
|
||||||
; ====================== zone de réservation de données, ======================================
|
; ====================== zone de réservation de données, ======================================
|
||||||
;Section RAM (read only) :
|
;Section RAM (read only) :
|
||||||
|
|
@ -16,44 +15,13 @@
|
||||||
; ===============================================================================================
|
; ===============================================================================================
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;Section ROM code (read only) :
|
;Section ROM code (read only) :
|
||||||
area moncode,code,readonly
|
area moncode,code,readonly
|
||||||
; écrire le code ici
|
; écrire le code ici
|
||||||
|
|
||||||
|
|
||||||
DFT_ModuleAuCarre proc
|
|
||||||
; on met les paramètres de la fonction dans r0,r1..
|
|
||||||
push {r4-r10}
|
|
||||||
;mov r0,#1 ; valeur de k
|
|
||||||
;ldr r1,=LeSignal
|
|
||||||
ldr r7,=TabCos
|
|
||||||
;ldr r2,=0
|
|
||||||
;ldr r3,[r2] ;valeur index
|
|
||||||
mov r3,#0
|
|
||||||
mov r5,#64 ;longueur tableau signal
|
|
||||||
mov r4, #0 ;resultat
|
|
||||||
|
|
||||||
alors
|
|
||||||
ldrsh r6,[r0,r3,lsl#1] ; R6 = R0[R3] signal[index]
|
|
||||||
mul r8,r3,r1 ;index*k
|
|
||||||
and r8,#0x3F ;modulo 64
|
|
||||||
ldrsh r8, [r7,r8,lsl#1] ; R8 = R7[R8] tableau cos
|
|
||||||
mul r8,r6 ;signal[index]*cos[i*k%64]
|
|
||||||
add r4,r8 ;r4=r4+r8
|
|
||||||
add r3,#1 ;index=index+1
|
|
||||||
;str r3,[r2] ; *R2 = R3
|
|
||||||
cmp r5,r3 ;boucle for
|
|
||||||
bne alors
|
|
||||||
|
|
||||||
sinon
|
|
||||||
b finsi
|
|
||||||
|
|
||||||
finsi
|
|
||||||
mov r0,r4 ;mettre résultat dans R0
|
|
||||||
pop {r4-r9}
|
|
||||||
bx lr
|
|
||||||
|
|
||||||
ENDP
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -194,4 +162,5 @@ TabSin
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
END
|
END
|
||||||
|
|
@ -2,8 +2,7 @@
|
||||||
|
|
||||||
#include "DriverJeuLaser.h"
|
#include "DriverJeuLaser.h"
|
||||||
|
|
||||||
extern int DFT_ModuleAuCarre( short int * Signal64ech, char k) ;
|
|
||||||
extern short int LeSignal[] ;
|
|
||||||
|
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
|
|
@ -16,8 +15,6 @@ int main(void)
|
||||||
CLOCK_Configure();
|
CLOCK_Configure();
|
||||||
|
|
||||||
|
|
||||||
DFT_ModuleAuCarre( &LeSignal[0], 1) ;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@
|
||||||
<OPTFL>
|
<OPTFL>
|
||||||
<tvExp>1</tvExp>
|
<tvExp>1</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
<IsCurrentTarget>1</IsCurrentTarget>
|
<IsCurrentTarget>0</IsCurrentTarget>
|
||||||
</OPTFL>
|
</OPTFL>
|
||||||
<CpuCode>18</CpuCode>
|
<CpuCode>18</CpuCode>
|
||||||
<DebugOpt>
|
<DebugOpt>
|
||||||
|
|
@ -154,14 +154,6 @@
|
||||||
</SetRegEntry>
|
</SetRegEntry>
|
||||||
</TargetDriverDllRegistry>
|
</TargetDriverDllRegistry>
|
||||||
<Breakpoint/>
|
<Breakpoint/>
|
||||||
<MemoryWindow1>
|
|
||||||
<Mm>
|
|
||||||
<WinNumber>1</WinNumber>
|
|
||||||
<SubType>0</SubType>
|
|
||||||
<ItemText>r0</ItemText>
|
|
||||||
<AccSizeX>0</AccSizeX>
|
|
||||||
</Mm>
|
|
||||||
</MemoryWindow1>
|
|
||||||
<Tracepoint>
|
<Tracepoint>
|
||||||
<THDelay>0</THDelay>
|
<THDelay>0</THDelay>
|
||||||
</Tracepoint>
|
</Tracepoint>
|
||||||
|
|
@ -275,7 +267,7 @@
|
||||||
<OPTFL>
|
<OPTFL>
|
||||||
<tvExp>1</tvExp>
|
<tvExp>1</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
<IsCurrentTarget>0</IsCurrentTarget>
|
<IsCurrentTarget>1</IsCurrentTarget>
|
||||||
</OPTFL>
|
</OPTFL>
|
||||||
<CpuCode>18</CpuCode>
|
<CpuCode>18</CpuCode>
|
||||||
<DebugOpt>
|
<DebugOpt>
|
||||||
|
|
@ -632,30 +624,6 @@
|
||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<bShared>0</bShared>
|
<bShared>0</bShared>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<GroupNumber>1</GroupNumber>
|
|
||||||
<FileNumber>2</FileNumber>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<tvExp>0</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<bDave2>0</bDave2>
|
|
||||||
<PathWithFileName>.\Src\DFT.s</PathWithFileName>
|
|
||||||
<FilenameWithoutPath>DFT.s</FilenameWithoutPath>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<bShared>0</bShared>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<GroupNumber>1</GroupNumber>
|
|
||||||
<FileNumber>3</FileNumber>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<tvExp>0</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<bDave2>0</bDave2>
|
|
||||||
<PathWithFileName>.\Src\Signal.asm</PathWithFileName>
|
|
||||||
<FilenameWithoutPath>Signal.asm</FilenameWithoutPath>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<bShared>0</bShared>
|
|
||||||
</File>
|
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Group>
|
<Group>
|
||||||
|
|
@ -666,7 +634,7 @@
|
||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>2</GroupNumber>
|
<GroupNumber>2</GroupNumber>
|
||||||
<FileNumber>4</FileNumber>
|
<FileNumber>2</FileNumber>
|
||||||
<FileType>2</FileType>
|
<FileType>2</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
|
|
@ -686,7 +654,7 @@
|
||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>3</GroupNumber>
|
<GroupNumber>3</GroupNumber>
|
||||||
<FileNumber>5</FileNumber>
|
<FileNumber>3</FileNumber>
|
||||||
<FileType>4</FileType>
|
<FileType>4</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
|
|
|
||||||
|
|
@ -388,16 +388,6 @@
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<FilePath>.\Src\principal.c</FilePath>
|
<FilePath>.\Src\principal.c</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<FileName>DFT.s</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>.\Src\DFT.s</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>Signal.asm</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>.\Src\Signal.asm</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
<Group>
|
||||||
|
|
@ -807,16 +797,6 @@
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<FilePath>.\Src\principal.c</FilePath>
|
<FilePath>.\Src\principal.c</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<FileName>DFT.s</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>.\Src\DFT.s</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>Signal.asm</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>.\Src\Signal.asm</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
<Group>
|
||||||
|
|
@ -1295,16 +1275,6 @@
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<FilePath>.\Src\principal.c</FilePath>
|
<FilePath>.\Src\principal.c</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<FileName>DFT.s</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>.\Src\DFT.s</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>Signal.asm</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>.\Src\Signal.asm</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
<Group>
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
<aExt>*.s*; *.src; *.a*</aExt>
|
<aExt>*.s*; *.src; *.a*</aExt>
|
||||||
<oExt>*.obj; *.o</oExt>
|
<oExt>*.obj; *.o</oExt>
|
||||||
<lExt>*.lib</lExt>
|
<lExt>*.lib</lExt>
|
||||||
<tExt>*.txt; *.h; *.inc; *.md</tExt>
|
<tExt>*.txt; *.h; *.inc</tExt>
|
||||||
<pExt>*.plm</pExt>
|
<pExt>*.plm</pExt>
|
||||||
<CppX>*.cpp</CppX>
|
<CppX>*.cpp</CppX>
|
||||||
<nMigrate>0</nMigrate>
|
<nMigrate>0</nMigrate>
|
||||||
|
|
@ -120,7 +120,7 @@
|
||||||
<SetRegEntry>
|
<SetRegEntry>
|
||||||
<Number>0</Number>
|
<Number>0</Number>
|
||||||
<Key>DLGDARM</Key>
|
<Key>DLGDARM</Key>
|
||||||
<Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=75,104,496,531,0)(121=859,154,1280,581,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=1187,0,1781,751,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
|
<Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=75,104,496,531,0)(121=859,154,1280,581,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
|
||||||
</SetRegEntry>
|
</SetRegEntry>
|
||||||
<SetRegEntry>
|
<SetRegEntry>
|
||||||
<Number>0</Number>
|
<Number>0</Number>
|
||||||
|
|
@ -153,44 +153,7 @@
|
||||||
<Name>-U066CFF574857847167074929 -O2254 -S0 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
|
<Name>-U066CFF574857847167074929 -O2254 -S0 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
|
||||||
</SetRegEntry>
|
</SetRegEntry>
|
||||||
</TargetDriverDllRegistry>
|
</TargetDriverDllRegistry>
|
||||||
<Breakpoint>
|
<Breakpoint/>
|
||||||
<Bp>
|
|
||||||
<Number>0</Number>
|
|
||||||
<Type>0</Type>
|
|
||||||
<LineNumber>49</LineNumber>
|
|
||||||
<EnabledFlag>1</EnabledFlag>
|
|
||||||
<Address>134220354</Address>
|
|
||||||
<ByteObject>0</ByteObject>
|
|
||||||
<HtxType>0</HtxType>
|
|
||||||
<ManyObjects>0</ManyObjects>
|
|
||||||
<SizeOfObject>0</SizeOfObject>
|
|
||||||
<BreakByAccess>0</BreakByAccess>
|
|
||||||
<BreakIfRCount>1</BreakIfRCount>
|
|
||||||
<Filename>U:\grpE_REES_KOUTSODIMA\soft\PjtKEIL_StepDeb_2\Src\Cligno.s</Filename>
|
|
||||||
<ExecCommand></ExecCommand>
|
|
||||||
<Expression>\\BacASable\../PjtKEIL_StepDeb_2/Src/Cligno.s\49</Expression>
|
|
||||||
</Bp>
|
|
||||||
</Breakpoint>
|
|
||||||
<WatchWindow1>
|
|
||||||
<Ww>
|
|
||||||
<count>0</count>
|
|
||||||
<WinNumber>1</WinNumber>
|
|
||||||
<ItemText>VarTime</ItemText>
|
|
||||||
</Ww>
|
|
||||||
<Ww>
|
|
||||||
<count>1</count>
|
|
||||||
<WinNumber>1</WinNumber>
|
|
||||||
<ItemText>FlagCligno</ItemText>
|
|
||||||
</Ww>
|
|
||||||
</WatchWindow1>
|
|
||||||
<MemoryWindow1>
|
|
||||||
<Mm>
|
|
||||||
<WinNumber>1</WinNumber>
|
|
||||||
<SubType>1</SubType>
|
|
||||||
<ItemText>R0</ItemText>
|
|
||||||
<AccSizeX>0</AccSizeX>
|
|
||||||
</Mm>
|
|
||||||
</MemoryWindow1>
|
|
||||||
<Tracepoint>
|
<Tracepoint>
|
||||||
<THDelay>0</THDelay>
|
<THDelay>0</THDelay>
|
||||||
</Tracepoint>
|
</Tracepoint>
|
||||||
|
|
@ -233,13 +196,6 @@
|
||||||
<pszMrulep></pszMrulep>
|
<pszMrulep></pszMrulep>
|
||||||
<pSingCmdsp></pSingCmdsp>
|
<pSingCmdsp></pSingCmdsp>
|
||||||
<pMultCmdsp></pMultCmdsp>
|
<pMultCmdsp></pMultCmdsp>
|
||||||
<LogicAnalyzers>
|
|
||||||
<Wi>
|
|
||||||
<IntNumber>0</IntNumber>
|
|
||||||
<FirstString>((PORTB & 0x00000002) >> 1 & 0x2) >> 1</FirstString>
|
|
||||||
<SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028504F5254422026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F1500000000000000000000000000000000000000DE030008</SecondString>
|
|
||||||
</Wi>
|
|
||||||
</LogicAnalyzers>
|
|
||||||
<DebugDescription>
|
<DebugDescription>
|
||||||
<Enable>1</Enable>
|
<Enable>1</Enable>
|
||||||
<EnableFlashSeq>0</EnableFlashSeq>
|
<EnableFlashSeq>0</EnableFlashSeq>
|
||||||
|
|
@ -411,7 +367,7 @@
|
||||||
<AscS3>0</AscS3>
|
<AscS3>0</AscS3>
|
||||||
<aSer3>0</aSer3>
|
<aSer3>0</aSer3>
|
||||||
<eProf>0</eProf>
|
<eProf>0</eProf>
|
||||||
<aLa>1</aLa>
|
<aLa>0</aLa>
|
||||||
<aPa1>0</aPa1>
|
<aPa1>0</aPa1>
|
||||||
<AscS4>0</AscS4>
|
<AscS4>0</AscS4>
|
||||||
<aSer4>0</aSer4>
|
<aSer4>0</aSer4>
|
||||||
|
|
@ -652,12 +608,12 @@
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>1</GroupNumber>
|
<GroupNumber>1</GroupNumber>
|
||||||
<FileNumber>1</FileNumber>
|
<FileNumber>1</FileNumber>
|
||||||
<FileType>2</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>1</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
<bDave2>0</bDave2>
|
<bDave2>0</bDave2>
|
||||||
<PathWithFileName>..\PjtKEIL_StepSon\Src\bruitverre.asm</PathWithFileName>
|
<PathWithFileName>.\Src\principal.c</PathWithFileName>
|
||||||
<FilenameWithoutPath>bruitverre.asm</FilenameWithoutPath>
|
<FilenameWithoutPath>principal.c</FilenameWithoutPath>
|
||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<bShared>0</bShared>
|
<bShared>0</bShared>
|
||||||
</File>
|
</File>
|
||||||
|
|
@ -668,32 +624,8 @@
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
<bDave2>0</bDave2>
|
<bDave2>0</bDave2>
|
||||||
<PathWithFileName>..\PjtKEIL_StepSon\Src\GestionSon.s</PathWithFileName>
|
<PathWithFileName>.\Src\Delay.s</PathWithFileName>
|
||||||
<FilenameWithoutPath>GestionSon.s</FilenameWithoutPath>
|
<FilenameWithoutPath>Delay.s</FilenameWithoutPath>
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<bShared>0</bShared>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<GroupNumber>1</GroupNumber>
|
|
||||||
<FileNumber>3</FileNumber>
|
|
||||||
<FileType>1</FileType>
|
|
||||||
<tvExp>0</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<bDave2>0</bDave2>
|
|
||||||
<PathWithFileName>..\PjtKEIL_StepSon\Src\principal.c</PathWithFileName>
|
|
||||||
<FilenameWithoutPath>principal.c</FilenameWithoutPath>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<bShared>0</bShared>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<GroupNumber>1</GroupNumber>
|
|
||||||
<FileNumber>4</FileNumber>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<tvExp>0</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<bDave2>0</bDave2>
|
|
||||||
<PathWithFileName>..\PjtKEIL_StepSon\Src\startup-rvds.s</PathWithFileName>
|
|
||||||
<FilenameWithoutPath>startup-rvds.s</FilenameWithoutPath>
|
|
||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<bShared>0</bShared>
|
<bShared>0</bShared>
|
||||||
</File>
|
</File>
|
||||||
|
|
@ -707,7 +639,7 @@
|
||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>2</GroupNumber>
|
<GroupNumber>2</GroupNumber>
|
||||||
<FileNumber>5</FileNumber>
|
<FileNumber>3</FileNumber>
|
||||||
<FileType>2</FileType>
|
<FileType>2</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
|
|
@ -727,7 +659,7 @@
|
||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>3</GroupNumber>
|
<GroupNumber>3</GroupNumber>
|
||||||
<FileNumber>6</FileNumber>
|
<FileNumber>4</FileNumber>
|
||||||
<FileType>4</FileType>
|
<FileType>4</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
|
|
@ -739,38 +671,6 @@
|
||||||
</File>
|
</File>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Group>
|
|
||||||
<GroupName>Son</GroupName>
|
|
||||||
<tvExp>1</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<cbSel>0</cbSel>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<File>
|
|
||||||
<GroupNumber>4</GroupNumber>
|
|
||||||
<FileNumber>7</FileNumber>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<tvExp>0</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<bDave2>0</bDave2>
|
|
||||||
<PathWithFileName>..\PjtKEIL_StepSon\Src\bruitverre.asm</PathWithFileName>
|
|
||||||
<FilenameWithoutPath>bruitverre.asm</FilenameWithoutPath>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<bShared>0</bShared>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<GroupNumber>4</GroupNumber>
|
|
||||||
<FileNumber>8</FileNumber>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<tvExp>0</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<bDave2>0</bDave2>
|
|
||||||
<PathWithFileName>..\PjtKEIL_StepSon\Src\GestionSon.s</PathWithFileName>
|
|
||||||
<FilenameWithoutPath>GestionSon.s</FilenameWithoutPath>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<bShared>0</bShared>
|
|
||||||
</File>
|
|
||||||
</Group>
|
|
||||||
|
|
||||||
<Group>
|
<Group>
|
||||||
<GroupName>::CMSIS</GroupName>
|
<GroupName>::CMSIS</GroupName>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
<TargetName>Simu</TargetName>
|
<TargetName>Simu</TargetName>
|
||||||
<ToolsetNumber>0x4</ToolsetNumber>
|
<ToolsetNumber>0x4</ToolsetNumber>
|
||||||
<ToolsetName>ARM-ADS</ToolsetName>
|
<ToolsetName>ARM-ADS</ToolsetName>
|
||||||
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
|
<pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
|
||||||
<uAC6>0</uAC6>
|
<uAC6>0</uAC6>
|
||||||
<TargetOption>
|
<TargetOption>
|
||||||
<TargetCommonOption>
|
<TargetCommonOption>
|
||||||
|
|
@ -357,7 +357,7 @@
|
||||||
<MiscControls></MiscControls>
|
<MiscControls></MiscControls>
|
||||||
<Define></Define>
|
<Define></Define>
|
||||||
<Undefine></Undefine>
|
<Undefine></Undefine>
|
||||||
<IncludePath>..\PjtKEIL_StepDeb_2\Driver</IncludePath>
|
<IncludePath></IncludePath>
|
||||||
</VariousControls>
|
</VariousControls>
|
||||||
</Aads>
|
</Aads>
|
||||||
<LDads>
|
<LDads>
|
||||||
|
|
@ -383,25 +383,15 @@
|
||||||
<Group>
|
<Group>
|
||||||
<GroupName>Sources</GroupName>
|
<GroupName>Sources</GroupName>
|
||||||
<Files>
|
<Files>
|
||||||
<File>
|
|
||||||
<FileName>bruitverre.asm</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\bruitverre.asm</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>GestionSon.s</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\GestionSon.s</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
<File>
|
||||||
<FileName>principal.c</FileName>
|
<FileName>principal.c</FileName>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\principal.c</FilePath>
|
<FilePath>.\Src\principal.c</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<FileName>startup-rvds.s</FileName>
|
<FileName>Delay.s</FileName>
|
||||||
<FileType>2</FileType>
|
<FileType>2</FileType>
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\startup-rvds.s</FilePath>
|
<FilePath>.\Src\Delay.s</FilePath>
|
||||||
</File>
|
</File>
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
@ -425,21 +415,6 @@
|
||||||
</File>
|
</File>
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
|
||||||
<GroupName>Son</GroupName>
|
|
||||||
<Files>
|
|
||||||
<File>
|
|
||||||
<FileName>bruitverre.asm</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\bruitverre.asm</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>GestionSon.s</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\GestionSon.s</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
|
||||||
</Group>
|
|
||||||
<Group>
|
<Group>
|
||||||
<GroupName>::CMSIS</GroupName>
|
<GroupName>::CMSIS</GroupName>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
@ -449,7 +424,7 @@
|
||||||
<TargetName>CibleSondeKEIL</TargetName>
|
<TargetName>CibleSondeKEIL</TargetName>
|
||||||
<ToolsetNumber>0x4</ToolsetNumber>
|
<ToolsetNumber>0x4</ToolsetNumber>
|
||||||
<ToolsetName>ARM-ADS</ToolsetName>
|
<ToolsetName>ARM-ADS</ToolsetName>
|
||||||
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
|
<pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
|
||||||
<uAC6>0</uAC6>
|
<uAC6>0</uAC6>
|
||||||
<TargetOption>
|
<TargetOption>
|
||||||
<TargetCommonOption>
|
<TargetCommonOption>
|
||||||
|
|
@ -822,25 +797,15 @@
|
||||||
<Group>
|
<Group>
|
||||||
<GroupName>Sources</GroupName>
|
<GroupName>Sources</GroupName>
|
||||||
<Files>
|
<Files>
|
||||||
<File>
|
|
||||||
<FileName>bruitverre.asm</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\bruitverre.asm</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>GestionSon.s</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\GestionSon.s</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
<File>
|
||||||
<FileName>principal.c</FileName>
|
<FileName>principal.c</FileName>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\principal.c</FilePath>
|
<FilePath>.\Src\principal.c</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<FileName>startup-rvds.s</FileName>
|
<FileName>Delay.s</FileName>
|
||||||
<FileType>2</FileType>
|
<FileType>2</FileType>
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\startup-rvds.s</FilePath>
|
<FilePath>.\Src\Delay.s</FilePath>
|
||||||
</File>
|
</File>
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
@ -864,21 +829,6 @@
|
||||||
</File>
|
</File>
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
|
||||||
<GroupName>Son</GroupName>
|
|
||||||
<Files>
|
|
||||||
<File>
|
|
||||||
<FileName>bruitverre.asm</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\bruitverre.asm</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>GestionSon.s</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\GestionSon.s</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
|
||||||
</Group>
|
|
||||||
<Group>
|
<Group>
|
||||||
<GroupName>::CMSIS</GroupName>
|
<GroupName>::CMSIS</GroupName>
|
||||||
<GroupOption>
|
<GroupOption>
|
||||||
|
|
@ -957,7 +907,7 @@
|
||||||
<TargetName>CibleSondeST</TargetName>
|
<TargetName>CibleSondeST</TargetName>
|
||||||
<ToolsetNumber>0x4</ToolsetNumber>
|
<ToolsetNumber>0x4</ToolsetNumber>
|
||||||
<ToolsetName>ARM-ADS</ToolsetName>
|
<ToolsetName>ARM-ADS</ToolsetName>
|
||||||
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
|
<pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
|
||||||
<uAC6>0</uAC6>
|
<uAC6>0</uAC6>
|
||||||
<TargetOption>
|
<TargetOption>
|
||||||
<TargetCommonOption>
|
<TargetCommonOption>
|
||||||
|
|
@ -1330,25 +1280,15 @@
|
||||||
<Group>
|
<Group>
|
||||||
<GroupName>Sources</GroupName>
|
<GroupName>Sources</GroupName>
|
||||||
<Files>
|
<Files>
|
||||||
<File>
|
|
||||||
<FileName>bruitverre.asm</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\bruitverre.asm</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>GestionSon.s</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\GestionSon.s</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
<File>
|
||||||
<FileName>principal.c</FileName>
|
<FileName>principal.c</FileName>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\principal.c</FilePath>
|
<FilePath>.\Src\principal.c</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
<File>
|
||||||
<FileName>startup-rvds.s</FileName>
|
<FileName>Delay.s</FileName>
|
||||||
<FileType>2</FileType>
|
<FileType>2</FileType>
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\startup-rvds.s</FilePath>
|
<FilePath>.\Src\Delay.s</FilePath>
|
||||||
</File>
|
</File>
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
@ -1372,21 +1312,6 @@
|
||||||
</File>
|
</File>
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
|
||||||
<GroupName>Son</GroupName>
|
|
||||||
<Files>
|
|
||||||
<File>
|
|
||||||
<FileName>bruitverre.asm</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\bruitverre.asm</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>GestionSon.s</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>..\PjtKEIL_StepSon\Src\GestionSon.s</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
|
||||||
</Group>
|
|
||||||
<Group>
|
<Group>
|
||||||
<GroupName>::CMSIS</GroupName>
|
<GroupName>::CMSIS</GroupName>
|
||||||
</Group>
|
</Group>
|
||||||
|
|
@ -1412,7 +1337,12 @@
|
||||||
<LayerInfo>
|
<LayerInfo>
|
||||||
<Layers>
|
<Layers>
|
||||||
<Layer>
|
<Layer>
|
||||||
<LayName>BacASable</LayName>
|
<LayName><Project Info></LayName>
|
||||||
|
<LayDesc></LayDesc>
|
||||||
|
<LayUrl></LayUrl>
|
||||||
|
<LayKeys></LayKeys>
|
||||||
|
<LayCat></LayCat>
|
||||||
|
<LayLic></LayLic>
|
||||||
<LayTarg>0</LayTarg>
|
<LayTarg>0</LayTarg>
|
||||||
<LayPrjMark>1</LayPrjMark>
|
<LayPrjMark>1</LayPrjMark>
|
||||||
</Layer>
|
</Layer>
|
||||||
|
|
|
||||||
|
|
@ -4,20 +4,19 @@
|
||||||
|
|
||||||
; ====================== zone de réservation de données, ======================================
|
; ====================== zone de réservation de données, ======================================
|
||||||
;Section RAM (read only) :
|
;Section RAM (read only) :
|
||||||
area mesdata,data,readonly ;directive AREA name,attr1,attr2 : dis a l'assembleur d'assembler une nouvelle zone de code de nom "name", de type "data" en lecture seulement
|
area mesdata,data,readonly
|
||||||
|
|
||||||
|
|
||||||
;Section RAM (read write):
|
;Section RAM (read write):
|
||||||
area maram,data,readwrite
|
area maram,data,readwrite
|
||||||
|
|
||||||
export VarTime
|
VarTime dcd 0
|
||||||
VarTime dcd 0 ; VarTime est une adresse qui pointe sur une variable de 4octets, initialisée à 0 (int VarTime = 0 en C)
|
|
||||||
|
|
||||||
|
|
||||||
; ===============================================================================================
|
; ===============================================================================================
|
||||||
|
|
||||||
;constantes (équivalent du #define en C)
|
;constantes (équivalent du #define en C)
|
||||||
TimeValue equ 900000 ; donne la valeur 900000 à TimeValue
|
TimeValue equ 900000
|
||||||
|
|
||||||
|
|
||||||
EXPORT Delay_100ms ; la fonction Delay_100ms est rendue publique donc utilisable par d'autres modules.
|
EXPORT Delay_100ms ; la fonction Delay_100ms est rendue publique donc utilisable par d'autres modules.
|
||||||
|
|
@ -45,16 +44,16 @@ Delay_100ms proc
|
||||||
ldr r0,=VarTime
|
ldr r0,=VarTime
|
||||||
|
|
||||||
ldr r1,=TimeValue
|
ldr r1,=TimeValue
|
||||||
str r1,[r0] ; place la valeur stockée dans le registre r1 (TimeValue) en mémoire vive à l'adresse VarTime
|
str r1,[r0]
|
||||||
|
|
||||||
BoucleTempo
|
BoucleTempo
|
||||||
ldr r1,[r0]
|
ldr r1,[r0]
|
||||||
|
|
||||||
subs r1,#1 ;on soustrait 1 à la valeur de r1, le s va nous permettre de sortir de la boucle qui va commencer lorsqu'on va arriver à l'instruction bne
|
subs r1,#1
|
||||||
str r1,[r0]
|
str r1,[r0]
|
||||||
bne BoucleTempo ;tant que le flag Z est égal à 0, on refait la boucle à partir de BoucleTempo
|
bne BoucleTempo
|
||||||
|
|
||||||
bx lr ; branch to link register : le compteur programme (adresse mémoire en cours d'execution) est écrasé par la valeur présente dans l'adresse de retour (lr)
|
bx lr
|
||||||
endp
|
endp
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
<aExt>*.s*; *.src; *.a*</aExt>
|
<aExt>*.s*; *.src; *.a*</aExt>
|
||||||
<oExt>*.obj; *.o</oExt>
|
<oExt>*.obj; *.o</oExt>
|
||||||
<lExt>*.lib</lExt>
|
<lExt>*.lib</lExt>
|
||||||
<tExt>*.txt; *.h; *.inc; *.md</tExt>
|
<tExt>*.txt; *.h; *.inc</tExt>
|
||||||
<pExt>*.plm</pExt>
|
<pExt>*.plm</pExt>
|
||||||
<CppX>*.cpp</CppX>
|
<CppX>*.cpp</CppX>
|
||||||
<nMigrate>0</nMigrate>
|
<nMigrate>0</nMigrate>
|
||||||
|
|
@ -200,7 +200,7 @@
|
||||||
<Wi>
|
<Wi>
|
||||||
<IntNumber>0</IntNumber>
|
<IntNumber>0</IntNumber>
|
||||||
<FirstString>((portb & 0x00000002) >> 1 & 0x2) >> 1</FirstString>
|
<FirstString>((portb & 0x00000002) >> 1 & 0x2) >> 1</FirstString>
|
||||||
<SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F150000000000000000000000000000000000000096020008</SecondString>
|
<SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F160000000000000000000000000000000000000096020008</SecondString>
|
||||||
</Wi>
|
</Wi>
|
||||||
</LogicAnalyzers>
|
</LogicAnalyzers>
|
||||||
<DebugDescription>
|
<DebugDescription>
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
<TargetName>Simu</TargetName>
|
<TargetName>Simu</TargetName>
|
||||||
<ToolsetNumber>0x4</ToolsetNumber>
|
<ToolsetNumber>0x4</ToolsetNumber>
|
||||||
<ToolsetName>ARM-ADS</ToolsetName>
|
<ToolsetName>ARM-ADS</ToolsetName>
|
||||||
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
|
<pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
|
||||||
<uAC6>0</uAC6>
|
<uAC6>0</uAC6>
|
||||||
<TargetOption>
|
<TargetOption>
|
||||||
<TargetCommonOption>
|
<TargetCommonOption>
|
||||||
|
|
@ -357,7 +357,7 @@
|
||||||
<MiscControls></MiscControls>
|
<MiscControls></MiscControls>
|
||||||
<Define></Define>
|
<Define></Define>
|
||||||
<Undefine></Undefine>
|
<Undefine></Undefine>
|
||||||
<IncludePath>.\Driver</IncludePath>
|
<IncludePath></IncludePath>
|
||||||
</VariousControls>
|
</VariousControls>
|
||||||
</Aads>
|
</Aads>
|
||||||
<LDads>
|
<LDads>
|
||||||
|
|
@ -1338,6 +1338,11 @@
|
||||||
<Layers>
|
<Layers>
|
||||||
<Layer>
|
<Layer>
|
||||||
<LayName><Project Info></LayName>
|
<LayName><Project Info></LayName>
|
||||||
|
<LayDesc></LayDesc>
|
||||||
|
<LayUrl></LayUrl>
|
||||||
|
<LayKeys></LayKeys>
|
||||||
|
<LayCat></LayCat>
|
||||||
|
<LayLic></LayLic>
|
||||||
<LayTarg>0</LayTarg>
|
<LayTarg>0</LayTarg>
|
||||||
<LayPrjMark>1</LayPrjMark>
|
<LayPrjMark>1</LayPrjMark>
|
||||||
</Layer>
|
</Layer>
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,6 @@
|
||||||
PRESERVE8
|
PRESERVE8
|
||||||
THUMB
|
THUMB
|
||||||
|
|
||||||
include DriverJeuLaser.inc
|
|
||||||
|
|
||||||
export timer_callback
|
|
||||||
export FlagCligno
|
|
||||||
|
|
||||||
;void timer_callback(void)
|
|
||||||
;{
|
|
||||||
; if (FlagCligno==1)
|
|
||||||
; {
|
|
||||||
; FlagCligno=0;
|
|
||||||
; GPIOB_Set(1);
|
|
||||||
; }
|
|
||||||
; else
|
|
||||||
; {
|
|
||||||
; FlagCligno=1;
|
|
||||||
; GPIOB_Clear(1);
|
|
||||||
; }
|
|
||||||
;
|
|
||||||
;}*/
|
|
||||||
|
|
||||||
|
|
||||||
; ====================== zone de réservation de données, ======================================
|
; ====================== zone de réservation de données, ======================================
|
||||||
;Section RAM (read only) :
|
;Section RAM (read only) :
|
||||||
|
|
@ -29,8 +9,8 @@
|
||||||
|
|
||||||
;Section RAM (read write):
|
;Section RAM (read write):
|
||||||
area maram,data,readwrite
|
area maram,data,readwrite
|
||||||
FlagCligno dcd 0
|
|
||||||
index dcd 0
|
|
||||||
|
|
||||||
; ===============================================================================================
|
; ===============================================================================================
|
||||||
|
|
||||||
|
|
@ -41,52 +21,10 @@ index dcd 0
|
||||||
area moncode,code,readonly
|
area moncode,code,readonly
|
||||||
; écrire le code ici
|
; écrire le code ici
|
||||||
|
|
||||||
timer_callback proc
|
|
||||||
;void timer_callback(void)
|
|
||||||
;{
|
|
||||||
push {lr}
|
|
||||||
; if (FlagCligno==1)
|
|
||||||
ldr r0,=FlagCligno
|
|
||||||
ldr r1,[r0]
|
|
||||||
cmp r1,#1
|
|
||||||
|
|
||||||
|
|
||||||
; {
|
|
||||||
; FlagCligno=0;
|
|
||||||
|
|
||||||
beq alors
|
|
||||||
sinon
|
|
||||||
adds r1,#1
|
|
||||||
str r1,[r0]
|
|
||||||
mov R0,#1
|
|
||||||
bl GPIOB_Clear
|
|
||||||
b finsi
|
|
||||||
alors
|
|
||||||
subs r1,#1
|
|
||||||
str r1,[r0]
|
|
||||||
|
|
||||||
|
|
||||||
; GPIOB_Set(1);
|
|
||||||
mov R0,#1
|
|
||||||
bl GPIOB_Set
|
|
||||||
|
|
||||||
; }
|
|
||||||
; else
|
|
||||||
|
|
||||||
|
|
||||||
; {
|
|
||||||
; FlagCligno=1;
|
|
||||||
|
|
||||||
; GPIOB_Clear(1);
|
|
||||||
|
|
||||||
|
|
||||||
finsi
|
|
||||||
pop {lr}
|
|
||||||
bx lr
|
|
||||||
; }
|
|
||||||
;
|
|
||||||
;}*/
|
|
||||||
|
|
||||||
endp
|
|
||||||
|
|
||||||
END
|
END
|
||||||
|
|
@ -2,9 +2,7 @@
|
||||||
|
|
||||||
#include "DriverJeuLaser.h"
|
#include "DriverJeuLaser.h"
|
||||||
|
|
||||||
extern void timer_callback(void);
|
void timer_callback(void);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
|
|
@ -19,8 +17,7 @@ CLOCK_Configure();
|
||||||
// configuration du Timer 4 en débordement 100ms
|
// configuration du Timer 4 en débordement 100ms
|
||||||
|
|
||||||
//** Placez votre code là ** //
|
//** Placez votre code là ** //
|
||||||
Timer_1234_Init_ff( TIM4, 7200000);
|
|
||||||
Active_IT_Debordement_Timer( TIM4, 2, timer_callback );
|
|
||||||
|
|
||||||
|
|
||||||
// Activation des interruptions issues du Timer 4
|
// Activation des interruptions issues du Timer 4
|
||||||
|
|
@ -45,9 +42,8 @@ while (1)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//char FlagCligno;
|
char FlagCligno;
|
||||||
|
|
||||||
/*
|
|
||||||
void timer_callback(void)
|
void timer_callback(void)
|
||||||
{
|
{
|
||||||
if (FlagCligno==1)
|
if (FlagCligno==1)
|
||||||
|
|
@ -61,5 +57,5 @@ void timer_callback(void)
|
||||||
GPIOB_Clear(1);
|
GPIOB_Clear(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
}*/
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void CallbackSon(void);
|
|
||||||
void StartSon(void);
|
|
||||||
|
|
@ -1,13 +1,6 @@
|
||||||
PRESERVE8
|
PRESERVE8
|
||||||
THUMB
|
THUMB
|
||||||
|
|
||||||
export CallbackSon
|
|
||||||
export index
|
|
||||||
export SortieSon
|
|
||||||
export StartSon
|
|
||||||
import LongueurSon
|
|
||||||
import Son
|
|
||||||
import PWM_Set_Value_TIM3_Ch3
|
|
||||||
|
|
||||||
; ====================== zone de réservation de données, ======================================
|
; ====================== zone de réservation de données, ======================================
|
||||||
;Section RAM (read only) :
|
;Section RAM (read only) :
|
||||||
|
|
@ -16,8 +9,7 @@
|
||||||
|
|
||||||
;Section RAM (read write):
|
;Section RAM (read write):
|
||||||
area maram,data,readwrite
|
area maram,data,readwrite
|
||||||
SortieSon dcw 0
|
|
||||||
index dcd 0
|
|
||||||
|
|
||||||
|
|
||||||
; ===============================================================================================
|
; ===============================================================================================
|
||||||
|
|
@ -29,61 +21,10 @@ index dcd 0
|
||||||
area moncode,code,readonly
|
area moncode,code,readonly
|
||||||
; écrire le code ici
|
; écrire le code ici
|
||||||
|
|
||||||
CallbackSon proc
|
|
||||||
push {lr,r4-r7}
|
|
||||||
ldr r4,=LongueurSon
|
|
||||||
ldr r4,[r4]
|
|
||||||
ldr r2,=index
|
|
||||||
ldr r7,[r2] ;r7 = valeur de index
|
|
||||||
cmp r4,r7
|
|
||||||
|
|
||||||
bne alors
|
|
||||||
|
|
||||||
sinon
|
|
||||||
b finsi
|
|
||||||
|
|
||||||
alors
|
|
||||||
ldr r3,=SortieSon
|
|
||||||
ldr r1,=Son
|
|
||||||
|
|
||||||
ldrsh r0,[r1,r7,lsl#1] ; R0 = *(R1+2*R7 ) R0 = R1[R7]
|
|
||||||
|
|
||||||
mov r5,#32768
|
|
||||||
add r0,r5
|
|
||||||
|
|
||||||
mov r6,#719
|
|
||||||
mul r0,r6
|
|
||||||
;ldr r6,=23560192 ;719*32768
|
|
||||||
asr r0,#16 ; décalage de 16
|
|
||||||
;add r0,r6
|
|
||||||
|
|
||||||
; mise à jour de SortieSon
|
|
||||||
strh r0,[r3]
|
|
||||||
;ldr r3,[r0]
|
|
||||||
; mettre à jour la PWM
|
|
||||||
bl PWM_Set_Value_TIM3_Ch3 ;on appelle la fonction avec r0 en paramètre
|
|
||||||
|
|
||||||
add r7,#1 ;index=index+1
|
|
||||||
str r7,[r2] ; *R2 = R7
|
|
||||||
|
|
||||||
|
|
||||||
finsi
|
|
||||||
pop {lr,r4-r7}
|
|
||||||
bx lr
|
|
||||||
endp
|
|
||||||
|
|
||||||
StartSon proc
|
|
||||||
ldr r0,=index
|
|
||||||
ldr r1,[r0]
|
|
||||||
mov r1,#0
|
|
||||||
str r1,[r0]
|
|
||||||
bx lr
|
|
||||||
endp
|
|
||||||
|
|
||||||
END
|
END
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,10 @@
|
||||||
|
|
||||||
|
|
||||||
#include "DriverJeuLaser.h"
|
#include "DriverJeuLaser.h"
|
||||||
|
|
||||||
|
|
||||||
//extern u32 * PeriodeSonMicroSec;
|
|
||||||
|
|
||||||
extern void CallbackSon(void);
|
|
||||||
extern void StartSon(void);
|
|
||||||
int bouton=0;
|
|
||||||
|
|
||||||
int main(void)
|
int main(void)
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
// ===========================================================================
|
// ===========================================================================
|
||||||
|
|
@ -18,11 +13,8 @@ int main(void)
|
||||||
|
|
||||||
// Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers
|
// Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers
|
||||||
CLOCK_Configure();
|
CLOCK_Configure();
|
||||||
GPIO_Configure(GPIOB, 0, OUTPUT, ALT_PPULL);
|
|
||||||
PWM_Init_ff( TIM3, 3, 720);
|
|
||||||
PWM_Set_Value_TIM3_Ch3(360);
|
|
||||||
Timer_1234_Init_ff( TIM4, 91*72); //Calcul de la periode de 91 microsec *72 Mhz
|
|
||||||
Active_IT_Debordement_Timer( TIM4, 2, CallbackSon );
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -31,23 +23,6 @@ Active_IT_Debordement_Timer( TIM4, 2, CallbackSon );
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
if (bouton==1) {
|
|
||||||
StartSon();
|
|
||||||
bouton=0;
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
short int SortieSon
|
|
||||||
int index
|
|
||||||
Algo CallbackSon
|
|
||||||
if index<longueur
|
|
||||||
on stocke son[index] dans r0
|
|
||||||
mise a l'echelle
|
|
||||||
sortieson=a*son[index]+b
|
|
||||||
index ++
|
|
||||||
}
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
<aExt>*.s*; *.src; *.a*</aExt>
|
<aExt>*.s*; *.src; *.a*</aExt>
|
||||||
<oExt>*.obj; *.o</oExt>
|
<oExt>*.obj; *.o</oExt>
|
||||||
<lExt>*.lib</lExt>
|
<lExt>*.lib</lExt>
|
||||||
<tExt>*.txt; *.h; *.inc; *.md</tExt>
|
<tExt>*.txt; *.h; *.inc</tExt>
|
||||||
<pExt>*.plm</pExt>
|
<pExt>*.plm</pExt>
|
||||||
<CppX>*.cpp</CppX>
|
<CppX>*.cpp</CppX>
|
||||||
<nMigrate>0</nMigrate>
|
<nMigrate>0</nMigrate>
|
||||||
|
|
@ -154,14 +154,6 @@
|
||||||
</SetRegEntry>
|
</SetRegEntry>
|
||||||
</TargetDriverDllRegistry>
|
</TargetDriverDllRegistry>
|
||||||
<Breakpoint/>
|
<Breakpoint/>
|
||||||
<MemoryWindow1>
|
|
||||||
<Mm>
|
|
||||||
<WinNumber>1</WinNumber>
|
|
||||||
<SubType>266</SubType>
|
|
||||||
<ItemText>R3</ItemText>
|
|
||||||
<AccSizeX>0</AccSizeX>
|
|
||||||
</Mm>
|
|
||||||
</MemoryWindow1>
|
|
||||||
<Tracepoint>
|
<Tracepoint>
|
||||||
<THDelay>0</THDelay>
|
<THDelay>0</THDelay>
|
||||||
</Tracepoint>
|
</Tracepoint>
|
||||||
|
|
@ -182,7 +174,7 @@
|
||||||
<AscS3>0</AscS3>
|
<AscS3>0</AscS3>
|
||||||
<aSer3>0</aSer3>
|
<aSer3>0</aSer3>
|
||||||
<eProf>0</eProf>
|
<eProf>0</eProf>
|
||||||
<aLa>1</aLa>
|
<aLa>0</aLa>
|
||||||
<aPa1>0</aPa1>
|
<aPa1>0</aPa1>
|
||||||
<AscS4>0</AscS4>
|
<AscS4>0</AscS4>
|
||||||
<aSer4>0</aSer4>
|
<aSer4>0</aSer4>
|
||||||
|
|
@ -207,13 +199,8 @@
|
||||||
<LogicAnalyzers>
|
<LogicAnalyzers>
|
||||||
<Wi>
|
<Wi>
|
||||||
<IntNumber>0</IntNumber>
|
<IntNumber>0</IntNumber>
|
||||||
<FirstString>`SortieSon</FirstString>
|
<FirstString>((portb & 0x00000002) >> 1 & 0x2) >> 1</FirstString>
|
||||||
<SecondString>008000000000000000000000000000000070864000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F090000000000000000000000000000000000000094080008</SecondString>
|
<SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F160000000000000000000000000000000000000096020008</SecondString>
|
||||||
</Wi>
|
|
||||||
<Wi>
|
|
||||||
<IntNumber>1</IntNumber>
|
|
||||||
<FirstString>(PORTB & 0x00000001)</FirstString>
|
|
||||||
<SecondString>000080000000000000000000000000000000F03F0000000000000000000000000000000028504F52544220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F09000000000000000000000000000000000000008E0A0008</SecondString>
|
|
||||||
</Wi>
|
</Wi>
|
||||||
</LogicAnalyzers>
|
</LogicAnalyzers>
|
||||||
<DebugDescription>
|
<DebugDescription>
|
||||||
|
|
@ -280,7 +267,7 @@
|
||||||
<OPTFL>
|
<OPTFL>
|
||||||
<tvExp>1</tvExp>
|
<tvExp>1</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
<IsCurrentTarget>1</IsCurrentTarget>
|
<IsCurrentTarget>0</IsCurrentTarget>
|
||||||
</OPTFL>
|
</OPTFL>
|
||||||
<CpuCode>18</CpuCode>
|
<CpuCode>18</CpuCode>
|
||||||
<DebugOpt>
|
<DebugOpt>
|
||||||
|
|
@ -359,13 +346,6 @@
|
||||||
</SetRegEntry>
|
</SetRegEntry>
|
||||||
</TargetDriverDllRegistry>
|
</TargetDriverDllRegistry>
|
||||||
<Breakpoint/>
|
<Breakpoint/>
|
||||||
<WatchWindow1>
|
|
||||||
<Ww>
|
|
||||||
<count>0</count>
|
|
||||||
<WinNumber>1</WinNumber>
|
|
||||||
<ItemText>bouton</ItemText>
|
|
||||||
</Ww>
|
|
||||||
</WatchWindow1>
|
|
||||||
<MemoryWindow1>
|
<MemoryWindow1>
|
||||||
<Mm>
|
<Mm>
|
||||||
<WinNumber>1</WinNumber>
|
<WinNumber>1</WinNumber>
|
||||||
|
|
@ -394,7 +374,7 @@
|
||||||
<AscS3>0</AscS3>
|
<AscS3>0</AscS3>
|
||||||
<aSer3>0</aSer3>
|
<aSer3>0</aSer3>
|
||||||
<eProf>0</eProf>
|
<eProf>0</eProf>
|
||||||
<aLa>1</aLa>
|
<aLa>0</aLa>
|
||||||
<aPa1>0</aPa1>
|
<aPa1>0</aPa1>
|
||||||
<AscS4>0</AscS4>
|
<AscS4>0</AscS4>
|
||||||
<aSer4>0</aSer4>
|
<aSer4>0</aSer4>
|
||||||
|
|
@ -480,7 +460,7 @@
|
||||||
<OPTFL>
|
<OPTFL>
|
||||||
<tvExp>1</tvExp>
|
<tvExp>1</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
<IsCurrentTarget>0</IsCurrentTarget>
|
<IsCurrentTarget>1</IsCurrentTarget>
|
||||||
</OPTFL>
|
</OPTFL>
|
||||||
<CpuCode>18</CpuCode>
|
<CpuCode>18</CpuCode>
|
||||||
<DebugOpt>
|
<DebugOpt>
|
||||||
|
|
@ -636,7 +616,7 @@
|
||||||
<GroupNumber>1</GroupNumber>
|
<GroupNumber>1</GroupNumber>
|
||||||
<FileNumber>1</FileNumber>
|
<FileNumber>1</FileNumber>
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<tvExp>1</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
<bDave2>0</bDave2>
|
<bDave2>0</bDave2>
|
||||||
<PathWithFileName>.\Src\principal.c</PathWithFileName>
|
<PathWithFileName>.\Src\principal.c</PathWithFileName>
|
||||||
|
|
@ -644,18 +624,6 @@
|
||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<bShared>0</bShared>
|
<bShared>0</bShared>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<GroupNumber>1</GroupNumber>
|
|
||||||
<FileNumber>2</FileNumber>
|
|
||||||
<FileType>5</FileType>
|
|
||||||
<tvExp>0</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<bDave2>0</bDave2>
|
|
||||||
<PathWithFileName>.\GestionSon.h</PathWithFileName>
|
|
||||||
<FilenameWithoutPath>GestionSon.h</FilenameWithoutPath>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<bShared>0</bShared>
|
|
||||||
</File>
|
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Group>
|
<Group>
|
||||||
|
|
@ -666,7 +634,7 @@
|
||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>2</GroupNumber>
|
<GroupNumber>2</GroupNumber>
|
||||||
<FileNumber>3</FileNumber>
|
<FileNumber>2</FileNumber>
|
||||||
<FileType>2</FileType>
|
<FileType>2</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
|
|
@ -686,7 +654,7 @@
|
||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<File>
|
<File>
|
||||||
<GroupNumber>3</GroupNumber>
|
<GroupNumber>3</GroupNumber>
|
||||||
<FileNumber>4</FileNumber>
|
<FileNumber>3</FileNumber>
|
||||||
<FileType>4</FileType>
|
<FileType>4</FileType>
|
||||||
<tvExp>0</tvExp>
|
<tvExp>0</tvExp>
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
<tvExpOptDlg>0</tvExpOptDlg>
|
||||||
|
|
@ -696,62 +664,6 @@
|
||||||
<RteFlg>0</RteFlg>
|
<RteFlg>0</RteFlg>
|
||||||
<bShared>0</bShared>
|
<bShared>0</bShared>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<GroupNumber>3</GroupNumber>
|
|
||||||
<FileNumber>5</FileNumber>
|
|
||||||
<FileType>5</FileType>
|
|
||||||
<tvExp>0</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<bDave2>0</bDave2>
|
|
||||||
<PathWithFileName>.\Driver\DriverJeuLaser.h</PathWithFileName>
|
|
||||||
<FilenameWithoutPath>DriverJeuLaser.h</FilenameWithoutPath>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<bShared>0</bShared>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<GroupNumber>3</GroupNumber>
|
|
||||||
<FileNumber>6</FileNumber>
|
|
||||||
<FileType>5</FileType>
|
|
||||||
<tvExp>0</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<bDave2>0</bDave2>
|
|
||||||
<PathWithFileName>.\Driver\DriverJeuLaser.inc</PathWithFileName>
|
|
||||||
<FilenameWithoutPath>DriverJeuLaser.inc</FilenameWithoutPath>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<bShared>0</bShared>
|
|
||||||
</File>
|
|
||||||
</Group>
|
|
||||||
|
|
||||||
<Group>
|
|
||||||
<GroupName>Son</GroupName>
|
|
||||||
<tvExp>1</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<cbSel>0</cbSel>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<File>
|
|
||||||
<GroupNumber>4</GroupNumber>
|
|
||||||
<FileNumber>7</FileNumber>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<tvExp>0</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<bDave2>0</bDave2>
|
|
||||||
<PathWithFileName>.\Src\bruitverre.asm</PathWithFileName>
|
|
||||||
<FilenameWithoutPath>bruitverre.asm</FilenameWithoutPath>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<bShared>0</bShared>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<GroupNumber>4</GroupNumber>
|
|
||||||
<FileNumber>8</FileNumber>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<tvExp>0</tvExp>
|
|
||||||
<tvExpOptDlg>0</tvExpOptDlg>
|
|
||||||
<bDave2>0</bDave2>
|
|
||||||
<PathWithFileName>.\Src\GestionSon.s</PathWithFileName>
|
|
||||||
<FilenameWithoutPath>GestionSon.s</FilenameWithoutPath>
|
|
||||||
<RteFlg>0</RteFlg>
|
|
||||||
<bShared>0</bShared>
|
|
||||||
</File>
|
|
||||||
</Group>
|
</Group>
|
||||||
|
|
||||||
<Group>
|
<Group>
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
<TargetName>Simu</TargetName>
|
<TargetName>Simu</TargetName>
|
||||||
<ToolsetNumber>0x4</ToolsetNumber>
|
<ToolsetNumber>0x4</ToolsetNumber>
|
||||||
<ToolsetName>ARM-ADS</ToolsetName>
|
<ToolsetName>ARM-ADS</ToolsetName>
|
||||||
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
|
<pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
|
||||||
<uAC6>0</uAC6>
|
<uAC6>0</uAC6>
|
||||||
<TargetOption>
|
<TargetOption>
|
||||||
<TargetCommonOption>
|
<TargetCommonOption>
|
||||||
|
|
@ -388,11 +388,6 @@
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<FilePath>.\Src\principal.c</FilePath>
|
<FilePath>.\Src\principal.c</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<FileName>GestionSon.h</FileName>
|
|
||||||
<FileType>5</FileType>
|
|
||||||
<FilePath>.\GestionSon.h</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
<Group>
|
||||||
|
|
@ -413,31 +408,6 @@
|
||||||
<FileType>4</FileType>
|
<FileType>4</FileType>
|
||||||
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
|
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<FileName>DriverJeuLaser.h</FileName>
|
|
||||||
<FileType>5</FileType>
|
|
||||||
<FilePath>.\Driver\DriverJeuLaser.h</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>DriverJeuLaser.inc</FileName>
|
|
||||||
<FileType>5</FileType>
|
|
||||||
<FilePath>.\Driver\DriverJeuLaser.inc</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
|
||||||
</Group>
|
|
||||||
<Group>
|
|
||||||
<GroupName>Son</GroupName>
|
|
||||||
<Files>
|
|
||||||
<File>
|
|
||||||
<FileName>bruitverre.asm</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>.\Src\bruitverre.asm</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>GestionSon.s</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>.\Src\GestionSon.s</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
<Group>
|
||||||
|
|
@ -449,7 +419,7 @@
|
||||||
<TargetName>CibleSondeKEIL</TargetName>
|
<TargetName>CibleSondeKEIL</TargetName>
|
||||||
<ToolsetNumber>0x4</ToolsetNumber>
|
<ToolsetNumber>0x4</ToolsetNumber>
|
||||||
<ToolsetName>ARM-ADS</ToolsetName>
|
<ToolsetName>ARM-ADS</ToolsetName>
|
||||||
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
|
<pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
|
||||||
<uAC6>0</uAC6>
|
<uAC6>0</uAC6>
|
||||||
<TargetOption>
|
<TargetOption>
|
||||||
<TargetCommonOption>
|
<TargetCommonOption>
|
||||||
|
|
@ -827,11 +797,6 @@
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<FilePath>.\Src\principal.c</FilePath>
|
<FilePath>.\Src\principal.c</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<FileName>GestionSon.h</FileName>
|
|
||||||
<FileType>5</FileType>
|
|
||||||
<FilePath>.\GestionSon.h</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
<Group>
|
||||||
|
|
@ -852,31 +817,6 @@
|
||||||
<FileType>4</FileType>
|
<FileType>4</FileType>
|
||||||
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
|
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<FileName>DriverJeuLaser.h</FileName>
|
|
||||||
<FileType>5</FileType>
|
|
||||||
<FilePath>.\Driver\DriverJeuLaser.h</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>DriverJeuLaser.inc</FileName>
|
|
||||||
<FileType>5</FileType>
|
|
||||||
<FilePath>.\Driver\DriverJeuLaser.inc</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
|
||||||
</Group>
|
|
||||||
<Group>
|
|
||||||
<GroupName>Son</GroupName>
|
|
||||||
<Files>
|
|
||||||
<File>
|
|
||||||
<FileName>bruitverre.asm</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>.\Src\bruitverre.asm</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>GestionSon.s</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>.\Src\GestionSon.s</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
<Group>
|
||||||
|
|
@ -957,7 +897,7 @@
|
||||||
<TargetName>CibleSondeST</TargetName>
|
<TargetName>CibleSondeST</TargetName>
|
||||||
<ToolsetNumber>0x4</ToolsetNumber>
|
<ToolsetNumber>0x4</ToolsetNumber>
|
||||||
<ToolsetName>ARM-ADS</ToolsetName>
|
<ToolsetName>ARM-ADS</ToolsetName>
|
||||||
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
|
<pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
|
||||||
<uAC6>0</uAC6>
|
<uAC6>0</uAC6>
|
||||||
<TargetOption>
|
<TargetOption>
|
||||||
<TargetCommonOption>
|
<TargetCommonOption>
|
||||||
|
|
@ -1335,11 +1275,6 @@
|
||||||
<FileType>1</FileType>
|
<FileType>1</FileType>
|
||||||
<FilePath>.\Src\principal.c</FilePath>
|
<FilePath>.\Src\principal.c</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<FileName>GestionSon.h</FileName>
|
|
||||||
<FileType>5</FileType>
|
|
||||||
<FilePath>.\GestionSon.h</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
<Group>
|
||||||
|
|
@ -1360,31 +1295,6 @@
|
||||||
<FileType>4</FileType>
|
<FileType>4</FileType>
|
||||||
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
|
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
|
||||||
</File>
|
</File>
|
||||||
<File>
|
|
||||||
<FileName>DriverJeuLaser.h</FileName>
|
|
||||||
<FileType>5</FileType>
|
|
||||||
<FilePath>.\Driver\DriverJeuLaser.h</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>DriverJeuLaser.inc</FileName>
|
|
||||||
<FileType>5</FileType>
|
|
||||||
<FilePath>.\Driver\DriverJeuLaser.inc</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
|
||||||
</Group>
|
|
||||||
<Group>
|
|
||||||
<GroupName>Son</GroupName>
|
|
||||||
<Files>
|
|
||||||
<File>
|
|
||||||
<FileName>bruitverre.asm</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>.\Src\bruitverre.asm</FilePath>
|
|
||||||
</File>
|
|
||||||
<File>
|
|
||||||
<FileName>GestionSon.s</FileName>
|
|
||||||
<FileType>2</FileType>
|
|
||||||
<FilePath>.\Src\GestionSon.s</FilePath>
|
|
||||||
</File>
|
|
||||||
</Files>
|
</Files>
|
||||||
</Group>
|
</Group>
|
||||||
<Group>
|
<Group>
|
||||||
|
|
@ -1412,7 +1322,12 @@
|
||||||
<LayerInfo>
|
<LayerInfo>
|
||||||
<Layers>
|
<Layers>
|
||||||
<Layer>
|
<Layer>
|
||||||
<LayName>StepSon</LayName>
|
<LayName><Project Info></LayName>
|
||||||
|
<LayDesc></LayDesc>
|
||||||
|
<LayUrl></LayUrl>
|
||||||
|
<LayKeys></LayKeys>
|
||||||
|
<LayCat></LayCat>
|
||||||
|
<LayLic></LayLic>
|
||||||
<LayTarg>0</LayTarg>
|
<LayTarg>0</LayTarg>
|
||||||
<LayPrjMark>1</LayPrjMark>
|
<LayPrjMark>1</LayPrjMark>
|
||||||
</Layer>
|
</Layer>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue