|
|
@@ -184,28 +184,40 @@ void sample_vref(void) {
|
|
|
LowPass_Filter(_vref.filted_value, _vref.value, _vref.lowpass);
|
|
|
}
|
|
|
|
|
|
+float sample_vbus_raw(void) {
|
|
|
+ s16 vadc = adc_get_vbus();
|
|
|
+ return (float)vadc * VBUS_VOL_CEOF;
|
|
|
+}
|
|
|
+
|
|
|
+float sample_acc_vol_raw(void) {
|
|
|
+ s16 vadc = adc_get_acc();
|
|
|
+ return (float)vadc * VBUS_VOL_CEOF;
|
|
|
+}
|
|
|
+
|
|
|
void sample_vbus(void){
|
|
|
u32 ticks = task_ticks_abs();
|
|
|
- s16 vadc = adc_get_vbus();
|
|
|
- _vbus.value = (float)vadc * VBUS_VOL_CEOF;
|
|
|
+ _vbus.value = sample_vbus_raw();
|
|
|
LowPass_Filter(_vbus.filted_value, _vbus.value, _vbus.lowpass);
|
|
|
_vbus.filted_int = (int)_vbus.filted_value;
|
|
|
#ifdef ACC_V_CHAN
|
|
|
- vadc = adc_get_acc();
|
|
|
- acc_vol.value = (float)vadc * VBUS_VOL_CEOF;
|
|
|
+ acc_vol.value = sample_acc_vol_raw();
|
|
|
LowPass_Filter(acc_vol.filted_value, acc_vol.value, acc_vol.lowpass);
|
|
|
acc_vol.filted_int = (int)acc_vol.filted_value;
|
|
|
#endif
|
|
|
}
|
|
|
|
|
|
-void sample_ibus(void) {
|
|
|
-#ifdef VBUS_I_CHAN
|
|
|
- #ifdef VBUS_I_POSITIVE
|
|
|
+float sample_ibus_raw(void) {
|
|
|
+#ifdef VBUS_I_POSITIVE
|
|
|
s16 vadc = adc_get_ibus() - _ibus.adc_offset;
|
|
|
- #else
|
|
|
+#else
|
|
|
s16 vadc = _ibus.adc_offset - adc_get_ibus();
|
|
|
- #endif
|
|
|
- _ibus.value = (float)vadc * VBUS_I_CEOF;
|
|
|
+#endif
|
|
|
+ return (float)vadc * VBUS_I_CEOF;
|
|
|
+}
|
|
|
+
|
|
|
+void sample_ibus(void) {
|
|
|
+#ifdef VBUS_I_CHAN
|
|
|
+ _ibus.value = sample_ibus_raw();
|
|
|
LowPass_Filter(_ibus.filted_value, _ibus.value, _ibus.lowpass);
|
|
|
#endif
|
|
|
}
|