# HG changeset patch # User Mychaela Falconia # Date 1475993164 0 # Node ID fb95e3f83dc5752dd597de1f11e7b178f1cced43 # Parent 246f4a7dd92bb8fd68f935a7343d64646c00c349 imported PWR source: s/ANALOG/ANLG_FAM/ for TCS211 environment diff -r 246f4a7dd92b -r fb95e3f83dc5 src/cs/drivers/drv_app/pwr/pwr_analog_dev.h --- a/src/cs/drivers/drv_app/pwr/pwr_analog_dev.h Sun Oct 09 05:59:14 2016 +0000 +++ b/src/cs/drivers/drv_app/pwr/pwr_analog_dev.h Sun Oct 09 06:06:04 2016 +0000 @@ -20,7 +20,7 @@ /* Constants relative to the analog device */ -#if (ANALOG == 1) +#if (ANLG_FAM == 1) #define VOLTAGE_LOOP_OFFSET 400 /* (mV) measured */ #define MADC_OFFSET 160 /* (mV) measured */ @@ -31,7 +31,7 @@ #define MADC_VOLTAGE_STEP 1710 /* (uV) spec */ #define MADC_CURRENT_STEP 855 /* (uA) spec */ -#elif (ANALOG == 2) +#elif (ANLG_FAM == 2) #define VOLTAGE_LOOP_OFFSET 200 /* (mV) measured */ #define MADC_OFFSET 160 /* (mV) measured */ @@ -42,6 +42,6 @@ #define MADC_VOLTAGE_STEP 1710 /* (uV) spec */ #define MADC_CURRENT_STEP 855 /* (uA) spec */ -#endif // ANALOG +#endif // ANLG_FAM -#endif /* __PWR_ANALOG_DEV_H__ */ \ No newline at end of file +#endif /* __PWR_ANALOG_DEV_H__ */ diff -r 246f4a7dd92b -r fb95e3f83dc5 src/cs/drivers/drv_app/pwr/pwr_api.h --- a/src/cs/drivers/drv_app/pwr/pwr_api.h Sun Oct 09 05:59:14 2016 +0000 +++ b/src/cs/drivers/drv_app/pwr/pwr_api.h Sun Oct 09 06:06:04 2016 +0000 @@ -80,4 +80,4 @@ T_POWER_RET power_battery_information(void); void pwr_get_bat_info(void); -#endif /* __PWR_API_H__ */ \ No newline at end of file +#endif /* __PWR_API_H__ */ diff -r 246f4a7dd92b -r fb95e3f83dc5 src/cs/drivers/drv_app/pwr/pwr_cust.c --- a/src/cs/drivers/drv_app/pwr/pwr_cust.c Sun Oct 09 05:59:14 2016 +0000 +++ b/src/cs/drivers/drv_app/pwr/pwr_cust.c Sun Oct 09 06:06:04 2016 +0000 @@ -354,9 +354,9 @@ if (SPI_GBL_INFO_PTR->is_gsm_on == FALSE) /* GSM OFF */ { -#if (ANALOG == 1) +#if (ANLG_FAM == 1) ABB_Write_Register_on_page(PAGE0, VRPCCTL2, 0x00EE); -#elif (ANALOG == 2) +#elif (ANLG_FAM == 2) ABB_Write_Register_on_page(PAGE0, VRPCDEV, 0x0001); #endif } @@ -490,9 +490,9 @@ pwr_send_charge_not_possible_event(BAT_TYPE_UNKNOWN); if (SPI_GBL_INFO_PTR->is_gsm_on == FALSE) /* GSM OFF */ { -#if (ANALOG == 1) +#if (ANLG_FAM == 1) ABB_Write_Register_on_page(PAGE0, VRPCCTL2, 0x00EE); -#elif (ANALOG == 2) +#elif (ANLG_FAM == 2) ABB_Write_Register_on_page(PAGE0, VRPCDEV, 0x0001); #endif } diff -r 246f4a7dd92b -r fb95e3f83dc5 src/cs/drivers/drv_app/pwr/pwr_cust.h --- a/src/cs/drivers/drv_app/pwr/pwr_cust.h Sun Oct 09 05:59:14 2016 +0000 +++ b/src/cs/drivers/drv_app/pwr/pwr_cust.h Sun Oct 09 06:06:04 2016 +0000 @@ -97,4 +97,4 @@ void pwr_bat_10uA_temp_test_timer_process(void); void pwr_type_test_timer_process(void); -#endif /* __PWR_CUST_H__ */ \ No newline at end of file +#endif /* __PWR_CUST_H__ */ diff -r 246f4a7dd92b -r fb95e3f83dc5 src/cs/drivers/drv_app/pwr/pwr_disch.h --- a/src/cs/drivers/drv_app/pwr/pwr_disch.h Sun Oct 09 05:59:14 2016 +0000 +++ b/src/cs/drivers/drv_app/pwr/pwr_disch.h Sun Oct 09 06:06:04 2016 +0000 @@ -15,4 +15,4 @@ void pwr_discharge_timer_process(void); void pwr_handle_discharge(void); -#endif /* __PWR_DISCH_H__ */ \ No newline at end of file +#endif /* __PWR_DISCH_H__ */ diff -r 246f4a7dd92b -r fb95e3f83dc5 src/cs/drivers/drv_app/pwr/pwr_env.h --- a/src/cs/drivers/drv_app/pwr/pwr_env.h Sun Oct 09 05:59:14 2016 +0000 +++ b/src/cs/drivers/drv_app/pwr/pwr_env.h Sun Oct 09 06:06:04 2016 +0000 @@ -74,4 +74,4 @@ T_RVM_RETURN pwr_kill (void); -#endif /* __PWR_ENV_H__ */ \ No newline at end of file +#endif /* __PWR_ENV_H__ */ diff -r 246f4a7dd92b -r fb95e3f83dc5 src/cs/drivers/drv_app/pwr/pwr_liion_cha.c --- a/src/cs/drivers/drv_app/pwr/pwr_liion_cha.c Sun Oct 09 05:59:14 2016 +0000 +++ b/src/cs/drivers/drv_app/pwr/pwr_liion_cha.c Sun Oct 09 06:06:04 2016 +0000 @@ -168,9 +168,9 @@ pwr_send_charge_not_possible_event(BAT_TEMP_OUTSIDE_LIMITS); if (SPI_GBL_INFO_PTR->is_gsm_on == FALSE) /* GSM OFF */ { -#if (ANALOG == 1) +#if (ANLG_FAM == 1) ABB_Write_Register_on_page(PAGE0, VRPCCTL2, 0x00EE); -#elif (ANALOG == 2) +#elif (ANLG_FAM == 2) ABB_Write_Register_on_page(PAGE0, VRPCDEV, 0x0001); #endif } @@ -300,9 +300,9 @@ pwr_send_charge_not_possible_event(BAT_SHORT_TEST_FAILED); if (SPI_GBL_INFO_PTR->is_gsm_on == FALSE) /* GSM OFF */ { -#if (ANALOG == 1) +#if (ANLG_FAM == 1) ABB_Write_Register_on_page(PAGE0, VRPCCTL2, 0x00EE); -#elif (ANALOG == 2) +#elif (ANLG_FAM == 2) ABB_Write_Register_on_page(PAGE0, VRPCDEV, 0x0001); #endif } @@ -352,9 +352,9 @@ pwr_send_charge_not_possible_event(BAT_OPEN_TEST_FAILED); if (SPI_GBL_INFO_PTR->is_gsm_on == FALSE) /* GSM OFF */ { -#if (ANALOG == 1) +#if (ANLG_FAM == 1) ABB_Write_Register_on_page(PAGE0, VRPCCTL2, 0x00EE); -#elif (ANALOG == 2) +#elif (ANLG_FAM == 2) ABB_Write_Register_on_page(PAGE0, VRPCDEV, 0x0001); #endif } @@ -384,7 +384,7 @@ rvf_send_trace("i2v offset (MADC code) ", 23, pwr_env_ctrl_blk->i2v_madc_offset, RV_TRACE_LEVEL_DEBUG_LOW, PWR_USE_ID); pwr_stop_charging(); -#if (ANALOG == 2) +#if (ANLG_FAM == 2) if (pwr_env_ctrl_blk->i2v_madc_offset == 0) { /* IOTA: the offset can be made positive and minimized programming */ @@ -403,7 +403,7 @@ pwr_start_fast_charge(); } -#elif (ANALOG == 1) +#elif (ANLG_FAM == 1) /* the i2v calibration must be done before this initialization */ pwr_env_ctrl_blk->madc_eoc_current_code = (UINT16)(1000 * END_OF_CHARGE_I / MADC_CURRENT_STEP) + pwr_env_ctrl_blk->i2v_madc_offset; @@ -412,7 +412,7 @@ /* Start the fast charging cycle */ pwr_start_fast_charge(); -#endif /* #if (ANALOG == 2) */ +#endif /* #if (ANLG_FAM == 2) */ } @@ -487,9 +487,9 @@ if (SPI_GBL_INFO_PTR->is_gsm_on == FALSE) /* GSM OFF */ { -#if (ANALOG == 1) +#if (ANLG_FAM == 1) ABB_Write_Register_on_page(PAGE0, VRPCCTL2, 0x00EE); -#elif (ANALOG == 2) +#elif (ANLG_FAM == 2) ABB_Write_Register_on_page(PAGE0, VRPCDEV, 0x0001); #endif } @@ -589,9 +589,9 @@ if (SPI_GBL_INFO_PTR->is_gsm_on == FALSE) /* GSM OFF */ { -#if (ANALOG == 1) +#if (ANLG_FAM == 1) ABB_Write_Register_on_page(PAGE0, VRPCCTL2, 0x00EE); -#elif (ANALOG == 2) +#elif (ANLG_FAM == 2) ABB_Write_Register_on_page(PAGE0, VRPCDEV, 0x0001); #endif } @@ -612,9 +612,9 @@ if (SPI_GBL_INFO_PTR->is_gsm_on == FALSE) /* GSM OFF */ { -#if (ANALOG == 1) +#if (ANLG_FAM == 1) ABB_Write_Register_on_page(PAGE0, VRPCCTL2, 0x00EE); -#elif (ANALOG == 2) +#elif (ANLG_FAM == 2) ABB_Write_Register_on_page(PAGE0, VRPCDEV, 0x0001); #endif } diff -r 246f4a7dd92b -r fb95e3f83dc5 src/cs/drivers/drv_app/pwr/pwr_liion_cha.h --- a/src/cs/drivers/drv_app/pwr/pwr_liion_cha.h Sun Oct 09 05:59:14 2016 +0000 +++ b/src/cs/drivers/drv_app/pwr/pwr_liion_cha.h Sun Oct 09 06:06:04 2016 +0000 @@ -39,4 +39,4 @@ void pwr_CI_charge_timer_process(void); void pwr_CV_charge_timer_process(void); -#endif /* __PWR_LIION_CHA_H__ */ \ No newline at end of file +#endif /* __PWR_LIION_CHA_H__ */ diff -r 246f4a7dd92b -r fb95e3f83dc5 src/cs/drivers/drv_app/pwr/pwr_messages.h --- a/src/cs/drivers/drv_app/pwr/pwr_messages.h Sun Oct 09 05:59:14 2016 +0000 +++ b/src/cs/drivers/drv_app/pwr/pwr_messages.h Sun Oct 09 06:06:04 2016 +0000 @@ -135,4 +135,4 @@ T_PWR_CHARGING_STATE is_charge_started, T_PWR_PERCENT remaining_capacity); -#endif /* __PWR_MESSAGES_H__ */ \ No newline at end of file +#endif /* __PWR_MESSAGES_H__ */ diff -r 246f4a7dd92b -r fb95e3f83dc5 src/cs/drivers/drv_app/pwr/pwr_messages_i.h --- a/src/cs/drivers/drv_app/pwr/pwr_messages_i.h Sun Oct 09 05:59:14 2016 +0000 +++ b/src/cs/drivers/drv_app/pwr/pwr_messages_i.h Sun Oct 09 06:06:04 2016 +0000 @@ -29,4 +29,4 @@ /* Functions used to send messages to the SPI task */ T_RV_RET pwr_spi_battery_info(CALLBACK_FUNC CallBack); -#endif /* __PWR_MESSAGES_I_H__ */ \ No newline at end of file +#endif /* __PWR_MESSAGES_I_H__ */ diff -r 246f4a7dd92b -r fb95e3f83dc5 src/cs/drivers/drv_app/pwr/pwr_process.h --- a/src/cs/drivers/drv_app/pwr/pwr_process.h Sun Oct 09 05:59:14 2016 +0000 +++ b/src/cs/drivers/drv_app/pwr/pwr_process.h Sun Oct 09 06:06:04 2016 +0000 @@ -22,4 +22,4 @@ /* Prototypes */ void pwr_process(T_RV_HDR * msg_ptr); -#endif /* __PWR_PROCESS_H__ */ \ No newline at end of file +#endif /* __PWR_PROCESS_H__ */