diff options
author | Mike Turvey <mturvey6@gmail.com> | 2017-03-11 09:00:58 -0700 |
---|---|---|
committer | Mike Turvey <mturvey6@gmail.com> | 2017-03-11 09:00:58 -0700 |
commit | ba38ddcc4c3d74c00139ceff9b45481259d80fc7 (patch) | |
tree | ba1efc8aa8f7a76aa9f9f831aff16ea86fdc2b23 /src/survive_config.h | |
parent | 1d9db12d7e115f2b8994f014e37f1086c17e90fd (diff) | |
parent | cdc60d110a9cd69c5bd8c0ac4e67db1ce7cecc93 (diff) | |
download | libsurvive-ba38ddcc4c3d74c00139ceff9b45481259d80fc7.tar.gz libsurvive-ba38ddcc4c3d74c00139ceff9b45481259d80fc7.tar.bz2 |
Merge remote-tracking branch 'remotes/upstream/master' into Octavios_Algorithm
Conflicts:
redist/linmath.c
Diffstat (limited to 'src/survive_config.h')
-rw-r--r-- | src/survive_config.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/survive_config.h b/src/survive_config.h index cd16c76..c8c7762 100644 --- a/src/survive_config.h +++ b/src/survive_config.h @@ -26,29 +26,33 @@ typedef struct { uint32_t elements; } config_entry; -typedef struct { +typedef struct config_group { config_entry *config_entries; uint16_t used_entries; uint16_t max_entries; } config_group; -extern config_group global_config_values; -extern config_group lh_config[2]; //lighthouse configs +//extern config_group global_config_values; +//extern config_group lh_config[2]; //lighthouse configs +void init_config_group(config_group *cg, uint16_t count); +void destroy_config_group(config_group* cg); -void config_init(); +//void config_init(); //void config_open(const char* path, const char* mode); -void config_read(const char* path); + //void config_write_lighthouse(struct BaseStationData* bsd, uint8_t length); -void config_set_lighthouse(BaseStationData* bsd, uint8_t idx); +void config_set_lighthouse(config_group* lh_config, BaseStationData* bsd, uint8_t idx); + +void config_read(SurviveContext* sctx, const char* path); +void config_save(SurviveContext* sctx, const char* path); -void config_save(const char* path); const FLT config_set_float(config_group *cg, const char *tag, const FLT value); const uint32_t config_set_uint32(config_group *cg, const char *tag, const uint32_t value); const char* config_set_str(config_group *cg, const char *tag, const char* value); FLT config_read_float(config_group *cg, const char *tag, const FLT def); -uint16_t config_read_float_array(config_group *cg, const char *tag, FLT** values, const FLT* def, uint16_t count); +uint16_t config_read_float_array(config_group *cg, const char *tag, const FLT** values, const FLT* def, uint16_t count); uint32_t config_read_uint32(config_group *cg, const char *tag, const uint32_t def); const char* config_read_str(config_group *cg, const char *tag, const char *def); |