Revision 3:3d9e5f48b0c1, committed 2014-12-17

Comitter:

raizel_varun

Date:

Wed Dec 17 09:52:27 2014 +0000

Parent:

2:7aede71f4c22

Commit message:

AFTER PINS;

Changed in this revision

diff -r 7aede71f4c22 -r 3d9e5f48b0c1 ACS.cpp
--- a/ACS.cpp	Wed Dec 17 09:46:36 2014 +0000
+++ b/ACS.cpp	Wed Dec 17 09:52:27 2014 +0000
@@ -2,13 +2,13 @@
 #include "MPU3300.h"
 
 //PwmOut PWM1(PTD4);        //Functions used to generate PWM signal 
-                        //PWM output comes from pins p6
+                         //PWM output comes from pins p6
 Serial pc1(USBTX, USBRX);
-SPI spi_acs (PTA16, PTA17, PTA15); // mosi, miso, sclk
-DigitalOut SSN_MAG (D8); // ssn for magnetometer
-DigitalIn DRDY (D12); // drdy for magnetometer
-DigitalOut ssn_gyr (D13);         //Slave Select pin of gyroscope
-InterruptIn dr(D7);       //Interrupt pin for gyro 
+SPI spi_acs (PIN16, PIN17, PIN15); // mosi, miso, sclk
+DigitalOut SSN_MAG (PIN61); // ssn for magnetometer
+DigitalIn DRDY (PIN47); // drdy for magnetometer
+DigitalOut ssn_gyr (PIN62);         //Slave Select pin of gyroscope
+InterruptIn dr(PIN81);       //Interrupt pin for gyro 
 PwmOut PWM1(A3);        //Functions used to generate PWM signal 
 PwmOut PWM2(A4); 
 PwmOut PWM3(A5);                   //PWM output comes from pins p6

diff -r 7aede71f4c22 -r 3d9e5f48b0c1 HK.cpp
--- a/HK.cpp	Wed Dec 17 09:46:36 2014 +0000
+++ b/HK.cpp	Wed Dec 17 09:52:27 2014 +0000
@@ -3,16 +3,15 @@
  
 //GPIO pins used=> D2-D12, A0-A1
 
-DigitalOut SelectLinesA[]={D2,D3,D4,D5};//to mux1=>voltage mux
-DigitalOut SelectLinesB[]={PTB18,PTB19,PTC10};//to mux2=>current mux(differential mux)
-DigitalOut SelectLinesC[]={PTC0,PTC13,PTC6,PTC16};//to mux3=>temp mux
+DigitalOut SelectLinesA[]={PIN43,PIN44,PIN45,PIN46};//to mux1=>voltage mux
+DigitalOut SelectLinesB[]={PIN56,PIN57,PIN58,PIN59};//to mux2=>current mux(differential mux)
+DigitalOut SelectLinesC[]={PIN64,PIN65,PIN66,PIN67};//to mux3=>temp mux
 
 //--------------------------------------------MSB is SelectLines[0],LSB is SelectLines[3]-------------------------------- 
 
-AnalogIn CurrentInput(A0); // Input from Current Mux
-AnalogIn VoltageInput(A1); // Input from Voltage Multiplexer
-AnalogIn TemperatureInput(A2); /*Input from Temperature Multiplexer,thermistor Multiplexer- same multiplexer for both(lines 1-4 for thermistor,line 0 for temperature sensor)*/
- 
+AnalogIn CurrentInput(PIN53); // Input from Current Mux
+AnalogIn VoltageInput(PIN54); // Input from Voltage Multiplexer
+AnalogIn TemperatureInput(PIN55); /*Input from Temperature Multiplexer,thermistor Multiplexer- same multiplexer for both(lines 1-4 for thermistor,line 0 for temperature sensor)*/