projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
src
/
kernel
/
ao_kalman.c
diff --git
a/src/kernel/ao_kalman.c
b/src/kernel/ao_kalman.c
index e4cc6d4b9f73676fbc93b750ececfad91b2ed332..4f4ffe8f1b6a813b532cd4fe751ed6d684f34b6b 100644
(file)
--- a/
src/kernel/ao_kalman.c
+++ b/
src/kernel/ao_kalman.c
@@
-24,9
+24,9
@@
#include "ao_sample.h"
#include "ao_kalman.h"
#include "ao_sample.h"
#include "ao_kalman.h"
-static
__pdata
ao_k_t ao_k_height;
-static
__pdata
ao_k_t ao_k_speed;
-static
__pdata
ao_k_t ao_k_accel;
+static ao_k_t ao_k_height;
+static ao_k_t ao_k_speed;
+static ao_k_t ao_k_accel;
#define AO_K_STEP_100 to_fix_v(0.01)
#define AO_K_STEP_2_2_100 to_fix_v(0.00005)
#define AO_K_STEP_100 to_fix_v(0.01)
#define AO_K_STEP_2_2_100 to_fix_v(0.00005)
@@
-37,24
+37,24
@@
static __pdata ao_k_t ao_k_accel;
#define AO_K_STEP_1 to_fix_v(1)
#define AO_K_STEP_2_2_1 to_fix_v(0.5)
#define AO_K_STEP_1 to_fix_v(1)
#define AO_K_STEP_2_2_1 to_fix_v(0.5)
-
__pdata
ao_v_t ao_height;
-
__pdata
ao_v_t ao_speed;
-
__pdata
ao_v_t ao_accel;
-
__xdata
ao_v_t ao_max_height;
-static
__pdata
ao_k_t ao_avg_height_scaled;
-
__xdata
ao_v_t ao_avg_height;
+ao_v_t ao_height;
+ao_v_t ao_speed;
+ao_v_t ao_accel;
+ao_v_t ao_max_height;
+static ao_k_t ao_avg_height_scaled;
+ao_v_t ao_avg_height;
-
__pdata
ao_v_t ao_error_h;
+ao_v_t ao_error_h;
#if !HAS_ACCEL || AO_FLIGHT_TEST
#define AO_ERROR_H_SQ_AVG 1
#endif
#if AO_ERROR_H_SQ_AVG
#if !HAS_ACCEL || AO_FLIGHT_TEST
#define AO_ERROR_H_SQ_AVG 1
#endif
#if AO_ERROR_H_SQ_AVG
-
__pdata
ao_v_t ao_error_h_sq_avg;
+ao_v_t ao_error_h_sq_avg;
#endif
#if HAS_ACCEL
#endif
#if HAS_ACCEL
-
__pdata
ao_v_t ao_error_a;
+ao_v_t ao_error_a;
#endif
static void
#endif
static void