auto-sync

firmware/config/engines/dodge_neon.cpp

@@ -370,12 +370,7 @@ void setDodgeNeonNGCEngineConfiguration(engine_configuration_s *engineConfigurat
 	boardConfiguration->tunerStudioSerialSpeed = 9600;
 	engineConfiguration->algorithm = LM_SPEED_DENSITY;
 
-	engineConfiguration->isJoystickEnabled = true;
-	boardConfiguration->joystickCenterPin = GPIOD_10;
-	boardConfiguration->joystickAPin = GPIOD_8;
-	boardConfiguration->joystickBPin = GPIO_UNASSIGNED;
-	boardConfiguration->joystickCPin = GPIOD_9;
-	boardConfiguration->joystickDPin = GPIOD_11;
+	setFrankenso0_1_joystick(engineConfiguration);
 
 //	engineConfiguration->isCanEnabled = true;
 	boardConfiguration->canTxPin = GPIOB_6;

firmware/controllers/algo/auto_generated_enums.cpp

@@ -161,12 +161,6 @@ case SPI_CS_HIP9011:
   return "SPI_CS_HIP9011";
 case SPI_CS_SD_MODULE:
   return "SPI_CS_SD_MODULE";
-case TRIGGER_EMULATOR_3RD:
-  return "TRIGGER_EMULATOR_3RD";
-case TRIGGER_EMULATOR_PRIMARY:
-  return "TRIGGER_EMULATOR_PRIMARY";
-case TRIGGER_EMULATOR_SECONDARY:
-  return "TRIGGER_EMULATOR_SECONDARY";
   }
  return NULL;
 }

firmware/controllers/algo/engine_configuration.cpp

@@ -736,6 +736,16 @@ void commonFrankensoAnalogInputs(engine_configuration_s *engineConfiguration) {
 	engineConfiguration->bc.adcHwChannelEnabled[14] = ADC_SLOW;
 }
 
+void setFrankenso0_1_joystick(engine_configuration_s *engineConfiguration) {
+	engineConfiguration->isJoystickEnabled = true;
+	board_configuration_s *boardConfiguration = &engineConfiguration->bc;
+	boardConfiguration->joystickCenterPin = GPIOC_8;
+	boardConfiguration->joystickAPin = GPIOD_10;
+	boardConfiguration->joystickBPin = GPIO_UNASSIGNED;
+	boardConfiguration->joystickCPin = GPIOD_9;
+	boardConfiguration->joystickDPin = GPIOD_11;
+}
+
 void copyFuelTable(fuel_table_t const source, fuel_table_t destination) {
 	for (int k = 0; k < FUEL_LOAD_COUNT; k++) {
 		for (int r = 0; r < FUEL_RPM_COUNT; r++) {

firmware/controllers/algo/engine_configuration.h

@@ -639,6 +639,7 @@ void incrementGlobalConfigurationVersion(void);
 int getGlobalConfigurationVersion(void);
 
 void commonFrankensoAnalogInputs(engine_configuration_s *engineConfiguration);
+void setFrankenso0_1_joystick(engine_configuration_s *engineConfiguration);
 
 #ifdef __cplusplus
 }

firmware/controllers/algo/io_pins.h

@@ -63,10 +63,6 @@ typedef enum {
 
 	IO_INVALID,
 
-	TRIGGER_EMULATOR_PRIMARY,
-	TRIGGER_EMULATOR_SECONDARY,
-	TRIGGER_EMULATOR_3RD,
-
 	ELECTRONIC_THROTTLE_CONTROL_1,
 	ELECTRONIC_THROTTLE_CONTROL_2,
 	ELECTRONIC_THROTTLE_CONTROL_3,

firmware/controllers/lcd_controller.cpp

@@ -33,33 +33,38 @@ static MenuItem miTrigger(tree.root, "trigger");
 static MenuItem miBench(tree.root, "bench test");
 static MenuItem miAbout(tree.root, "about");
 
-static MenuItem miTestFan(&miAbout, "test fan");
-static MenuItem miTestFuelPump(&miAbout, "test pump");
-static MenuItem miTestSpark1(&miAbout, "test spark1");
-static MenuItem miTestSpark2(&miAbout, "test spark2");
-static MenuItem miTestSpark3(&miAbout, "test spark3");
-static MenuItem miTestSpark4(&miAbout, "test spark4");
-static MenuItem miTestInj1(&miAbout, "test injector1");
-static MenuItem miTestInj2(&miAbout, "test injector2");
-static MenuItem miTestInj3(&miAbout, "test injector3");
-static MenuItem miTestInj4(&miAbout, "test injector4");
+static MenuItem miClt(&miSensors, LL_CLT_TEMPERATURE);
+static MenuItem miIat(&miSensors, LL_IAT_TEMPERATURE);
+
+static MenuItem miTestFan(&miBench, "test fan");
+static MenuItem miTestFuelPump(&miBench, "test pump");
+static MenuItem miTestSpark1(&miBench, "test spark1");
+static MenuItem miTestSpark2(&miBench, "test spark2");
+static MenuItem miTestSpark3(&miBench, "test spark3");
+static MenuItem miTestSpark4(&miBench, "test spark4");
+static MenuItem miTestInj1(&miBench, "test injector1");
+static MenuItem miTestInj2(&miBench, "test injector2");
+static MenuItem miTestInj3(&miBench, "test injector3");
+static MenuItem miTestInj4(&miBench, "test injector4");
 
 static MenuItem miVersion(&miAbout, LL_VERSION);
 static MenuItem miConfig(&miAbout, LL_CONFIG);
+//static MenuItem miAlgo(&miAbout, LL_ALGORITHM);
 
 #define DISP_LINES (engineConfiguration->HD44780height - 1)
 
-static int infoIndex = 0;
-static int cursorY = 0;
-
 void onJoystick(joystick_button_e button) {
-	if (cursorY == TOTAL_OPTIONS - 1) {
-		cursorY = infoIndex = 0;
-	} else {
-		cursorY++;
-		if (cursorY - DISP_LINES >= infoIndex)
-			infoIndex++;
+	/**
+	 * this method is invoked on EXTI IRQ thread
+	 */
+	if (button == JB_CENTER) {
+		tree.enterSubMenu();
+	} else if (button == JB_BUTTON_D) {
+		tree.nextItem();
+	} else if (button == JB_BUTTON_A) {
+		tree.back();
 	}
+	// actual repaint happends in the repaint loop
 }
 
 char * appendStr(char *ptr, const char *suffix) {
@@ -207,7 +212,7 @@ void updateHD44780lcd(Engine *engine) {
 		p = p->next;
 	}
 
-	for(; count < tree.linesCount && p != NULL; count++) {
+	for (; count < tree.linesCount; count++) {
 		lcd_HD44780_set_position(count, 0);
 		for (int r = 0; r < 20; r++) {
 			lcd_HD44780_print_char(' ');

firmware/development/trigger_emulator.cpp

@@ -26,6 +26,8 @@ extern PwmConfig triggerSignal;
 
 extern OutputPin outputs[IO_PIN_COUNT];
 
+static OutputPin emulatorOutputs[3];
+
 void initTriggerEmulator(Engine *engine) {
 
 	engine_configuration_s *engineConfiguration = engine->engineConfiguration;
@@ -34,9 +36,9 @@ void initTriggerEmulator(Engine *engine) {
 #if EFI_EMULATE_POSITION_SENSORS || defined(__DOXYGEN__)
 	print("Emulating %s\r\n", getConfigurationName(engineConfiguration->engineType));
 
-	triggerSignal.outputPins[0] = &outputs[(int)TRIGGER_EMULATOR_PRIMARY];
-	triggerSignal.outputPins[1] = &outputs[(int)TRIGGER_EMULATOR_SECONDARY];
-	triggerSignal.outputPins[2] = &outputs[(int)TRIGGER_EMULATOR_3RD];
+	triggerSignal.outputPins[0] = &emulatorOutputs[0];
+	triggerSignal.outputPins[1] = &emulatorOutputs[1];
+	triggerSignal.outputPins[2] = &emulatorOutputs[2];
 
 #if EFI_PROD_CODE
 	// todo: refactor, make this a loop

firmware/iar/ch.ewp

@@ -2598,7 +2598,7 @@
     <group>
       <name>lcd</name>
       <file>
-        <name>$PROJ_DIR$\..\hw_layer\lcd\lcd_HD44780.c</name>
+        <name>$PROJ_DIR$\..\hw_layer\lcd\lcd_HD44780.cpp</name>
       </file>
       <file>
         <name>$PROJ_DIR$\..\hw_layer\lcd\lcd_HD44780.h</name>