Merge Done :)

HA-pepino · HA-pepino · commit 47150181c752 · 2022-09-09T23:13:40.000+02:00
diff --git a/Drone.X/I2C.c b/Drone.X/I2C.c
diff --git a/Drone.X/I2C.h b/Drone.X/I2C.h
@@ -1,25 +1,6 @@
-#ifndef __I2C_H
-#define	__I2C_H
+#ifndef __GESTION_I2C_H
+#define	__GESTION_I2C_H
 
-<<<<<<< HEAD
-//#define I2C_MASTER 1
-
-
-#if I2C_MASTER
-    #define I2C_CMD_LIST_SIZE   5
-    typedef struct{
-        uint8_t i2c_addr;
-        uint8_t nbr_byte_to_send;
-        uint8_t nbr_byte_to_read;
-        uint8_t *data_read;
-        uint8_t *data_to_send;
-        void *Done;
-    }I2C_command;
-
-    void Init_I2C(void);
-    void Add_I2C_command(uint8_t i2c_addr, uint8_t nbr_byte_to_send, uint8_t nbr_byte_to_read,uint8_t data_send[], uint8_t data_read[], void *Done);
-    void Transmit_I2C_Loop(void);
-=======
 #define I2C_MASTER
 
 
@@ -39,8 +20,7 @@ typedef struct{
 
 void Init_I2C(void);
 void Add_I2C_command(uint8_t i2c_addr, uint8_t nbr_byte_to_send, uint8_t nbr_byte_to_read,uint8_t data_send[], uint8_t data_read[], void *Done);
-void Transmit_I2C_Loop(void);
->>>>>>> master_test_martin
+void Gestion_I2C_Master_Loop(void);
 
 #define I2C_SCL_PIN     _RB8
 #define I2C_SCL_TRIS    _TRISB8
@@ -55,21 +35,15 @@ uint8_t I2C_Stress_Cmd(void);
 
 void I2C_Discover_Loop(void);
 uint8_t I2C_Discover_Cmd(void);
-    
+
 #else
+
+#define I2C_SLAVE_ADRR 0x20
 #define SIZE_BUFF_I2C 5 
+
 void Init_I2C(void);  
 void Gestion_I2C_Slave_Loop(void);
 
-void Init_I2C_int(void);
-void Gestion_I2C_Slave_int_Loop(void);
-
-uint8_t I2C_Wr_Cmd(void);
-uint8_t I2C_Rd_Cmd(void);
-uint8_t I2C_Wr_Rd_Cmd(void);
-uint8_t I2C_Stress_Cmd(void);
-#endif
-
-
-#endif	/* __GESTION_I2C_H */
 
+#endif  // I2C_MASTER
+#endif	// __GESTION_I2C_H
diff --git a/Drone.X/I2C_Accel.c b/Drone.X/I2C_Accel.c
@@ -1,9 +1,7 @@
 #include "main.h"
 
 
-#define Timer_ms1 Compteur_ms_1
-
-#if I2C_MASTER
+#ifdef I2C_MASTER
 
 
 
diff --git a/Drone.X/I2C_Accel.h b/Drone.X/I2C_Accel.h
@@ -4,7 +4,7 @@
 
 
 
-#if I2C_MASTER
+#ifdef I2C_MASTER
 
 // accel add0 = gnd
 #define ACCEL_ADD 0x68      // x2 pour Write, x2+1 pour read
diff --git a/Drone.X/I2C_Alti.c b/Drone.X/I2C_Alti.c
@@ -2,7 +2,7 @@
 
 
 
-#if I2C_MASTER
+#ifdef I2C_MASTER
 
 uint8_t crc4(uint16_t n_prom[]);
 
diff --git a/Drone.X/I2C_Alti.h b/Drone.X/I2C_Alti.h
@@ -4,7 +4,7 @@
 
 
 
-#if I2C_MASTER
+#ifdef I2C_MASTER
 
 
 // csb = gnd
diff --git a/Drone.X/Interpreteur.c b/Drone.X/Interpreteur.c
@@ -20,14 +20,14 @@ const Command Command_List[] = {
  
  //{  "ALTI"      ,Alti_Cmd},
  
- 
+#ifdef I2C_MASTER
  {  "IWR"       ,I2C_Wr_Cmd},
  {  "IRD"       ,I2C_Rd_Cmd},
  {  "IWRD"      ,I2C_Wr_Rd_Cmd},
  
  {  "IST"       ,I2C_Stress_Cmd},
- //{  "I2CDISC"   ,I2C_Discover_Cmd},
- 
+ {  "I2CDISC"   ,I2C_Discover_Cmd},
+#endif
     
  
  {  "GPSON"     ,GPS_Send_On_Pin_Cmd},
diff --git a/Drone.X/Timer_ms.c b/Drone.X/Timer_ms.c
@@ -4,11 +4,8 @@
 #include "main.h"
 
 
-<<<<<<< HEAD
+
 volatile u16 Timer_ms1 = 0;
-=======
-volatile u16 Compteur_ms_1 = 0;
->>>>>>> master_test_martin
 
 void Timer_Ms_Init(void)
 {
@@ -21,13 +18,8 @@ void Timer_Ms_Init(void)
 
 void Delay_ms (u16 Delay_Time)
 {
-<<<<<<< HEAD
     u16 Delay_Var = Timer_ms1;
     while ((Delay_Var - Timer_ms1) < Delay_Time);
-=======
-    u16 Start_Time = Compteur_ms_1;
-    while ((Compteur_ms_1 - Start_Time) < Delay_Time);
->>>>>>> master_test_martin
 }
 
 void __attribute__((interrupt,auto_psv)) _T1Interrupt(void)
@@ -38,11 +30,6 @@ void __attribute__((interrupt,auto_psv)) _T1Interrupt(void)
         LED2 = !LED2;
         i = 0;
     }
-<<<<<<< HEAD
-    
-=======
->>>>>>> master_test_martin
-    
     Timer_ms1 ++;
 
     
diff --git a/Drone.X/Timer_ms.h b/Drone.X/Timer_ms.h
@@ -6,10 +6,5 @@ void Timer_Ms_Init(void);
 
 void Delay_ms (u16 Delay_Time);
 
-<<<<<<< HEAD
 extern volatile u16 Timer_ms1;
-=======
-extern volatile u16 Compteur_ms_1;
->>>>>>> master_test_martin
-
 #endif
diff --git a/Drone.X/main.c b/Drone.X/main.c
@@ -51,11 +51,10 @@ int main(void) {
         }
         /*if (Mode_Urgence) {
             GPS_Send_Off_Cmd();
-        }
-        Accel_Loop();*/
+        }*/
         
         #ifdef I2C_MASTER
-        Transmit_I2C_Loop();
+        Gestion_I2C_Master_Loop();
         I2C_Stress_Loop();
         I2C_Discover_Loop();
         Accel_Loop();
diff --git a/Drone.X/nbproject/Makefile-default.mk b/Drone.X/nbproject/Makefile-default.mk
@@ -57,17 +57,17 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}
 DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}
 
 # Source Files Quoted if spaced
-SOURCEFILES_QUOTED_IF_SPACED=main.c Config_bits.c interrupts.c traps.c Timer_ms.c Init_Clk.c UART_PC.c ADC.c I2C.c GPS.c SPI.c Interpreteur.c RF.c RF_Calib.c RF_Test.c
+SOURCEFILES_QUOTED_IF_SPACED=main.c Config_bits.c interrupts.c traps.c Timer_ms.c Init_Clk.c UART_PC.c ADC.c I2C.c GPS.c SPI.c Interpreteur.c RF.c RF_Calib.c RF_Test.c I2C_Accel.c I2C_Alti.c
 
 # Object Files Quoted if spaced
-OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/main.o ${OBJECTDIR}/Config_bits.o ${OBJECTDIR}/interrupts.o ${OBJECTDIR}/traps.o ${OBJECTDIR}/Timer_ms.o ${OBJECTDIR}/Init_Clk.o ${OBJECTDIR}/UART_PC.o ${OBJECTDIR}/ADC.o ${OBJECTDIR}/I2C.o ${OBJECTDIR}/GPS.o ${OBJECTDIR}/SPI.o ${OBJECTDIR}/Interpreteur.o ${OBJECTDIR}/RF.o ${OBJECTDIR}/RF_Calib.o ${OBJECTDIR}/RF_Test.o
-POSSIBLE_DEPFILES=${OBJECTDIR}/main.o.d ${OBJECTDIR}/Config_bits.o.d ${OBJECTDIR}/interrupts.o.d ${OBJECTDIR}/traps.o.d ${OBJECTDIR}/Timer_ms.o.d ${OBJECTDIR}/Init_Clk.o.d ${OBJECTDIR}/UART_PC.o.d ${OBJECTDIR}/ADC.o.d ${OBJECTDIR}/I2C.o.d ${OBJECTDIR}/GPS.o.d ${OBJECTDIR}/SPI.o.d ${OBJECTDIR}/Interpreteur.o.d ${OBJECTDIR}/RF.o.d ${OBJECTDIR}/RF_Calib.o.d ${OBJECTDIR}/RF_Test.o.d
+OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/main.o ${OBJECTDIR}/Config_bits.o ${OBJECTDIR}/interrupts.o ${OBJECTDIR}/traps.o ${OBJECTDIR}/Timer_ms.o ${OBJECTDIR}/Init_Clk.o ${OBJECTDIR}/UART_PC.o ${OBJECTDIR}/ADC.o ${OBJECTDIR}/I2C.o ${OBJECTDIR}/GPS.o ${OBJECTDIR}/SPI.o ${OBJECTDIR}/Interpreteur.o ${OBJECTDIR}/RF.o ${OBJECTDIR}/RF_Calib.o ${OBJECTDIR}/RF_Test.o ${OBJECTDIR}/I2C_Accel.o ${OBJECTDIR}/I2C_Alti.o
+POSSIBLE_DEPFILES=${OBJECTDIR}/main.o.d ${OBJECTDIR}/Config_bits.o.d ${OBJECTDIR}/interrupts.o.d ${OBJECTDIR}/traps.o.d ${OBJECTDIR}/Timer_ms.o.d ${OBJECTDIR}/Init_Clk.o.d ${OBJECTDIR}/UART_PC.o.d ${OBJECTDIR}/ADC.o.d ${OBJECTDIR}/I2C.o.d ${OBJECTDIR}/GPS.o.d ${OBJECTDIR}/SPI.o.d ${OBJECTDIR}/Interpreteur.o.d ${OBJECTDIR}/RF.o.d ${OBJECTDIR}/RF_Calib.o.d ${OBJECTDIR}/RF_Test.o.d ${OBJECTDIR}/I2C_Accel.o.d ${OBJECTDIR}/I2C_Alti.o.d
 
 # Object Files
-OBJECTFILES=${OBJECTDIR}/main.o ${OBJECTDIR}/Config_bits.o ${OBJECTDIR}/interrupts.o ${OBJECTDIR}/traps.o ${OBJECTDIR}/Timer_ms.o ${OBJECTDIR}/Init_Clk.o ${OBJECTDIR}/UART_PC.o ${OBJECTDIR}/ADC.o ${OBJECTDIR}/I2C.o ${OBJECTDIR}/GPS.o ${OBJECTDIR}/SPI.o ${OBJECTDIR}/Interpreteur.o ${OBJECTDIR}/RF.o ${OBJECTDIR}/RF_Calib.o ${OBJECTDIR}/RF_Test.o
+OBJECTFILES=${OBJECTDIR}/main.o ${OBJECTDIR}/Config_bits.o ${OBJECTDIR}/interrupts.o ${OBJECTDIR}/traps.o ${OBJECTDIR}/Timer_ms.o ${OBJECTDIR}/Init_Clk.o ${OBJECTDIR}/UART_PC.o ${OBJECTDIR}/ADC.o ${OBJECTDIR}/I2C.o ${OBJECTDIR}/GPS.o ${OBJECTDIR}/SPI.o ${OBJECTDIR}/Interpreteur.o ${OBJECTDIR}/RF.o ${OBJECTDIR}/RF_Calib.o ${OBJECTDIR}/RF_Test.o ${OBJECTDIR}/I2C_Accel.o ${OBJECTDIR}/I2C_Alti.o
 
 # Source Files
-SOURCEFILES=main.c Config_bits.c interrupts.c traps.c Timer_ms.c Init_Clk.c UART_PC.c ADC.c I2C.c GPS.c SPI.c Interpreteur.c RF.c RF_Calib.c RF_Test.c
+SOURCEFILES=main.c Config_bits.c interrupts.c traps.c Timer_ms.c Init_Clk.c UART_PC.c ADC.c I2C.c GPS.c SPI.c Interpreteur.c RF.c RF_Calib.c RF_Test.c I2C_Accel.c I2C_Alti.c
 
 
 
@@ -185,6 +185,18 @@ ${OBJECTDIR}/RF_Test.o: RF_Test.c  .generated_files/flags/default/3d8403b1e14e28
 	@${RM} ${OBJECTDIR}/RF_Test.o 
 	${MP_CC} $(MP_EXTRA_CC_PRE)  RF_Test.c  -o ${OBJECTDIR}/RF_Test.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MP -MMD -MF "${OBJECTDIR}/RF_Test.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1    -omf=elf -DXPRJ_default=$(CND_CONF)  -no-legacy-libc  $(COMPARISON_BUILD)  -O0 -msmart-io=1 -Wall -msfr-warn=off    -mdfp="${DFP_DIR}/xc16"
 	
+${OBJECTDIR}/I2C_Accel.o: I2C_Accel.c  .generated_files/flags/default/d5b75fc4da04f5166a434f86a1714d005865e0f8 .generated_files/flags/default/a733305486dba52bf1b2f0129eacaac696315869
+	@${MKDIR} "${OBJECTDIR}" 
+	@${RM} ${OBJECTDIR}/I2C_Accel.o.d 
+	@${RM} ${OBJECTDIR}/I2C_Accel.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE)  I2C_Accel.c  -o ${OBJECTDIR}/I2C_Accel.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MP -MMD -MF "${OBJECTDIR}/I2C_Accel.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1    -omf=elf -DXPRJ_default=$(CND_CONF)  -no-legacy-libc  $(COMPARISON_BUILD)  -O0 -msmart-io=1 -Wall -msfr-warn=off    -mdfp="${DFP_DIR}/xc16"
+	
+${OBJECTDIR}/I2C_Alti.o: I2C_Alti.c  .generated_files/flags/default/4dde8af1d29f7e917ccf9be40e1ee1037cba40b3 .generated_files/flags/default/a733305486dba52bf1b2f0129eacaac696315869
+	@${MKDIR} "${OBJECTDIR}" 
+	@${RM} ${OBJECTDIR}/I2C_Alti.o.d 
+	@${RM} ${OBJECTDIR}/I2C_Alti.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE)  I2C_Alti.c  -o ${OBJECTDIR}/I2C_Alti.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MP -MMD -MF "${OBJECTDIR}/I2C_Alti.o.d"      -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1    -omf=elf -DXPRJ_default=$(CND_CONF)  -no-legacy-libc  $(COMPARISON_BUILD)  -O0 -msmart-io=1 -Wall -msfr-warn=off    -mdfp="${DFP_DIR}/xc16"
+	
 else
 ${OBJECTDIR}/main.o: main.c  .generated_files/flags/default/bbd6f8f1291ea02b030768a6b90c80a59b61ab63 .generated_files/flags/default/a733305486dba52bf1b2f0129eacaac696315869
 	@${MKDIR} "${OBJECTDIR}" 
@@ -276,6 +288,18 @@ ${OBJECTDIR}/RF_Test.o: RF_Test.c  .generated_files/flags/default/b8322a3adda990
 	@${RM} ${OBJECTDIR}/RF_Test.o 
 	${MP_CC} $(MP_EXTRA_CC_PRE)  RF_Test.c  -o ${OBJECTDIR}/RF_Test.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MP -MMD -MF "${OBJECTDIR}/RF_Test.o.d"        -g -omf=elf -DXPRJ_default=$(CND_CONF)  -no-legacy-libc  $(COMPARISON_BUILD)  -O0 -msmart-io=1 -Wall -msfr-warn=off    -mdfp="${DFP_DIR}/xc16"
 	
+${OBJECTDIR}/I2C_Accel.o: I2C_Accel.c  .generated_files/flags/default/4e4566bb14a57cd4b460a5c32e15c42f22a023da .generated_files/flags/default/a733305486dba52bf1b2f0129eacaac696315869
+	@${MKDIR} "${OBJECTDIR}" 
+	@${RM} ${OBJECTDIR}/I2C_Accel.o.d 
+	@${RM} ${OBJECTDIR}/I2C_Accel.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE)  I2C_Accel.c  -o ${OBJECTDIR}/I2C_Accel.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MP -MMD -MF "${OBJECTDIR}/I2C_Accel.o.d"        -g -omf=elf -DXPRJ_default=$(CND_CONF)  -no-legacy-libc  $(COMPARISON_BUILD)  -O0 -msmart-io=1 -Wall -msfr-warn=off    -mdfp="${DFP_DIR}/xc16"
+	
+${OBJECTDIR}/I2C_Alti.o: I2C_Alti.c  .generated_files/flags/default/d748241ec47ac3e8af564a0cce713cd27b4a0b9a .generated_files/flags/default/a733305486dba52bf1b2f0129eacaac696315869
+	@${MKDIR} "${OBJECTDIR}" 
+	@${RM} ${OBJECTDIR}/I2C_Alti.o.d 
+	@${RM} ${OBJECTDIR}/I2C_Alti.o 
+	${MP_CC} $(MP_EXTRA_CC_PRE)  I2C_Alti.c  -o ${OBJECTDIR}/I2C_Alti.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MP -MMD -MF "${OBJECTDIR}/I2C_Alti.o.d"        -g -omf=elf -DXPRJ_default=$(CND_CONF)  -no-legacy-libc  $(COMPARISON_BUILD)  -O0 -msmart-io=1 -Wall -msfr-warn=off    -mdfp="${DFP_DIR}/xc16"
+	
 endif
 
 # ------------------------------------------------------------------------------------
diff --git a/datasheets/calculs_alti.ods b/datasheets/calculs_alti.ods

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`
`4`	`4`
`5`		`-#if I2C_MASTER`
	`5`	`+#ifdef I2C_MASTER`
`6`	`6`
`7`	`7`	`uint8_t crc4(uint16_t n_prom[]);`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`
`6`	`6`
`7`		`-#if I2C_MASTER`
	`7`	`+#ifdef I2C_MASTER`
`8`	`8`
`9`	`9`
`10`	`10`	`// csb = gnd`