aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/survive_config.c20
-rw-r--r--src/survive_config.h13
2 files changed, 17 insertions, 16 deletions
diff --git a/src/survive_config.c b/src/survive_config.c
index 42c2c89..254e52f 100644
--- a/src/survive_config.c
+++ b/src/survive_config.c
@@ -19,11 +19,11 @@ void config_init() {
used_entries = 0;
}
-void write_float(char* tag, float x) {
+void write_float(char* tag, FLT x) {
fprintf(config_file, "\"%s\":\"%f\"\n", tag, x);
}
-void write_float_a(char* tag, float *x, uint8_t count) {
+void write_float_a(char* tag, FLT *x, uint8_t count) {
uint8_t i = 0;
char idx[4];
for (i=0;i<count;++i) {
@@ -48,15 +48,6 @@ void config_close() {
void config_write_lighthouse(struct BaseStationData* bsd, uint8_t length) {
uint8_t i = 0;
- float Position[3];
- float Quaternion[4];
- uint32_t BaseStationID;
- float fcalphase[2];
- float fcaltilt[2];
- float fcalcurve[2];
- float fcalgibpha[2];
- float fcalgibmag[2];
-
for (i=0;i<length; ++i) {
write_uint32("id", bsd[i].BaseStationID);
write_float_a("position", bsd[i].Position, 3);
@@ -112,7 +103,7 @@ uint32_t config_read_uint32(const char *tag, const uint32_t value, const uint32_
return config_values[i].numeric.i;
}
-float config_read_float(const char *tag, const float value, const float def) {
+FLT config_read_float(const char *tag, const FLT value, const FLT def) {
uint16_t i = 0;
for (i=0;i<used_entries;++i) {
if ( strcmp(config_values[i].tag, tag) == 0 ) {
@@ -152,7 +143,7 @@ const uint32_t config_set_uint32(const char *tag, const uint32_t value) {
return value;
}
-const float config_set_float(const char *tag, const float value) {
+const FLT config_set_float(const char *tag, const FLT value) {
uint16_t i = 0;
assert(used_entries<MAX_CONFIG_ENTRIES);
@@ -179,4 +170,5 @@ void config_save(const char* path) {
};
fclose(f);
-} \ No newline at end of file
+}
+
diff --git a/src/survive_config.h b/src/survive_config.h
index 03e5eb8..24762cd 100644
--- a/src/survive_config.h
+++ b/src/survive_config.h
@@ -15,7 +15,7 @@ typedef enum {
/*
typedef union {
uint32_t i;
- float f;
+ FLT f;
} Numeric;
*/
typedef struct {
@@ -23,7 +23,7 @@ typedef struct {
cval_type type;
union {
uint32_t i;
- float f;
+ FLT f;
} numeric;
char *str;
} config_val;
@@ -33,4 +33,13 @@ void config_open(const char* path, const char* mode);
void config_close();
void config_write_lighthouse(struct BaseStationData* bsd, uint8_t length);
+void config_save(const char* path);
+const FLT config_set_float(const char *tag, const FLT value);
+const uint32_t config_set_uint32(const char *tag, const uint32_t value);
+const char* config_set_str(const char *tag, const char* value);
+FLT config_read_float(const char *tag, const FLT value, const FLT def);
+
+uint32_t config_read_uint32(const char *tag, const uint32_t value, const uint32_t def);
+const char* config_read_str(const char *tag, const char *value, const char *def_str);
+
#endif \ No newline at end of file