perMain() moved into main_avr.cpp and main_arm.cpp

2014-12-07 09:58:46 +01:00
parent e55b7504c3
commit afedd86fae
11 changed files with 340 additions and 261 deletions
@@ -2204,135 +2204,6 @@ void checkBattery()

 }

-#if !defined(CPUARM)
-void perMain()
-{
-#if defined(SIMU)
-  doMixerCalculations();
-#endif
-  uint16_t t0 = getTmr16KHz();
-  int16_t delta = (nextMixerEndTime - lastMixerDuration) - t0;
-  if (delta > 0 && delta < MAX_MIXER_DELTA) {
-#if defined(PCBSTD) && defined(ROTARY_ENCODER_NAVIGATION)
-    rotencPoll();
-#endif
-
-    // @@@ open.20.fsguruh
-    // SLEEP();   // wouldn't that make sense? should save a lot of battery power!!!
-/*  for future use; currently very very beta...  */
-#if defined(POWER_SAVE)
-    ADCSRA&=0x7F;   // disable ADC for power saving
-    ACSR&=0xF7;   // disable ACIE Interrupts
-    ACSR|=0x80;   // disable Analog Comparator
-    // maybe we disable here a lot more hardware components in future to save even more power
-
-
-
-    MCUCR|=0x20;  // enable Sleep (bit5)
-    // MCUCR|=0x28;  // enable Sleep (bit5) enable ADC Noise Reduction (bit3)
-    // first tests showed: simple sleep would reduce cpu current from 40.5mA to 32.0mA
-    //                     noise reduction sleep would reduce it down to 28.5mA; However this would break pulses in theory
-    // however with standard module, it will need about 95mA. Therefore the drop to 88mA is not much noticable
-    do {
-      asm volatile(" sleep        \n\t");  // if _SLEEP() is not defined use this
-      t0=getTmr16KHz();
-      delta= (nextMixerEndTime - lastMixerDuration) - t0;
-    } while ((delta>0) && (delta<MAX_MIXER_DELTA));
-    
-    // reenabling of the hardware components needed here
-    MCUCR&=0x00;  // disable sleep
-    ADCSRA|=0x80;  // enable ADC
-#endif
-    return;
-  }  
-
-  nextMixerEndTime = t0 + MAX_MIXER_DELTA;
-  // this is a very tricky implementation; lastMixerEndTime is just like a default value not to stop mixcalculations totally;
-  // the real value for lastMixerEndTime is calculated inside pulses_XXX.cpp which aligns the timestamp to the pulses generated
-  // nextMixerEndTime is actually defined inside pulses_XXX.h  
-
-  doMixerCalculations();
-
-  t0 = getTmr16KHz() - t0;
-  lastMixerDuration = t0;
-  if (t0 > maxMixerDuration) maxMixerDuration = t0;
-
-#if defined(MODULE_ALWAYS_SEND_PULSES)
-  if (startupWarningState < STARTUP_WARNING_DONE) {
-    // don't do menu's until throttle and switch warnings are handled
-    return;
-  }
-#endif
-
-  if (!eeprom_buffer_size) {
-    if (theFile.isWriting())
-      theFile.nextWriteStep();
-    else if (TIME_TO_WRITE())
-      eeCheck(false);
-  }
-
-#if defined(SDCARD)
-  sdMountPoll();
-  writeLogs();
-#endif
-
-  uint8_t evt = getEvent();
-  evt = checkTrim(evt);
-
-  if (evt && (g_eeGeneral.backlightMode & e_backlight_mode_keys)) backlightOn(); // on keypress turn the light on
-  checkBacklight();
-
-#if (defined(FRSKY) || defined(MAVLINK))
-  telemetryWakeup();
-#endif
-
-#if defined(NAVIGATION_STICKS)
-  uint8_t sticks_evt = getSticksNavigationEvent();
-  if (sticks_evt) evt = sticks_evt;
-#endif
-
-  const char *warn = s_warning;
-  uint8_t menu = s_menu_count;
-
-  lcd_clear();
-  if (menuEvent) {
-    m_posVert = menuEvent == EVT_ENTRY_UP ? g_menuPos[g_menuStackPtr] : 0;
-    m_posHorz = 0;
-    evt = menuEvent;
-    menuEvent = 0;
-    AUDIO_MENUS();
-  }
-  g_menuStack[g_menuStackPtr]((warn || menu) ? 0 : evt);
-
-
-  if (warn) DISPLAY_WARNING(evt);
-#if defined(NAVIGATION_MENUS)
-  if (menu) {
-    const char * result = displayMenu(evt);
-    if (result) {
-      menuHandler(result);
-      putEvent(EVT_MENU_UP);
-    }
-  }
-#endif
-
-  drawStatusLine();
-
-  lcdRefresh();
-
-  if (SLAVE_MODE()) {
-    JACK_PPM_OUT();
-  }
-  else {
-    JACK_PPM_IN();
-  }
-
-  checkBattery();
-}
-#endif   // #if !defined(CPUARM)
-
-
-
 int16_t g_ppmIns[NUM_TRAINER];
 uint8_t ppmInState = 0; // 0=unsync 1..8= wait for value i-1
 uint8_t ppmInValid = 0;