first solar power calc tests

git-svn-id: https://svn.spreadspace.org/mur.sat@230 7de4ea59-55d0-425e-a1af-a3118ea81d4c

2 files changed, 104 insertions, 50 deletions

diff --git a/tools/solarmeter/Makefile b/tools/solarmeter/Makefile
new file mode 100644
index 0000000..5c6794f
--- /dev/null
+++ b/tools/solarmeter/Makefile
@@ -0,0 +1,66 @@
+##
+##  mur.sat
+##
+##  Somewhen in the year 2012, mur.at will have a nano satellite launched
+##  into a low earth orbit (310 km above the surface of our planet). The
+##  satellite itself is a TubeSat personal satellite kit, developed and
+##  launched by interorbital systems. mur.sat is a joint venture of mur.at,
+##  ESC im Labor and realraum.
+##
+##  Please visit the project hompage at sat.mur.at for further information.
+## 
+##
+##  Copyright (C) 2011 Christian Pointner <equinox@mur.at>
+##                         
+##  This file is part of mur.sat.
+##
+##  mur.sat is free software: you can redistribute it and/or modify
+##  it under the terms of the GNU General Public License as published by
+##  the Free Software Foundation, either version 3 of the License, or
+##  any later version.
+##
+##  mur.sat is distributed in the hope that it will be useful,
+##  but WITHOUT ANY WARRANTY; without even the implied warranty of
+##  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+##  GNU General Public License for more details.
+##
+##  You should have received a copy of the GNU General Public License
+##  along with mur.sat. If not, see <http://www.gnu.org/licenses/>.
+##
+
+CC := gcc
+CFLAGS := -g -O2 $(GST_CFLAGS)
+LDFLAGS := -g -Wall -O2 $(GST_LDFLAGS)
+STRIP := strip
+
+EXECUTABLES := solarmeter
+
+OBJS := solarmeter.o
+
+C_SRCS := $(OBJS:%.o=%.c)
+
+.PHONY: clean
+
+all: $(EXECUTABLES)
+
+%.d: %.c
+	@set -e; rm -f $@; \
+  $(CC) -MM $(CFLAGS) $< > $@.$$$$; \
+  sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+  rm -f $@.$$$$; echo '(re)building $@'
+
+ifneq ($(MAKECMDGOALS),distclean)
+-include $(C_SRCS:%.c=%.d)
+endif
+
+$(EXECUTABLES): $(OBJS)
+	$(CC) $(OBJS) -o $@ $(LDFLAGS)
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $<
+
+clean:
+	rm -f *.o
+	rm -f *.d
+	rm -f *.d.*
+	rm -f $(EXECUTABLES)
diff --git a/tools/solarmeter/solarmeter.c b/tools/solarmeter/solarmeter.c
index 64bca8f..1ddca80 100644
--- a/tools/solarmeter/solarmeter.c
+++ b/tools/solarmeter/solarmeter.c
@@ -2,61 +2,49 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
+#include <stdint.h>
 
-// data via stdin
-// begin = 255 followed by 9 byte  8 mal i + 1 mal u
-// u = input * 5/256  // u in V
-// i = input / 2.099  // i in mA
-
-#define UFAC 5.0f/256.0f*5.6f/1.89f
+// data via $1, output to STDOUT
+// begin = 255 followed by 12 bytes  2*(4*i + 1*u) + PowerH:PowerL
 
 int main (int argc, char* argv[])
 {
-    unsigned char tmp = 0;
-    unsigned char buffer[9];
-    float pow;
-    float pow_sum;
-    int i;
-    int n=0;
-    unsigned char *outbuffer;
-    int outfile_fd = -1;
-
-    if (argc > 1)
-    {
-      outfile_fd = open(argv[1], O_WRONLY | O_CREAT | O_APPEND, 0666);
+  u_int8_t tmp = 0;
+  u_int8_t buffer[12];
+  u_int16_t power = 0;
+
+  int infile_fd = -1;  
+  if (argc > 1) {
+    infile_fd = open(argv[1], O_RDONLY);
+    if(infile_fd < 0) {
+      perror("open error");
+      return 1;
     }
+  } else {
+    infile_fd = STDIN_FILENO;
+  }
+  
+  while (read(infile_fd, &tmp, 1) == 1) {
+    if (tmp == 255) {
+      if (read(infile_fd, &buffer, sizeof(buffer)) != sizeof(buffer)) {
+        perror("read error:");
+        return 2;
+      }
+
+      power = (buffer[10]<<8) + buffer[11];
+      printf("%5d (", power);
 
-    while (read (STDIN_FILENO, &tmp, 1) == 1)
-    {
-        if (tmp == 255)
-        {
-            if (read (STDIN_FILENO, &buffer, 9) != 9)
-            {
-                printf ("read error\n");
-                return 0;
-            }
-            printf ("%5.2fV", buffer[8] * UFAC);
-            pow_sum = 0.0f;
-            for (i = 0; i<8; i++)
-            {
-                pow = (buffer[i] / 2.099f) * (buffer[8] * UFAC);
-                printf (" %6.2fmW", pow);
-                pow_sum += pow;
-                if (outfile_fd > 0)
-                {
-                  n = asprintf(&outbuffer, "%d %6.2f %6.2f\n", i, buffer[8]*UFAC, buffer[i]/2.099f);
-                  write(outfile_fd, outbuffer , n);
-                  free(outbuffer);
-                }
-            }
-            if (outfile_fd > 0)
-              write(outfile_fd, "\n" , 1);
-            printf (" %6.2fmW", pow_sum);
-            printf ("\r");
-        }
+      int i;
+      for(i=0; i<10; i++)
+        printf("%3d ", buffer[i]);
+
+      power = (((u_int16_t)buffer[0] + (u_int16_t)buffer[1] + (u_int16_t)buffer[2] + (u_int16_t)buffer[3]) * (u_int16_t)buffer[4]) +
+              (((u_int16_t)buffer[5] + (u_int16_t)buffer[6] + (u_int16_t)buffer[7] + (u_int16_t)buffer[8]) * (u_int16_t)buffer[9]);
+
+      printf(")  -> %5d\r", power);
     }
-    printf ("\n");
-    if (outfile_fd > 0)
-      close(outfile_fd);
-    return 0;
+  }
+  printf("\n");
+
+  return 0;
 }