FreeCalypso > hg > fc-tourmaline

view src/ui/bmi/Icons/IcnBattery.c @ 220:0ed36de51973

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ABB semaphore protection overhaul The ABB semaphone protection logic that came with TCS211 from TI was broken in several ways: * Some semaphore-protected functions were called from Application_Initialize() context. NU_Obtain_Semaphore() called with NU_SUSPEND fails with NU_INVALID_SUSPEND in this context, but the return value wasn't checked, and NU_Release_Semaphore() would be called unconditionally at the end. The latter call would increment the semaphore count past 1, making the semaphore no longer binary and thus no longer effective for resource protection. The fix is to check the return value from NU_Obtain_Semaphore() and skip the NU_Release_Semaphore() call if the semaphore wasn't properly obtained. * Some SPI hardware manipulation was being done before entering the semaphore- protected critical section. The fix is to reorder the code: first obtain the semaphore, then do everything else. * In the corner case of L1/DSP recovery, l1_abb_power_on() would call some non-semaphore-protected ABB & SPI init functions. The fix is to skip those calls in the case of recovery. * A few additional corner cases existed, all of which are fixed by making ABB semaphore protection 100% consistent for all ABB functions and code paths. There is still one remaining problem of priority inversion: suppose a low- priority task calls an ABB function, and some medium-priority task just happens to preempt right in the middle of that semaphore-protected ABB operation. Then the high-priority SPI task is locked out for a non-deterministic time until that medium-priority task finishes its work and goes back to sleep. This priority inversion problem remains outstanding for now.
author Mychaela Falconia <falcon@freecalypso.org>
date Mon, 26 Apr 2021 20:55:25 +0000
parents 67bfe9f274f6
children
line wrap: on
line source

#include "IcnDefs.h"
#ifdef WIDEICONS
const unsigned char I_batColour[] = {	
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x25,0x25,0x00,0xFF,0xFF,0x00,0xFB,0xFB,0x00,0xF2,0xF2,0x00,0xE9,0xE9,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x25,0x25,0x00,0xFF,
0xFF,0x00,0xFB,0xFB,0x00,0xF2,0xF2,0x00,0xE9,0xE9,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x00,0x00,0x00,0xFF,0xFF,0x00,0xFB,0xFB,0x00,0xF2,0xF2,0x00,0xE9,0xE9,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x00,0x00,0x00,0xFF,0xFF,0x00,0xFB,0xFB,0x00,0xF2,0xF2,0x00,0xE9,
0xE9,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x00,0x00,0x00,0xFF,0xFF,0x00,0xFB,0xFB,0x00,0xF2,0xF2,0x00,0xE9,0xE9,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x00,0x00,0x00,0xFF,0xFF,0x00,0xFB,0xFB,0x00,0xF2,0xF2,0x00,0xE9,0xE9,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x00,
0x00,0x00,0xFF,0xFF,0x00,0xFB,0xFB,0x00,0xF2,0xF2,0x00,0xE9,0xE9,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x00,0x00,0x00,0xFF,0xFF,0x00,0xFB,0xFB,0x00,0xF2,0xF2,0x00,0xE9,0xE9,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x25,0x25,0x00,0xFF,0xFF,0x00,0xFB,0xFB,0x00,0xF2,
0xF2,0x00,0xE9,0xE9,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x25,0x25,0x00,0xFF,0xFF,0x00,0xFB,0xFB,0x00,0xF2,0xF2,0x00,0xE9,0xE9,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x25,0x25,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,
0x00 };

#else
//icn1
const unsigned char I_batColour100[] = {
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,
0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,
0xE0,0xE0,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,
0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x25,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x00 };
//icn2
const unsigned char I_batColour49[] = {
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x25,
0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,
0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,
0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x00 };
/* //const unsigned char 19x22battery3_bmp[] = {
const unsigned char I_batColour24[] = {
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,
0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,
0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,
0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x00 };*/
//const unsigned char 19x22battery4_bmp[] = {
const unsigned char I_batColour24[] = {
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,
0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,
0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,
0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x00 };
//const unsigned char 19x22battery5_bmp[] = {
const unsigned char I_batColour14[] = {
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,
0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,
0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,
0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,0xE0,0xE0,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x00 };
//const unsigned char 19x22battery6_bmp[] = {
const unsigned char I_batColour4[] = {	
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,
0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,
0x25,0x25,0x00,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,
0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x00,0x25,0x25,0x25,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,0x25,
0x00 };

int icnBattery_dataformat( int iconId, char* *bmp, int *sx, int *sy, int *format, char **palette)
{
	*sx = 19;
	*sy = 22;
	*format = ICON_TYPE_256Colour;
	switch (iconId)
	{
		case ICON_IDLE_Battery4:	*bmp = (char*)I_batColour4;			break;
		case ICON_IDLE_Battery14:	*bmp = (char*)I_batColour14;		break;
		case ICON_IDLE_Battery24:	*bmp = (char*)I_batColour24;		break;
		case ICON_IDLE_Battery49:	*bmp = (char*)I_batColour49;		break;
		case ICON_IDLE_Battery100:	*bmp = (char*)I_batColour100;		break;
		default: 					*bmp = (char*)I_batColour100;		break;
	}
	return (0);
}
#endif


/*
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x00,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,
0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,
0x00};
*/