diff options
| author | ultramn <dchapm2@umbc.edu> | 2017-03-08 21:03:46 -0800 |
|---|---|---|
| committer | ultramn <dchapm2@umbc.edu> | 2017-03-08 21:03:46 -0800 |
| commit | 91598e1806efce519d76c667954fd4c8da74e82e (patch) | |
| tree | cd68d7b3f20b3ca09881b418f92cc06e65d906c6 /src/survive_cal.c | |
| parent | 3fa72f4b765457ce369d1aa1495dc36c90a94ebf (diff) | |
| parent | 5629fd458d1de11f604248422473291e434c289f (diff) | |
| download | libsurvive-91598e1806efce519d76c667954fd4c8da74e82e.tar.gz libsurvive-91598e1806efce519d76c667954fd4c8da74e82e.tar.bz2 | |
Merge branch 'master' of https://github.com/cnlohr/libsurvive
Diffstat (limited to 'src/survive_cal.c')
| -rw-r--r-- | src/survive_cal.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/survive_cal.c b/src/survive_cal.c index f372309..06914eb 100644 --- a/src/survive_cal.c +++ b/src/survive_cal.c @@ -27,8 +27,8 @@ static void reset_calibration( struct SurviveCalData * cd ); void ootx_packet_clbk_d(ootx_decoder_context *ct, ootx_packet* packet) { - struct SurviveContext * ctx = (struct SurviveContext*)(ct->user); - struct SurviveCalData * cd = ctx->calptr; + SurviveContext * ctx = (SurviveContext*)(ct->user); + SurviveCalData * cd = ctx->calptr; int id = ct->user1; SV_INFO( "Got OOTX packet %d %p", id, cd ); @@ -36,7 +36,7 @@ void ootx_packet_clbk_d(ootx_decoder_context *ct, ootx_packet* packet) lighthouse_info_v6 v6; init_lighthouse_info_v6(&v6, packet->data); - struct BaseStationData * b = &ctx->bsd[id]; + BaseStationData * b = &ctx->bsd[id]; //print_lighthouse_info_v6(&v6); b->BaseStationID = v6.id; @@ -52,8 +52,8 @@ void ootx_packet_clbk_d(ootx_decoder_context *ct, ootx_packet* packet) b->fcalgibmag[1] = v6.fcal_1_gibmag; b->OOTXSet = 1; - config_set_lighthouse(b,id); - config_save("config.json"); + config_set_lighthouse(ctx->lh_config,b,id); +// config_save("config.json"); } int survive_cal_get_status( struct SurviveContext * ctx, char * description, int description_length ) |