Subversion Repositories svn.mios32

Compare Revisions

Ignore whitespace Rev 1936 → Rev 1937

/trunk/apps/processing/midibox_cv_v2/src/components/MbCvScope.h
65,10 → 65,17
void setUpdatePeriod(u32 period);
u32 getUpdatePeriod(void);
 
// display mapping
void setShowOnMainScreen(bool showOnMainScreen);
bool getShowOnMainScreen(void);
 
protected:
// display number
u8 displayNum;
 
// shows on main screen or alt screen?
bool showOnMainScreen;
 
// the display buffer
u8 displayBuffer[MBCV_SCOPE_DISPLAY_BUFFER_SIZE];
 
/trunk/apps/processing/midibox_cv_v2/src/components/MbCvScope.cpp
23,6 → 23,9
/////////////////////////////////////////////////////////////////////////////
MbCvScope::MbCvScope()
{
// changed from APP_Init()
// never re-initialized
showOnMainScreen = false;
}
 
 
201,18 → 204,22
 
{
MUTEX_LCD_TAKE;
APP_SelectScopeLCDs();
if( showOnMainScreen )
APP_SelectMainLCD();
else
APP_SelectScopeLCDs();
 
MIOS32_LCD_DeviceSet(displayNum);
MIOS32_LCD_GCursorSet(0, y);
MIOS32_LCD_BitmapPrint(bitmap);
 
APP_SelectMainLCD();
if( !showOnMainScreen )
APP_SelectMainLCD();
MUTEX_LCD_GIVE;
}
}
 
{
if( !showOnMainScreen ) {
MUTEX_LCD_TAKE;
APP_SelectScopeLCDs();
 
307,5 → 314,19
return source;
}
 
/////////////////////////////////////////////////////////////////////////////
// Display Mapping
/////////////////////////////////////////////////////////////////////////////
void MbCvScope::setShowOnMainScreen(bool _showOnMainScreen)
{
showOnMainScreen = _showOnMainScreen;
}
 
bool MbCvScope::getShowOnMainScreen(void)
{
return showOnMainScreen;
}
 
 
 
 
/trunk/apps/processing/midibox_cv_v2/src/mios32_config.h
12,7 → 12,7
 
// The boot message which is print during startup and returned on a SysEx query
#define MIOS32_LCD_BOOT_MSG_LINE1 "MIDIboxCV V2.000"
#define MIOS32_LCD_BOOT_MSG_LINE2 "(C) 2011 T.Klose"
#define MIOS32_LCD_BOOT_MSG_LINE2 "(C) 2014 T.Klose"
 
// define a unique VID/PID for this application
#define MIOS32_USB_PRODUCT_STR "MIDIboxCV"
/trunk/apps/processing/midibox_cv_v2/src/app.cpp
192,9 → 192,26
SCS_Init(0);
SCS_CONFIG_Init(0);
 
if( mios32_lcd_parameters.lcd_type == MIOS32_LCD_TYPE_GLCD_SSD1306 )
if( MIOS32_LCD_TypeIsGLCD() && mios32_lcd_parameters.height >= 64 ) {
SCS_LCD_OffsetYSet(6);
mbCvEnvironment.mbCvScope[0].setShowOnMainScreen(true);
 
// print warning message on alt screen, that it isn't used anymore!
APP_SelectScopeLCDs();
MIOS32_LCD_DeviceSet(0);
MIOS32_LCD_FontInit((u8 *)GLCD_FONT_SMALL);
MIOS32_LCD_CursorSet(0, 0);
MIOS32_LCD_PrintFormattedString("Display not used!");
MIOS32_LCD_CursorSet(0, 1);
MIOS32_LCD_PrintFormattedString("Content visible on main screen!");
MIOS32_LCD_CursorSet(0, 2);
MIOS32_LCD_PrintFormattedString("Try another CS line");
MIOS32_LCD_CursorSet(0, 3);
MIOS32_LCD_PrintFormattedString("to display other scopes!");
MIOS32_LCD_FontInit((u8 *)GLCD_FONT_NORMAL);
APP_SelectMainLCD();
}
 
TERMINAL_Init(0);
MIDIMON_Init(0);
MBCV_FILE_Init(0);
483,6 → 500,7
#endif
}
 
#if 0
// CV Bars (currently only for SSD1306)
{
MUTEX_LCD_TAKE;
503,6 → 521,7
 
MUTEX_LCD_GIVE;
}
#endif
}