Changeset - 0c7d961b3ebc
Parent rev.
Child rev.
[Not reviewed]
Launch-2 default
0 2 0
ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-04-22 08:57:44
ethanzonca@CL-ENS241-08.cedarville.edu
Last fixes for final launch of the year
2 files changed with 7 insertions and 7 deletions:
master/master/config.h
1
1
master/master/lib/slavesensors.c
6
6
0 comments (0 inline, 0 general)
master/master/config.h
➞
Show inline comments
 
@@ -83,7 +83,7 @@
 
// --------------------------------------------------------------------------
 

			




	
	
	
		
 
// Slave data structure size

			




	
	
	
		
 
#define MAX_NUM_SLAVES 5	// Maximum number of nodes in the system

			




	
	
	
		
 
#define MAX_NUM_SLAVES 4	// Maximum number of nodes in the system

			




	
	
	
		
 
#define MAX_NUM_SENSORS 10	// Maximum number of unique types of sensors in the system

			




	
	
	
		
 

			




	
	
	
		
 
// Node identifier of log destination xbee

			




        

    


    
    

    

        

                

                    master/master/lib/slavesensors.c
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -46,14 +46,14 @@

			




	
	
	
		
 
// Label lookup table

			




	
	
	
		
 
// Make sure there are never more labels than there are MAX_NUM_SENSORS! 

			




	
	
	
		
 
const char label_0[] PROGMEM = "BoardTemp";

			




	
	
	
		
 
const char label_1[] PROGMEM = "HeaterStatus";

			




	
	
	
		
 
const char label_2[] PROGMEM = "BatteryLevel";

			




	
	
	
		
 
const char label_1[] PROGMEM = "Heater";

			




	
	
	
		
 
const char label_2[] PROGMEM = "VBatt";

			




	
	
	
		
 
const char label_3[] PROGMEM = "AirTemp";

			




	
	
	
		
 
const char label_4[] PROGMEM = "AmbientLight";

			




	
	
	
		
 
const char label_4[] PROGMEM = "Light";

			




	
	
	
		
 
const char label_5[] PROGMEM = "Humidity";

			




	
	
	
		
 
const char label_6[] PROGMEM = "Pressure";

			




	
	
	
		
 
const char label_7[] PROGMEM = "Altitude";

			




	
	
	
		
 
const char label_8[] PROGMEM = "CPM-Radiation";

			




	
	
	
		
 
const char label_8[] PROGMEM = "Radiation";

			




	
	
	
		
 

			




	
	
	
		
 
const char *const labelLookup[] PROGMEM =

			




	
	
	
		
 
{

			




	
	
		
 
@@ -65,10 +65,10 @@ const char *const labelLookup[] PROGMEM 

			




	
	
	
		
 
	label_5,

			




	
	
	
		
 
	label_6,

			




	
	
	
		
 
	label_7,

			




	
	
	
		
 
	label_8,

			




	
	
	
		
 
	label_8

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
char labelBuffer[32]; // Size to length of label

			




	
	
	
		
 
char labelBuffer[15]; // Size to length of label

			




	
	
	
		
 
char* slavesensors_getLabel(uint8_t sensorID) 

			




	
	
	
		
 
{

			




	
	
	
		
 
	if(sensorID < 9)

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: zserverv-26437
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support