preparing pre-release 0.219.27.13

df8oe · May 10, 2016 · 0e35681 · 0e35681
1 parent 3367809
commit 0e35681
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 25 deletions.
diff --git a/mchf-eclipse/README.md b/mchf-eclipse/README.md
diff --git a/mchf-eclipse/bootloader/src/main.c b/mchf-eclipse/bootloader/src/main.c
@@ -32,12 +32,12 @@ int main(void)
 
     double i,border;
 
-// *(__IO uint32_t*)(SRAM2_BASE+5) = 0x29;	// signature for DF8OE Beta-Testing
-// *(__IO uint32_t*)(SRAM2_BASE+10) = 0x29;	// signature for DG9BFC Beta-Testing
-    if( *(__IO uint32_t*)(SRAM2_BASE) != 0x55)
+// *(__IO uint32_t*)(SRAM2_BASE+5) = 0x29;	// signature for DF8OE development features
+// *(__IO uint32_t*)(SRAM2_BASE+10) = 0x29;	// signature for special beta-testing features
+    if( *(__IO uint32_t*)(SRAM2_BASE) != 0x55)		// reboot requested?
         border = 300000;
     else
-        border = 1000;
+        border = 1000;								// yes: only short delay so that power is hold
 
     for (i = 0; i < border; i++)
         ;

diff --git a/mchf-eclipse/drivers/ui/ui_driver.c b/mchf-eclipse/drivers/ui/ui_driver.c
@@ -7460,8 +7460,8 @@ void UiDriver_ShowStartUpScreen(ulong hold_time)
     UiLcdHy28_PrintText(110,80,tx,Grey3,Black,0);
 
     // Show fourth line
-    sprintf(tx,"Build on %s%s%s",__DATE__," at ",__TIME__);
-    UiLcdHy28_PrintText(35,100,tx,Yellow,Black,0);
+    sprintf(tx,"Build on %s%s%s%s",__DATE__," at ",__TIME__, " CEST");
+    UiLcdHy28_PrintText(15,100,tx,Yellow,Black,0);
 
     Read_EEPROM(EEPROM_FREQ_CONV_MODE, &i);  // get setting of frequency translation mode
 

diff --git a/mchf-eclipse/hardware/mchf_board.h b/mchf-eclipse/hardware/mchf_board.h
@@ -49,7 +49,7 @@
 #define 	TRX4M_VER_MINOR			219
 #define 	TRX4M_VER_RELEASE		27
 //
-#define 	TRX4M_VER_BUILD			12
+#define 	TRX4M_VER_BUILD			13
 //
 
 #define		ATTRIB_STRING1			"Additional Contributions by"

diff --git a/mchf-eclipse/history.txt b/mchf-eclipse/history.txt
@@ -13,7 +13,7 @@
 #########################################################################
 
 
-2016mmdd [DF8OE]
+20160510 [DF8OE]
 - bugfix: when in syncAM-mode now AM is reported instead of SSB
 - minor and major bugfixes regarding CW TX
 - swapped to actual CMSIS-Libs: improvements in many places to more acurate DSP functions

diff --git a/mchf-eclipse/version.txt b/mchf-eclipse/version.txt
@@ -1 +1 @@
-0.219.27.12
+0.219.27.13