Permalink
Browse files

Code Cleaning

  • Loading branch information...
Zuph committed Mar 16, 2012
1 parent e6faadd commit 3cd93eb398aac2938ca6c09b94a9cb9bb30f7945
Showing with 29 additions and 255 deletions.
  1. +2 −13 comm/outputParse.c
  2. +4 −6 comm/outputParse.h
  3. +2 −12 lib/bmp085.c
  4. +0 −204 main.c
  5. +21 −19 queue.c
  6. +0 −1 queue.h
View
@@ -1,4 +1,3 @@
-
#include <stdio.h>
#include <stdint.h>
#include <string.h>
@@ -9,8 +8,9 @@
#include <avr/pgmspace.h>
#include <avr/eeprom.h>
+#include "../lprintf.h"
#include "../dataStructures.h"
-//#include "../eepromVars.h"
+#include "../eepromVars.h"
#include "../progmemVars.h"
#include "../logging/openlog.h"
@@ -24,19 +24,8 @@
//if commented out, no eeprom writing
#define detacheeprom
-
#define COMPROM 0b10100000
-
-extern int lprintf(char *, ...);
-extern int lprintf_P(const char *str, ...);
-extern uint16_t EEMEM EEcurrentTelemetryVersion;
-extern uint8_t i2cMasterSendNI(uint8_t, uint8_t, uint8_t*);
-extern void i2cSendStart(void);
-extern uint8_t i2cWaitForComplete(void);
-extern void i2cSendByte(uint8_t);
-extern void i2cSendStop(void);
-
uint16_t getTxSample(uint8_t *output, uint32_t *bitmask, uint16_t sampleNumber, uint16_t batch)
{
View
@@ -1,11 +1,9 @@
-extern uint16_t EEMEM EEbatchSampleStart;
-extern uint16_t EEMEM EEbatchSampleEnd;
-extern uint16_t EEMEM EEcurrentBatchNumber;
-extern uint32_t EEMEM EEcurrentTelemetryBitmap[];
-extern uint16_t EEMEM EEcommPromEnd;
-extern uint16_t EEMEM EEcommPromStart;
+#ifndef OUTPUTPARSE_H
+#define OUTPUTPARSE_H
uint16_t getTxSample(uint8_t *output, uint32_t *bitmask, uint16_t sampleNumber, uint16_t batch);
void loadBatch(void);
void flushSatQueue(void);
void memrcpy(void *dst, const void *src, size_t len);
+
+#endif
View
@@ -23,22 +23,12 @@
#include <avr/eeprom.h>
+#include "eepromVars.h"
+
#include "../lprintf.h"
#include "i2c.h"
#include "bmp085.h"
-//Needed for BMP085
-extern int16_t EEMEM EEBMPac1;
-extern int16_t EEMEM EEBMPac2;
-extern int16_t EEMEM EEBMPac3;
-extern uint16_t EEMEM EEBMPac4;
-extern uint16_t EEMEM EEBMPac5;
-extern uint16_t EEMEM EEBMPac6;
-extern int16_t EEMEM EEBMPb1;
-extern int16_t EEMEM EEBMPb2;
-extern int16_t EEMEM EEBMPmb;
-extern int16_t EEMEM EEBMPmc;
-extern int16_t EEMEM EEBMPmd;
void BMP085_Calibration(void)
{
Oops, something went wrong.

0 comments on commit 3cd93eb

Please sign in to comment.