diff options
| -rw-r--r-- | apps/plugin.c | 2 | ||||
| -rw-r--r-- | apps/plugin.h | 6 | ||||
| -rw-r--r-- | apps/plugins/battery_bench.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index ae32aca..c0cdbd8 100644 --- a/apps/plugin.c +++ b/apps/plugin.c @@ -519,7 +519,7 @@ static const struct plugin_api rockbox_api = { #endif #if CONFIG_CHARGING charger_inserted, -# if CONFIG_CHARGING == CHARGING_MONITOR +# if CONFIG_CHARGING >= CHARGING_MONITOR charging_state, # endif #endif diff --git a/apps/plugin.h b/apps/plugin.h index 286e6bc..d261ea5 100644 --- a/apps/plugin.h +++ b/apps/plugin.h @@ -128,12 +128,12 @@ void* plugin_get_buffer(size_t *buffer_size); #define PLUGIN_MAGIC 0x526F634B /* RocK */ /* increase this every time the api struct changes */ -#define PLUGIN_API_VERSION 144 +#define PLUGIN_API_VERSION 145 /* update this to latest version if a change to the api struct breaks backwards compatibility (and please take the opportunity to sort in any new function which are "waiting" at the end of the function table) */ -#define PLUGIN_MIN_API_VERSION 144 +#define PLUGIN_MIN_API_VERSION 145 /* plugin return codes */ enum plugin_status { @@ -658,7 +658,7 @@ struct plugin_api { #endif #if CONFIG_CHARGING bool (*charger_inserted)(void); -# if CONFIG_CHARGING == CHARGING_MONITOR +# if CONFIG_CHARGING >= CHARGING_MONITOR bool (*charging_state)(void); # endif #endif diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 40b9998..e515ac7 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -271,7 +271,7 @@ static unsigned int charge_state(void) #if CONFIG_CHARGING if (rb->charger_inserted()) ret = BIT_CHARGER; -#if CONFIG_CHARGING == CHARGING_MONITOR +#if CONFIG_CHARGING >= CHARGING_MONITOR if (rb->charging_state()) ret |= BIT_CHARGING; #endif @@ -310,7 +310,7 @@ static bool flush_buffer(void) "%02d:%02d, %04d, " #if CONFIG_CHARGING " %c" -#if CONFIG_CHARGING == CHARGING_MONITOR +#if CONFIG_CHARGING >= CHARGING_MONITOR ", %c" #endif #endif @@ -324,7 +324,7 @@ static bool flush_buffer(void) bat[i].voltage #if CONFIG_CHARGING , (bat[i].flags & BIT_CHARGER) ? 'A' : '-' -#if CONFIG_CHARGING == CHARGING_MONITOR +#if CONFIG_CHARGING >= CHARGING_MONITOR , (bat[i].flags & BIT_CHARGING) ? 'C' : '-' #endif #endif @@ -517,7 +517,7 @@ int main(void) #if CONFIG_CHARGING ", C:" #endif -#if CONFIG_CHARGING == CHARGING_MONITOR +#if CONFIG_CHARGING >= CHARGING_MONITOR ", S:" #endif #ifdef HAVE_USB_POWER |