seniordesign-firmware Changeset - 297e75fc3c22

Changeset - 297e75fc3c22

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

ethanzonca@CL-ENS241-08.cedarville.edu - 12 years ago 2013-04-29 19:08:46
ethanzonca@CL-ENS241-08.cedarville.edu

Master now prints out raw sensor ID if no value in lookup tabel (fixes FS#70, untested)

1 file changed with 3 insertions and 1 deletions:

master/master/lib/slavesensors.c

0 comments (0 inline, 0 general)

master/master/lib/slavesensors.c

➞

Show inline comments

@@ @@ -58,49 +58,51 @@ const char label_8[] PROGMEM = "Radiatio @@
 const char *const labelLookup[] PROGMEM =
+{
 	label_0,
 	label_1,
 	label_2,
 	label_3,
 	label_4,
 	label_5,
 	label_6,
 	label_7,
 	label_8
 };
 char labelBuffer[15]; // Size to length of label
 char* slavesensors_getLabel(uint8_t sensorID)
+{
 	if(sensorID < 9)
+	{
 		strncpy_P(labelBuffer,(char*)pgm_read_word(&(labelLookup[sensorID])),15);
 		return labelBuffer;
+	}
 	else
+	{
 		return NULL;
 		// Print out the sensor ID if there is no label in the lookup table
 		snprintf(labelBuffer, 15,"%u",sensorID);
 		return labelBuffer;
+	}
+}
 uint8_t currentSlave = 0;
 uint8_t currentSlaveSensor = 0;
 bool requesting = false;
 //#define DEBUG_NETWORKSCAN
 //#define DEBUG_GETSLAVEDATA
 char* bufPtr = 0x00;
 static char slaveAddressLow[MAX_NUM_SLAVES][9];
 static char slaveAddressHigh[MAX_NUM_SLAVES][9];
 static char slaveNames[MAX_NUM_SLAVES][15];
 static char loggerAddressLow[9];
 static char loggerAddressHigh[9];
 uint8_t nodeCount = 0;
 bool dataReady = false;
 void slavesensors_setup()

0 comments (0 inline, 0 general)