Index: firmware/target/arm/ipod/powermgmt-ipod-pcf.c
===================================================================
--- firmware/target/arm/ipod/powermgmt-ipod-pcf.c	(revision 17687)
+++ firmware/target/arm/ipod/powermgmt-ipod-pcf.c	(working copy)
@@ -30,9 +30,12 @@
     3330
 #elif defined IPOD_VIDEO
     3300
+#elif defined IPOD_COLOR
+    3300
 #else
-    /* FIXME: calibrate value for other 3G+ ipods */
-    3380
+    /* FIXME: calibrate value for other 1g, 2g, 3g, 4g(Grayscale), 5.5g, mini1g, mini2g ipods */
+    /* Table is "Provisional" from iPod color/photo. */
+    3300
 #endif
 };
 
@@ -42,9 +45,12 @@
     3230
 #elif defined IPOD_VIDEO
     3300
+#elif defined IPOD_COLOR
+    3300
 #else
-    /* FIXME: calibrate value for other 3G+ ipods */
-    3020
+    /* FIXME: calibrate value for other 1g, 2g, 3g, 4g(Grayscale), 5.5g, mini1g, mini2g ipods */
+    /* Table is "Provisional" from iPod color/photo. */
+    3300
 #endif
 };
 
@@ -57,10 +63,12 @@
 #elif defined IPOD_VIDEO
     /* iPOD Video 30GB Li-Ion 400mAh, first approach based upon measurements */
     { 3450, 3670, 3710, 3750, 3790, 3830, 3870, 3930, 4010, 4100, 4180 },
+#elif defined IPOD_COLOR
+    { 3230, 3620, 3700, 3730, 3750, 3780, 3830, 3890, 3950, 4030, 4160 },
 #else
-    /* FIXME: calibrate value for other 3G+ ipods */
-    /* Table is "inherited" from iriver H100. */
-    { 3370, 3650, 3700, 3740, 3780, 3820, 3870, 3930, 4000, 4080, 4160 }
+    /* FIXME: calibrate value for other 1g, 2g, 3g, 4g(Grayscale), 5.5g, mini1g, mini2g ipods */
+    /* Table is "Provisional" from iPod color/photo. */
+    { 3230, 3620, 3700, 3730, 3750, 3780, 3830, 3890, 3950, 4030, 4160 },
 #endif
 };
 
@@ -74,10 +82,12 @@
 #elif defined IPOD_VIDEO
     /* iPOD Video 30GB Li-Ion 400mAh, first approach based upon measurements */
     3450, 3670, 3710, 3750, 3790, 3830, 3870, 3930, 4010, 4100, 4180
+#elif defined IPOD_COLOR
+    3230, 3620, 3700, 3730, 3750, 3780, 3830, 3890, 3950, 4030, 4160
 #else
-    /* FIXME: calibrate value for other 3G+ ipods */
-    /* Table is "inherited" from iriver H100. */
-    3540, 3860, 3930, 3980, 4000, 4020, 4040, 4080, 4130, 4180, 4230
+    /* FIXME: calibrate value for other 1g, 2g, 3g, 4g(Grayscale), 5.5g, mini1g, mini2g ipods */
+    /* Table is "Provisional" from iPod color/photo. */
+    3230, 3620, 3700, 3730, 3750, 3780, 3830, 3890, 3950, 4030, 4160
 #endif
 };
 #endif /* CONFIG_CHARGING */