Changeset 56

Timestamp:

11/03/09 08:09:41 (3 years ago)

Author:

icarus75

Message:

uc: serial.c clean-up + send() rewrite

Location:

flukso/trunk/uc

Files:

• main.c (modified) (5 diffs)
• main.h (modified) (1 diff)
• wiring/serial.c (modified) (3 diffs)
• wiring/wiring.h (modified) (1 diff)

flukso/trunk/uc/main.c

@@ -37 +37 @@
 
 // variable declarations
+uint8_t i;
+
 volatile struct state aux[4] = {{false, false, START}, {false, false, START}, {false, false, START}, {false, false, START}};
 
@@ -112 +114 @@
   ADCSRA |= (1<<ADEN) | (1<<ADSC);
 
-  printString("msg metervalues written to EEPROM (BROWN-OUT)\n");
+  printString("msg BROWN-OUT\n");
 }
 
@@ -120 +122 @@
     eeprom_write_block((const void*)&measurements[i].value, (void*)&EEPROM_measurements[i].value, 4);
 
-  printString("msg metervalues written to EEPROM (WDT)\n");
+  printString("msg WDT\n");
 }
 
@@ -211 +213 @@
 void send(const struct sensor *measurement)
 {
-  uint8_t i, length;
-  char buffer[49];
-
-  // determine the length of value
-  ltoa(measurement->value, buffer, 10);
-  length = strlen(buffer);
-
-  strcpy(buffer, "pls ");
-  strcpy(&buffer[4], measurement->id);
-  strcpy(&buffer[36], ":");
-  // insert leading 0's
-  for (i=0; i<10-length; i++) strcpy(&buffer[37+i], "0");
-  ltoa(measurement->value, &buffer[47-length], 10);
-  strcpy(&buffer[47], "\n");
-
-  printString(buffer);
+  uint8_t i = 46;
+  uint32_t value = measurement->value;
+  char pulse[49];
+
+  // generate pulse message structure
+  strcpy(pulse, "pls ");
+  strcpy(&pulse[4], measurement->id);
+  strcpy(&pulse[36], ":0000000000\n");
+
+  do {                              // generate digits in reverse order
+    pulse[i--] = '0' + value % 10;  // get next digit
+  } while ((value /= 10) > 0);      // delete it
+
+  printString(pulse);
 
   // blink the green LED
@@ -258 +258 @@
   for (i=0; i<4; i++) _delay_ms(5000);
 
+  serialFlush();
   WDT_on();
 

flukso/trunk/uc/main.h

@@ -51 +51 @@
 
 // datastructures
-uint8_t i;
-
 struct state {
   boolean pulse;

flukso/trunk/uc/wiring/serial.c

@@ -29 +29 @@
 // location to which to write the next incoming character and rx_buffer_tail
 // is the index of the location from which to read.
-#define RX_BUFFER_SIZE 128
+#define RX_BUFFER_SIZE 64
 
 unsigned char rx_buffer[RX_BUFFER_SIZE];
@@ -129 +129 @@
 }
 
-void printMode(int mode)
-{
-        // do nothing, we only support serial printing, not lcd.
-}
-
 void printByte(unsigned char c)
 {
         serialWrite(c);
-}
-
-void printNewline()
-{
-        printByte('\n');
 }
 
@@ -195 +185 @@
         printIntegerInBase(n, 2);
 }
-
-/* Including print() adds approximately 1500 bytes to the binary size,
- * so we replace it with the smaller and less-confusing printString(),
- * printInteger(), etc.
-void print(const char *format, ...)
-{
-        char buf[256];
-        va_list ap;
-        
-        va_start(ap, format);
-        vsnprintf(buf, 256, format, ap);
-        va_end(ap);
-        
-        printString(buf);
-}
-*/

flukso/trunk/uc/wiring/wiring.h

@@ -100 +100 @@
 int serialRead(void);
 void serialFlush(void);
-void printMode(int);
 void printByte(unsigned char c);
-void printNewline(void);
 void printString(const char *s);
 void printInteger(long n);