nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Also add a config-specific 'Default' value, this should fix the sim builds. 

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9680 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Zakk Roberts 2006-04-15 13:07:21 +00:00
parent 97c3a6f10a
commit 16a57e2e4f
22 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/settings.c
View File

@ -94,7 +94,7 @@ const char rec_base_directory[] = REC_BASE_DIR;
#include "dsp.h"
#endif
#define CONFIG_BLOCK_VERSION 40
#define CONFIG_BLOCK_VERSION 40
#define CONFIG_BLOCK_SIZE 512
#define RTC_BLOCK_SIZE 44
@ -273,7 +273,7 @@ static const struct bit_entry rtc_bits[] =
{14, S_O(max_files_in_dir), 400,
"max files in dir", NULL }, /* 50...10000 */
/* battery */
{12, S_O(battery_capacity), BATTERY_CAPACITY_MIN, "battery capacity",
{12, S_O(battery_capacity), BATTERY_CAPACITY_DEFAULT, "battery capacity",
NULL }, /* 1500...3200 for NiMH, 2200...3200 for LiIon,
500...1500 for Alkaline */
#ifdef HAVE_CHARGING
@ -1612,7 +1612,7 @@ bool settings_save_config(void)
fdprintf(fd, "# .cfg file created by rockbox %s - "
"http://www.rockbox.org\r\n#\r\n#\r\n# wps / rwps / language"
" / font / fmpreset / backdrop \r\n#\r\n", appsversion);
if (global_settings.wps_file[0] != 0)
fdprintf(fd, "wps: %s/%s.wps\r\n", WPS_DIR,
global_settings.wps_file);
@ -1721,7 +1721,7 @@ void settings_reset(void) {
global_settings.superbass = sound_default(SOUND_SUPERBASS);
#endif
global_settings.contrast = lcd_default_contrast();
#ifdef CONFIG_TUNER
global_settings.fmr_file[0] = '\0';
#endif

2
firmware/export/config-fmrecorder.h
View File

@ -44,6 +44,8 @@
/* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
#define BATTERY_CAPACITY_DEFAULT 2200 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a SH7034 */

2
firmware/export/config-gigabeat.h
View File

@ -42,6 +42,8 @@
/* Define this if you have the WM8975 audio codec */
#define HAVE_WM8751
#define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a Motorola SCF5249 */

2
firmware/export/config-gmini120.h
View File

@ -30,6 +30,8 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define BATTERY_CAPACITY_DEFAULT 2200 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a TCC730 (CalmRISC16) */

2
firmware/export/config-gminisp.h
View File

@ -21,6 +21,8 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define BATTERY_CAPACITY_DEFAULT 2200 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a TCC730 (CalmRISC16) */

2
firmware/export/config-h100.h
View File

@ -58,6 +58,8 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */
#define AB_REPEAT_ENABLE 1
#define CONFIG_TUNER TEA5767

2
firmware/export/config-h120.h
View File

@ -64,6 +64,8 @@
/* define this if you have recording possibility */
#define HAVE_RECORDING 1
#define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a Motorola SCF5249 */

2
firmware/export/config-h300.h
View File

@ -64,6 +64,8 @@
/* define this if you have recording possibility */
#define HAVE_RECORDING 1
#define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a Motorola SCF5249 */

2
firmware/export/config-iaudiox5.h
View File

@ -53,6 +53,8 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define BATTERY_CAPACITY_DEFAULT 950 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a Motorola SCF5250 */

2
firmware/export/config-ipod3g.h
View File

@ -50,6 +50,8 @@
/* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_IPOD3G /* port controlled */
#define BATTERY_CAPACITY_DEFAULT 630 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a PortalPlayer PP5002 */

2
firmware/export/config-ipod4g.h
View File

@ -52,6 +52,8 @@
/* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_IPOD4G /* port controlled */
#define BATTERY_CAPACITY_DEFAULT 630 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a PortalPlayer PP5020 */

2
firmware/export/config-ipodcolor.h
View File

@ -51,6 +51,8 @@
/* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_IPOD4G /* port controlled */
#define BATTERY_CAPACITY_DEFAULT 700 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a PortalPlayer PP5020 */

2
firmware/export/config-ipodmini.h
View File

@ -52,6 +52,8 @@
/* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_IPODMINI /* port controlled */
#define BATTERY_CAPACITY_DEFAULT 400 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a PortalPlayer PP5020 */

2
firmware/export/config-ipodmini2g.h
View File

@ -55,6 +55,8 @@
/* We can fade the backlight by using PWM */
#define HAVE_BACKLIGHT_PWM_FADING
#define BATTERY_CAPACITY_DEFAULT 400 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a PortalPlayer PP5020 */

2
firmware/export/config-ipodnano.h
View File

@ -54,6 +54,8 @@
/* We can fade the backlight by using PWM */
#define HAVE_BACKLIGHT_PWM_FADING
#define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */
#ifndef SIMULATOR
/* The Nano actually has a PP5021 - but it's register compatible with

2
firmware/export/config-ipodvideo.h
View File

@ -54,6 +54,8 @@
/* We can fade the backlight by using PWM */
#define HAVE_BACKLIGHT_PWM_FADING
#define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */
#ifndef SIMULATOR
/* The Nano actually has a PP5021 - but it's register compatible with

2
firmware/export/config-ondiofm.h
View File

@ -28,6 +28,8 @@
/* Define this if you have a MAS3587F */
#define CONFIG_CODEC MAS3587F
#define BATTERY_CAPACITY_DEFAULT 500 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a SH7034 */

2
firmware/export/config-ondiosp.h
View File

@ -21,6 +21,8 @@
/* Define this if you have a MAS3539F */
#define CONFIG_CODEC MAS3539F
#define BATTERY_CAPACITY_DEFAULT 500 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a SH7034 */

2
firmware/export/config-player.h
View File

@ -23,6 +23,8 @@
/* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_PA14_LO /* port PA14, low active */
#define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a SH7034 */

2
firmware/export/config-recorder.h
View File

@ -38,6 +38,8 @@
/* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
#define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a SH7034 */

2
firmware/export/config-recorderv2.h
View File

@ -41,6 +41,8 @@
/* Define this for LCD backlight available */
#define CONFIG_BACKLIGHT BL_RTC /* on I2C controlled RTC port */
#define BATTERY_CAPACITY_DEFAULT 2200 /* default battery capacity */
#ifndef SIMULATOR
/* Define this if you have a SH7034 */

38
firmware/powermgmt.c
View File

@ -185,7 +185,7 @@ static const short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
#else /* NiMH */
/* original values were taken directly after charging, but it should show
100% after turning off the device for some hours, too */
{ 450, 481, 491, 497, 503, 507, 512, 514, 517, 525, 540 }
{ 450, 481, 491, 497, 503, 507, 512, 514, 517, 525, 540 }
/* orig. values: ...,528,560 */
#endif
};
@ -197,7 +197,7 @@ charger_input_state_type charger_input_state IDATA_ATTR;
static const short percent_to_volt_charge[11] =
{
#if CONFIG_BATTERY == BATT_LIPOL1300
/* Calibrated for 1900 mAh Ionity battery (estimated 90% charge when
/* Calibrated for 1900 mAh Ionity battery (estimated 90% charge when
entering in trickle-charging). We will never reach 100%. */
340, 390, 394, 399, 400, 404, 407, 413, 417, 422, 426
#else
@ -243,11 +243,11 @@ int pid_i = 0; /* PID integral term */
*/
static unsigned int battery_centivolts;/* filtered battery voltage, centvolts */
static unsigned int avgbat; /* average battery voltage (filtering) */
#define BATT_AVE_SAMPLES 32 /* filter constant / @ 2Hz sample rate */
#define BATT_AVE_SAMPLES 32 /* filter constant / @ 2Hz sample rate */
/* battery level (0-100%) of this minute, updated once per minute */
static int battery_percent = -1;
static int battery_capacity = BATTERY_CAPACITY_MIN; /* default value, mAH */
static int battery_capacity = BATTERY_CAPACITY_DEFAULT; /* default value, mAh */
static int battery_type = 0;
/* Power history: power_history[0] is the newest sample */
@ -348,7 +348,7 @@ static int voltage_to_percent(int voltage, const short* table)
else
if (voltage >= table[10])
return 100;
else {
else {
/* search nearest value */
int i = 0;
while ((i < 10) && (table[i+1] < voltage))
@ -405,7 +405,7 @@ static void battery_status_update(void)
else
#endif
{
powermgmt_est_runningtime_min = level * battery_capacity / 100
powermgmt_est_runningtime_min = level * battery_capacity / 100
* 60 / runcurrent();
}
}
@ -515,7 +515,7 @@ static int runcurrent(void)
/* Check to see whether or not we've received an alarm in the last second */
#ifdef HAVE_ALARM_MOD
static void power_thread_rtc_process(void)
static void power_thread_rtc_process(void)
{
if (rtc_check_alarm_flag()) {
rtc_enable_alarm(false);
@ -592,7 +592,7 @@ static void power_thread_sleep(int ticks)
}
break;
}
#endif /* HAVE_CHARGE_STATE */
small_ticks = MIN(HZ/2, ticks);
@ -674,7 +674,7 @@ static void power_thread(void)
/* initialize the voltages for the exponential filter */
avgbat = adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR *
avgbat = adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR *
BATT_AVE_SAMPLES;
battery_centivolts = avgbat / BATT_AVE_SAMPLES / 10000;
@ -682,7 +682,7 @@ static void power_thread(void)
fd = -1;
wrcount = 0;
#endif
while (1)
{
/* rotate the power history */
@ -690,7 +690,7 @@ static void power_thread(void)
phps = phpd - 1;
for (i = 0; i < POWER_HISTORY_LEN-1; i++)
*phpd-- = *phps--;
/* insert new value at the start, in centivolts 8-) */
power_history[0] = battery_centivolts;
@ -732,7 +732,7 @@ static void power_thread(void)
} else {
charge_state = TOPOFF;
target_voltage = TOPOFF_VOLTAGE;
}
}
} else {
/*
* Start the charger full strength
@ -743,8 +743,8 @@ static void power_thread(void)
if (charge_max_time_idle > i) {
charge_max_time_idle = i;
}
charge_max_time_now = charge_max_time_idle;
charge_max_time_now = charge_max_time_idle;
snprintf(power_message, POWER_MESSAGE_LEN,
"ChgAt %d%% max %dm", battery_level(),
charge_max_time_now);
@ -895,7 +895,7 @@ static void power_thread(void)
* plugged in, but it doesn't appear to be necessary and will
* generate more heat [gvb].
*/
pid_p = target_voltage - battery_centivolts;
if((pid_p > PID_DEADZONE) || (pid_p < -PID_DEADZONE))
pid_p = pid_p * PID_PCONST;
@ -980,7 +980,7 @@ static void power_thread(void)
}
}
if(fd >= 0) {
snprintf(debug_message, DEBUG_MESSAGE_LEN,
snprintf(debug_message, DEBUG_MESSAGE_LEN,
"%d, %d, %d, %d, %d, %d, %d, %d\n",
powermgmt_last_cycle_startstop_min, battery_centivolts,
battery_percent, charger_input_state, charge_state,
@ -1002,7 +1002,7 @@ void powermgmt_init(void)
{
/* init history to 0 */
memset(power_history, 0x00, sizeof(power_history));
create_thread(power_thread, power_stack, sizeof(power_stack),
power_thread_name);
}
@ -1015,12 +1015,12 @@ void sys_poweroff(void)
/* If the main thread fails to shut down the system, we will force a
power off after an 8 second timeout */
shutdown_timeout = HZ*8;
queue_post(&button_queue, SYS_POWEROFF, NULL);
}
/* Various hardware housekeeping tasks relating to shutting down the jukebox */
void shutdown_hw(void)
void shutdown_hw(void)
{
#ifndef SIMULATOR
#if defined(DEBUG_FILE) && defined(HAVE_CHARGE_CTRL)