diff --git a/qt_gui/main.qml b/qt_gui/main.qml index 98374b3..3e5936c 100644 --- a/qt_gui/main.qml +++ b/qt_gui/main.qml @@ -136,7 +136,7 @@ ApplicationWindow horizontalAlignment: Text.AlignHCenter font.pointSize: 16 color: "gray" - text: {"


" + getShiftedDownText(parent.parent.objectName, index)} + text: {"

" + getShiftedDownText(parent.parent.objectName, index)} textFormat: Text.RichText anchors.centerIn: parent } @@ -168,7 +168,7 @@ ApplicationWindow ["Shift", "1/x", " √x ", "CLx"], ["yx ", "ln(x)", "log(x)", "π"], ["R▼", "ex", "10x", ""], - ["sin", "cos", "tan", "►rad"], + ["sin(x)", "cos(x)", "tan(x)", "►rad"], ["off", "STO", "RCL", "LASTx"] ] @@ -180,7 +180,7 @@ ApplicationWindow ["", "", "", ""], ["", "", "", ""], ["R▲", "", "", ""], - ["sin−1", "cos−1", "tan−1", "►deg"], + ["asin(x)", "acos(x)", "atan(x)", "►deg"], ["", "", "", ""] ] diff --git a/src/lcd.c b/src/lcd.c index c6319b6..278df08 100644 --- a/src/lcd.c +++ b/src/lcd.c @@ -201,6 +201,13 @@ void LCD_Open(void) { LCD_OutChar(0x10); LCD_OutChar(0x1c); } + //program shift down sign + for (i = 0; i < 5; i++){ + LCD_OutChar(0x0); + } + LCD_OutChar(0x1F); + LCD_OutChar(0x0E); + LCD_OutChar(0x04); //clear display LCD_Clear(); diff --git a/src/lcd.h b/src/lcd.h index 57d7254..6eb8965 100644 --- a/src/lcd.h +++ b/src/lcd.h @@ -38,6 +38,7 @@ void LCD_ClearToEnd(uint8_t curr_row); //CGRAM character address #define CGRAM_EXP 0 #define CGRAM_EXP_NEG 1 +#define CGRAM_DOWN 2 #include "utils.h" #ifdef DESKTOP diff --git a/src/lcd_emulator.c b/src/lcd_emulator.c index 1b05520..a9bf642 100644 --- a/src/lcd_emulator.c +++ b/src/lcd_emulator.c @@ -131,6 +131,8 @@ short TERMIO_PutChar(unsigned char letter) { lcd_buf[lcd_row][lcd_col] = 'E'; } else if (letter == CGRAM_EXP_NEG) { lcd_buf[lcd_row][lcd_col] = '-'; + } else if (letter == CGRAM_DOWN) { + lcd_buf[lcd_row][lcd_col] = 'V'; } else { lcd_buf[lcd_row][lcd_col] = letter; } diff --git a/src/main.c b/src/main.c index e85502c..2840d6f 100644 --- a/src/main.c +++ b/src/main.c @@ -140,7 +140,7 @@ static void latch_on(void) __xdata char EntryBuf[MAX_CHARS_PER_LINE + 1]; __xdata uint8_t ExpBuf[2]; -__code const char VER_STR[32+1] = "STC RPN Calculator v1.10"; +__code const char VER_STR[32+1] = "STC RPN Calculator v1.11"; enum { @@ -530,7 +530,7 @@ int main() TERMIO_PutChar(' '); #endif } else if (IsShiftedDown){ - TERMIO_PutChar('v'); + TERMIO_PutChar(CGRAM_DOWN); } #ifdef DESKTOP