From d9d52762ae599ccafabda289b923d41b513401e6 Mon Sep 17 00:00:00 2001
From: "bernet.andre@gmail.com"
 <bernet.andre@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 22 Feb 2013 15:44:52 +0000
Subject: [PATCH] [voice] ONm correctly reset on model change [X9D] Default
 bitmap on main view when none selected / no SD

---
 src/Makefile       |   9 +++++++--
 src/eeprom_avr.cpp |   1 +
 src/main_views.cpp |  12 ++++++++++--
 src/open9x.cpp     |   3 ++-
 src/open9x.h       |  13 +++++++++----
 src/x9d_logo.bmp   | Bin 0 -> 1144 bytes
 src/x9d_logo.lbm   |   5 +++++
 7 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 src/x9d_logo.bmp
 create mode 100644 src/x9d_logo.lbm

diff --git a/src/Makefile b/src/Makefile
index d75de7d52..3eb23860e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -831,7 +831,7 @@ eep: $(TARGET).eep
 lss: $(TARGET).lss
 sym: $(TARGET).sym
 
-lbm: font.lbm font_tiny.lbm font_small.lbm font_midsize.lbm font_dblsize.lbm sticks.lbm splash_9x.lbm splash_X9D.lbm asterisk.lbm
+lbm: font.lbm font_tiny.lbm font_small.lbm font_midsize.lbm font_dblsize.lbm sticks.lbm splash_9x.lbm splash_X9D.lbm x9d_logo.lbm asterisk.lbm
 
 # Build stamp-file
 stamp_header:
@@ -917,7 +917,12 @@ splash_9x.lbm: splash_9x.xbm
 	
 splash_X9D.lbm: splash_X9D.bmp
 	@echo
-	@echo "Convert X9D splash from xbm to lbm:"
+	@echo "Convert X9D splash from bmp to lbm:"
+	$(IMG2LBM) $< $@ bmp
+	
+x9d_logo.lbm: x9d_logo.bmp
+	@echo
+	@echo "Convert X9D logo from bmp to lbm:"
 	$(IMG2LBM) $< $@ bmp
 
 asterisk.lbm: asterisk.xbm
diff --git a/src/eeprom_avr.cpp b/src/eeprom_avr.cpp
index 2b6b8e956..f85c94961 100644
--- a/src/eeprom_avr.cpp
+++ b/src/eeprom_avr.cpp
@@ -903,6 +903,7 @@ void eeLoadModel(uint8_t id)
     activeSwitches = 0;
     activeFnSwitches = 0;
     activeFunctions = 0;
+    memclear(lastFunctionTime, sizeof(lastFunctionTime));
 
 #if !defined(PCBSTD)
     for (uint8_t i=0; i<MAX_TIMERS; i++) {
diff --git a/src/main_views.cpp b/src/main_views.cpp
index 12746624c..ff372d586 100644
--- a/src/main_views.cpp
+++ b/src/main_views.cpp
@@ -90,6 +90,12 @@
 #define MARKER_WIDTH  5
 #define BOX_LIMIT     (BOX_WIDTH-MARKER_WIDTH)
 
+#if defined(PCBX9D)
+  const pm_uchar x9d_logo[] PROGMEM = { 
+  #include "x9d_logo.lbm"
+  };
+#endif
+
 void drawPotsBars()
 {
   // Optimization by Mike Blandford
@@ -439,8 +445,10 @@ void menuMainView(uint8_t event)
   displaySliders();
 
 #if defined(PCBX9D)
-  // Model bitmap
-  lcd_bmp(BITMAP_X, BITMAP_Y, modelBitmap);
+  if(modelBitmapLoaded == NULL)
+    lcd_bmp(BITMAP_X, BITMAP_Y, modelBitmap);
+  else
+  	lcd_bmp(BITMAP_X, BITMAP_Y, x9d_logo);
 #endif
 
   // Switches
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 6855fec8e..5cb462fef 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -96,13 +96,14 @@ ModelData  g_model;
 
 #if defined(PCBX9D) && defined(SDCARD)
 uint8_t modelBitmap[MODEL_BITMAP_SIZE];
+pm_char * modelBitmapLoaded;
 void loadModelBitmap()
 {
   char lfn[] = BITMAPS_PATH "/xxxxxxxxxx.bmp";
   strncpy(lfn+sizeof(BITMAPS_PATH), g_model.bitmap, sizeof(g_model.bitmap));
   lfn[sizeof(BITMAPS_PATH)+sizeof(g_model.bitmap)] = '\0';
   strcat(lfn+sizeof(BITMAPS_PATH), BITMAPS_EXT);
-  bmpLoad(modelBitmap, lfn, MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT);
+  modelBitmapLoaded = bmpLoad(modelBitmap, lfn, MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT);
 }
 #endif
 
diff --git a/src/open9x.h b/src/open9x.h
index 14f5b377c..d5d89fc52 100644
--- a/src/open9x.h
+++ b/src/open9x.h
@@ -391,6 +391,7 @@ extern inline uint16_t get_tmr10ms()
 #define MODEL_BITMAP_HEIGHT 32
 #define MODEL_BITMAP_SIZE   (2+4*(MODEL_BITMAP_WIDTH*MODEL_BITMAP_HEIGHT/8))
 extern uint8_t modelBitmap[MODEL_BITMAP_SIZE];
+extern pm_char * modelBitmapLoaded;
 void loadModelBitmap();
 #define LOAD_MODEL_BITMAP() loadModelBitmap()
 #else
@@ -1051,16 +1052,20 @@ inline bool isMixActive(uint8_t mix)
 #endif
 
 #if defined(CPUARM)
-#define MASK_CFN_TYPE uint32_t  // current max = 32 function switches
-#define MASK_FUNC_TYPE uint32_t // current max = 32 functions
+  #define MASK_CFN_TYPE uint32_t  // current max = 32 function switches
+  #define MASK_FUNC_TYPE uint32_t // current max = 32 functions
+#elif defined(CPUM64)
+  #define MASK_CFN_TYPE uint16_t  // current max = 16 function switches
+  #define MASK_FUNC_TYPE uint16_t // current max = 16 functions
 #else
-#define MASK_CFN_TYPE uint16_t  // current max = 16 function switches
-#define MASK_FUNC_TYPE uint16_t // current max = 16 functions
+  #define MASK_CFN_TYPE uint32_t  // current max = 32 function switches
+  #define MASK_FUNC_TYPE uint16_t // current max = 16 functions
 #endif
 
 extern MASK_CFN_TYPE  activeSwitches;
 extern MASK_CFN_TYPE  activeFnSwitches;
 extern MASK_FUNC_TYPE activeFunctions;
+extern tmr10ms_t lastFunctionTime[NUM_CFN];
 inline bool isFunctionActive(uint8_t func)
 {
   return activeFunctions & ((MASK_FUNC_TYPE)1 << (func-FUNC_TRAINER));
diff --git a/src/x9d_logo.bmp b/src/x9d_logo.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..44f48aa6ab61be5abf9daa1b80c424440a530d23
GIT binary patch
literal 1144
zcmah{OK1~O6g>&4RVSZLb#3G5!mW%;VTwdtNd=p=U1b|rMo{pFl9dhUCM&zn!nkr1
zB$487z<^5$buBa*+NQRN=6dd%nF=MT7v6h!?z!jO^JeD8?T0Ctc)<M%*D_b0D}fM5
z@>sOO#qv?uwhhN|;JPjfg#wDjB1)waDwPVV)hg=sIvR}zTCEm*-$$?4L%-jLh#YCm
zO420!iw<(6NRX3&8MounF(6w+ah2Cro;+9zeBw%@jN;6+E5;@8J4RNa9C_NM45dP-
zLHDW};i^I-#MO}&eZLcua-v9#8?LYv^3C)JH~Pe>&ynH$7>`DAoY7a@+)u634a?E}
z)Tg;0?bBW8kNEM|!*-=mO&Lo6U+AQhqK2|a4NdKtP%P2x!aG1xCJPv_7JVmAak*4n
zMS2gpA?B3SW@(JGA|qrJ*2vTS{60=Ab4d$G=$6t{M*Pw6br~O(bQqF0VCTJ>nI%KL
z%~F?JT5)WV6Y%%V1~~PSxf(=fhg(*(S*IRozQ@uNKHS00)$$nDQ@)&C%&)as!x@p^
zrAM#ITZ2JhF1j#xNdEz>A#KQgIQe@#$6n?<FYe@<8)$dZ(uE~!>mr-3ZLbjD{gh70
z+pD(S{N}FwS!{2**JWrCh~oLqYn6*bUmhLDk3ZjdANJ{LR{VNA%KqTAS+V{7Vm~<x
jWc}IY_n$AEfKRr+oC_^YZ@PBZc{d#it1oUfr^3Kr*UgQ)

literal 0
HcmV?d00001

diff --git a/src/x9d_logo.lbm b/src/x9d_logo.lbm
new file mode 100644
index 000000000..9e29eb8e0
--- /dev/null
+++ b/src/x9d_logo.lbm
@@ -0,0 +1,5 @@
+64,32,
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x59,0x09,0x0b,0x02,0x46,0x1a,0x49,0x2b,0x0d,0x53,0x48,0x2b,0x28,0x2c,0x52,0x4b,0x9f,0x84,0xdb,0x52,0xaa,0x14,0xb2,0x96,0x38,0x2e,0x66,0x24,0xf0,0x48,0xcc,0xcc,0xb4,0x98,0x98,0x18,0xf8,0x20,0x30,0x70,0xe0,0xe0,0xe0,0xc0,0x80,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0x00,0x00,
+0x00,0x00,0x00,0x00,0x00,0x00,0x80,0x00,0xe0,0xc0,0xe0,0xc0,0xf8,0xf8,0xf8,0xf0,0xfd,0xfd,0xfc,0xfe,0xbe,0x7e,0xff,0x7f,0x1e,0x3e,0x3f,0x3f,0x0a,0x36,0x37,0x33,0x32,0x11,0x33,0x33,0x32,0x31,0x33,0x33,0x12,0x11,0x33,0x33,0x92,0x03,0x83,0x03,0xc1,0xe3,0xe0,0xc3,0xfc,0xfc,0xf0,0xf8,0xfc,0xf8,0xf8,0xfc,0x7c,0xf8,0x38,0x7c,0x38,0x18,0x18,0x1c,0x18,0x08,0x0c,0x18,0x1c,0x1c,0x1c,0x08,0x0c,0x18,0x08,0x1c,0x04,0x00,0x00,0x0c,0x00,0x00,0x03,0x01,0x00,0x04,0x03,0x02,0x00,0x01,0x00,0x00,0x07,0x03,0x03,0x03,0x01,0x03,0x00,0x00,0x05,0x03,0x03,0x03,0x53,0x23,0x40,0x23,0x30,0x78,0x70,0x78,0x3e,0x7e,0x7e,0x7c,0x3e,0x7f,0x7f,0x7e,0x3f,0x7f,0x7e,0x7f,0xfe,0x7a,0xf7,0xfb,0xf2,0xf9,0xf3,0xfb,0xf2,0xf9,0xf3,0xfb,0xfa,0xf9,0xf3,0xfb,0x5a,0x71,0x33,0x3b,0x02,0x13,0x03,0x03,0xc3,0xe0,0x83,0xc0,0xf0,0xe0,0xf8,0xf0,0xfa,0xfd,0xfe,0xfc,0x7e,0x7e,0x7f,0xff,0x3e,0x3e,0x7f,0x3f,0xf2,0x36,0x3b,0xf7,0xf9,0xf9,0xfa,0xf1,0xf8,0xfc,0xfc,0xf8,0xfe,0xfe,0xfc,0xfc,0xf2,0xa7,0xc2,0x06,0x02,0x03,0x03,0x03,0x03,0x02,0x01,0x01,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x01,0x03,0x00,0x00,0x86,0xf6,0xef,0x9f,0xfe,0xfe,0xff,0xff,0xfe,0xfe,0xff,0xff,0x7e,0xfe,0xff,0xff,0x31,0x71,0x36,0x38,0x18,0x30,0x10,0x18,0x08,0x1c,0x08,0x0c,0x06,0x04,0x0c,0x06,0x06,0x03,0x06,0x03,0x03,0x03,0x03,0x01,0x00,0x00,0x01,0x00,
+0xf8,0xfa,0xfa,0xf8,0x7b,0x7b,0x7b,0x7b,0x3b,0x3b,0x3b,0x3b,0x1b,0x1b,0x1b,0x1b,0x9b,0x99,0x99,0x9b,0x98,0x98,0x98,0x98,0x18,0x18,0x18,0x18,0x38,0x38,0x38,0x38,0x78,0x78,0x78,0x78,0xf8,0xf8,0xf8,0xf8,0x18,0x1a,0x1a,0x18,0x1b,0x1b,0x1b,0x1b,0x9b,0x9b,0x9b,0x9b,0x9b,0x9b,0x9b,0x9b,0x3a,0x38,0x3b,0x39,0x78,0x78,0x78,0x78,0xf8,0xf8,0xf8,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x98,0x98,0x98,0x98,0x98,0x98,0x98,0x98,0xf8,0xf8,0xf8,0xf8,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x38,0x38,0x38,0x38,0xfa,0xf8,0xf8,0xf8,0xfb,0xfa,0xfb,0xfb,0x1a,0x1a,0x1b,0x1b,0x1a,0x1b,0x1a,0x1b,0xfa,0xfb,0xfa,0xfb,0xfa,0xfb,0x1a,0x1b,0xfb,0xfb,0x3a,0x3b,0xfb,0xfb,0x7b,0x7b,0xc9,0xcb,0xcb,0xcb,0x8b,0x89,0x8b,0x89,0x19,0x19,0x18,0x18,0x38,0x3a,0x38,0x38,0x7b,0x7b,0x7a,0x7b,0x7b,0x7b,0x7b,0x7b,0x3b,0x3b,0x3b,0x3b,0x19,0x19,0x1b,0x1b,0x88,0x88,0x88,0x88,0xe8,0xe8,0xe8,0xe8,0x3a,0x3b,0x3a,0x39,0x1b,0x1b,0x1b,0x1b,0x0b,0x0b,0x0b,0x0b,0x8b,0x8b,0x8b,0x8b,0x8a,0x89,0x8a,0x8b,0x88,0x88,0x88,0x88,0x08,0x08,0x08,0x08,0x18,0x18,0x18,0x18,0x3a,0x38,0x38,0x38,0xf8,0xfb,0xfb,0xfa,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x0b,0x8b,0x8b,0x8b,0x8b,0x8a,0x88,0x89,0x88,0x88,0x88,0x88,0x88,0x08,0x08,0x08,0x08,0x18,0x18,0x18,0x18,0x38,0x38,0x38,0x38,0x78,0x78,0x78,0x78,0xf8,0xf8,0xf8,0xf8,0xf8,0xf8,0xf8,0xf8,
+0xff,0xff,0xff,0xff,0xf8,0xf8,0xb8,0xb8,0xf0,0xf0,0xb0,0xb0,0xe3,0xe3,0xa3,0xa3,0xe7,0xe7,0xa7,0xa7,0xe7,0xe7,0xa7,0xa7,0xe3,0xe3,0xa3,0xa3,0xf0,0xf0,0xb0,0xb0,0xf8,0xf8,0xb8,0xb8,0xff,0xff,0xbf,0xbf,0xe0,0xe0,0xa0,0xa0,0xe0,0xe0,0xa0,0xa0,0xf9,0xf9,0xb9,0xb9,0xf9,0xf9,0xb9,0xb9,0xfc,0xfc,0xbc,0xbc,0xfe,0xfe,0xbe,0xbe,0xff,0xff,0xbf,0xbf,0xe0,0xe0,0xa0,0xa0,0xe0,0xe0,0xa0,0xa0,0xe4,0xe4,0xa4,0xa4,0xe4,0xe4,0xa4,0xa4,0xff,0xff,0xbf,0xbf,0xe0,0xe0,0xa0,0xa0,0xe0,0xe0,0xa0,0xa0,0xfc,0xfc,0xbc,0xbc,0xf8,0xf8,0xb8,0xb8,0xf1,0xf1,0xb1,0xb1,0xe0,0xe0,0xa0,0xa0,0xe0,0xe0,0xa0,0xa0,0xff,0xff,0xff,0xff,0xff,0xff,0xc0,0xc0,0xff,0xff,0xe0,0xe0,0xff,0xff,0xf0,0xf0,0xbf,0xbf,0xb8,0xb8,0x8f,0x8f,0x8d,0x8d,0x87,0x87,0x87,0x87,0xc0,0xc0,0xc0,0xc0,0xf0,0xf0,0xf0,0xf0,0xe0,0xe0,0xe0,0xe0,0xc0,0xc0,0xc0,0xc0,0x87,0x87,0x87,0x87,0x9f,0x9f,0x9f,0x9f,0xbf,0xbf,0xbf,0xbf,0xfc,0xfc,0xfc,0xfc,0xf0,0xf0,0xf0,0xf0,0xb0,0xb0,0xb0,0xb0,0x93,0x93,0x93,0x93,0x83,0x83,0x83,0x83,0x83,0x83,0x83,0x83,0xc0,0xc0,0xc0,0xc0,0xf0,0xf0,0xf0,0xf0,0xfc,0xfc,0xfc,0xfc,0xff,0xff,0xff,0xff,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x8f,0x87,0x87,0x87,0x87,0xc0,0xc0,0xc0,0xc0,0xe0,0xe0,0xe0,0xe0,0xf0,0xf0,0xf0,0xf0,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,