Aux memory section redefined.

Max screens changed to 6. 6 positions in extra menu unlocked. Allocation tests for Yenya
qba667 · Nov 22, 2017 · 5ace7c1 · 5ace7c1 · Yenya · Nov 22, 2017
1 parent 24f1cf6
commit 5ace7c1
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 15 deletions.
diff --git a/source/MKL16Z64xxx4_flash.ld b/source/MKL16Z64xxx4_flash.ld
@@ -122,12 +122,12 @@ SECTIONS
     *(.mod_timerValue);
     *(.mod_ticks100ms);
     *(.mod_lastTimerUpdate);
-    *(.altconstVal);
-	*(.altconstVal);
-	*(.altinitPressure);
-	*(.altinitPressureRaw);
+    *(.mod_altconstVal);
+	*(.mod_altinitPressure);
+	*(.mod_altinitPressureRaw);
+	*(.mod_auxMem*)
     KEEP(*(.AUX_MEM))
-  } > m_data
+  } > data
 
 
   .mod_FLASH_25C8 0x25C8 :
@@ -237,7 +237,16 @@ SECTIONS
   {
 	*(.reserved_after_eeprom);
   }
-
+
+  .mod_freeSpaceAFHDSLogo 0xD50C :
+  {
+	*(.mod_yenyaSpace*);
+  }
+  .reserved_after_AFHDSLogo 0xD5F8 :
+  {
+	*(.reserved_after_AFHDSLogo);
+  }
+
  . = ALIGN(4);
 
   .mod_MOD_ALARMS 0xE140 : 

diff --git a/source/build/org.bin b/source/build/org.bin
diff --git a/source/source/alt.c b/source/source/alt.c
@@ -382,7 +382,7 @@ int getSWState(uint32_t swIndex){
 
 /*Belongs to .mod_modMenu 0xFFA0 */
 void displayMenu(){
-	showNavPage((const char*) extraMenu, 5, (manuEntry*)menuList);
+	showNavPage((const char*) extraMenu, 6, (manuEntry*)menuList);
 }
 
 void BatteryType() {
@@ -392,8 +392,8 @@ void BatteryType() {
 		while (1) {
 			callSetupDMAandSend();
 			if(batteryVolt > 900) batteryVolt = 0;
-			displayPageHeader((char*)0xFFA8);
-			displayTextAt((char*)0xFF98, 8, 24,0);
+			displayPageHeader((char*)&txBat);
+			displayTextAt((char*)&alarm, 8, 24,0);
 			formatSensorValue(buffer, IBUS_MEAS_TYPE_INTV, batteryVolt);
 			displayTextAt((char*)buffer, 8, 32,0);
 			LCD_updateCALL();
@@ -907,6 +907,23 @@ void displaySensors(){
 
 }
 
+void testMethod(){
+	char buffer[32];
+	allocationTest = 100;
+	uint32_t key = 0;
+	while ( 1 )
+	{
+		callSetupDMAandSend();
+		displayPageHeader((char*)alarm);
+		LCD_updateCALL();
+		key = getKeyCode();
+		if (key == KEY_LONG_CANCEL)
+		{
+			break;
+		}
+	}
+}
+
 uint32_t mulu16(uint32_t x, uint32_t y)
 {
 	uint32_t a = x >> 16;

diff --git a/source/source/alt.h b/source/source/alt.h
@@ -113,16 +113,19 @@ __attribute__((section (".mod_parseAC"))) void acData(uint8_t* rxBuffer);
  __attribute__((section (".mod_swBHandling"))) void swBasADC();
 __attribute__((section (".mod_loadModEeprom"))) void loadModSettings();
 __attribute__((section (".mod_saveModEeprom"))) void saveModSettings();
+__attribute__((section (".mod_yenyaSpace"))) void testMethod();
+
 
 __attribute__((section (".mod_displaySensors"))) void displaySensors();
 __attribute__((section (".mod_getSensorName"))) const uint8_t* getSensorName(int sensor);
 __attribute__((section (".mod_formatSensorValue"))) void formatSensorValue(char* target, int sensorID, uint16_t sensorValue);
 __attribute__((section (".mod_divMod"))) uint32_t divMod(uint32_t val, uint32_t divisor, uint32_t* mod);
 __attribute__((section (".mod_parseCoord"))) void parseCoord(uint32_t *deg, uint32_t *min, uint32_t *sec, uint32_t *subSec, uint32_t coord);
 
-__attribute__((section (".altconstVal"))) uint32_t constVal = 0;
-__attribute__((section (".altinitPressure"))) uint32_t initPressure = 0;
-__attribute__((section (".altinitPressureRaw"))) uint32_t initPressureRaw = 0;
+__attribute__((section (".mod_altconstVal"))) uint32_t constVal = 0;
+__attribute__((section (".mod_altinitPressure"))) uint32_t initPressure = 0;
+__attribute__((section (".mod_altinitPressureRaw"))) uint32_t initPressureRaw = 0;
+__attribute__((section (".mod_auxMem_test1"))) uint32_t allocationTest = 0;
 
 
 
@@ -138,6 +141,7 @@ __attribute__((section (".reserved_after_ac_sensor")))  uint32_t keep3 = 0;
 __attribute__((section (".reserved_after_set_ch_val"))) uint32_t keep4 = 0;
 __attribute__((section (".reserved_afterSwB_adac"))) uint32_t keep5 = 0;
 __attribute__((section (".reserved_after_free_space_in_display"))) uint32_t keep6 = 0;
+__attribute__((section (".reserved_after_AFHDSLogo"))) uint32_t keep7 = 0;
 __attribute__((section (".reserved_after_free_space_in_display"))) uint16_t keepChecksum = 0;
 
 

diff --git a/source/source/ibustelemetry.h b/source/source/ibustelemetry.h
@@ -46,7 +46,7 @@
 #define IBUS_MEAS_TYPE_GPS_LON			0x81 //4bytes signed WGS84 in degrees * 1E7
 #define IBUS_MEAS_TYPE_GPS_ALT			0x82 //4bytes signed!!! GPS alt m*100
 #define IBUS_MEAS_TYPE_ALT				0x83 //4bytes signed!!! Alt m*100
-#define IBUS_MEAS_TYPE_ALT_MAX				0x84 //4bytes signed MaxAlt m*100
+#define IBUS_MEAS_TYPE_ALT_MAX			0x84 //4bytes signed MaxAlt m*100
 #define IBUS_MEAS_TYPE_S85				0x85
 #define IBUS_MEAS_TYPE_S86				0x86
 #define IBUS_MEAS_TYPE_S87				0x87

diff --git a/source/source/main.c b/source/source/main.c
@@ -109,6 +109,8 @@ int main(void) {
   if(keep4==0){keep4++;}
   if(keep5==0){keep5++;}
   if(keep6==0){keep6++;}
+  if(keep7==0){keep7++;}
+
   if(keepChecksum == 0){keepChecksum++;}
   //keep this one because of without usage signature block will be removed
   if(SIGNATURE[0] == 1){

diff --git a/source/source/mod.h b/source/source/mod.h
@@ -168,7 +168,17 @@ const uint8_t __attribute__((section (".mod_sensorsScreens"))) sensorsScreens[]
 	IBUS_MEAS_TYPE_GROUND_SPEED,
 	IBUS_MEAS_TYPE_VERTICAL_SPEED,
 	IBUS_MEAS_TYPE_CLIMB_RATE,
-	IBUS_MEAS_TYPE_RPM
+	IBUS_MEAS_TYPE_RPM,
+
+	IBUS_MEAS_TYPE_ALT_MAX,
+	IBUS_MEAS_TYPE_S85,
+	IBUS_MEAS_TYPE_S86,
+	IBUS_MEAS_TYPE_S87,
+	IBUS_MEAS_TYPE_S88,
+	IBUS_MEAS_TYPE_S89,
+	IBUS_MEAS_TYPE_S8a,
+	IBUS_MEAS_TYPE_UNKNOWN
+
 };
 const uint8_t __attribute__((section (".mod_timerFormat"))) timerFormat[] = {
 		'%', '0', '2', 'u', ':', '%', '0', '2', 'u', ':', '%', '0', '2', 'u',  0x00
@@ -195,7 +205,7 @@ const uint32_t __attribute__((section (".mod_modMenuList"))) menuList[] = {
 	SW_B_C, (uint32_t)(&SwBConfig+1), 
 	(uint32_t)&txBat, (uint32_t)(&BatteryType+1), 
 	AUX_CH_TEXT, (uint32_t)(&auxChannels2+1),
-	(uint32_t)&altSensor, (uint32_t)(&displayMenu+1), 
+	(uint32_t)&altSensor, (uint32_t)(&testMethod+1), 
 };