7u83/stc_rpncalc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add shift down sign, change GUI keys, bump version

Browse Source
This commit is contained in:
Jeff Wang 2020-09-13 01:19:47 -04:00
parent d8d7f98663
commit 64754395be
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qt_gui/main.qml
View File

@ -136,7 +136,7 @@ ApplicationWindow
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font.pointSize: 16 font.pointSize: 16
color: "gray" color: "gray"
text: {"<br><br><br>" + getShiftedDownText(parent.parent.objectName, index)} text: {"<br><br>" + getShiftedDownText(parent.parent.objectName, index)}
textFormat: Text.RichText textFormat: Text.RichText
anchors.centerIn: parent anchors.centerIn: parent
} }
@ -168,7 +168,7 @@ ApplicationWindow
["Shift", "1/x", " √<span style=\"text-decoration: overline\">x</span> ", "CL<i>x</i>"], ["Shift", "1/x", " √<span style=\"text-decoration: overline\">x</span> ", "CL<i>x</i>"],
["y<sup>x</sup> ", "ln(x)", "log(x)", "π"], ["y<sup>x</sup> ", "ln(x)", "log(x)", "π"],
["R▼", "e<sup>x</sup>", "10<sup>x</sup>", ""], ["R▼", "e<sup>x</sup>", "10<sup>x</sup>", ""],
["sin", "cos", "tan", "►rad"], ["sin(x)", "cos(x)", "tan(x)", "►rad"],
["off", "STO", "RCL", "LAST<i>x</i>"] ["off", "STO", "RCL", "LAST<i>x</i>"]
] ]
@ -180,7 +180,7 @@ ApplicationWindow
["", "", "", ""], ["", "", "", ""],
["", "", "", ""], ["", "", "", ""],
["R▲", "", "", ""], ["R▲", "", "", ""],
["sin<sup>−1</sup>", "cos<sup>−1</sup>", "tan<sup>−1</sup>", "►deg"], ["asin(x)", "acos(x)", "atan(x)", "►deg"],
["", "", "", ""] ["", "", "", ""]
] ]

7
src/lcd.c
View File

@ -201,6 +201,13 @@ void LCD_Open(void) {
LCD_OutChar(0x10); LCD_OutChar(0x10);
LCD_OutChar(0x1c); 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 //clear display
LCD_Clear(); LCD_Clear();

1
src/lcd.h
View File

@ -38,6 +38,7 @@ void LCD_ClearToEnd(uint8_t curr_row);
//CGRAM character address //CGRAM character address
#define CGRAM_EXP 0 #define CGRAM_EXP 0
#define CGRAM_EXP_NEG 1 #define CGRAM_EXP_NEG 1
#define CGRAM_DOWN 2
#include "utils.h" #include "utils.h"
#ifdef DESKTOP #ifdef DESKTOP

2
src/lcd_emulator.c
View File

@ -131,6 +131,8 @@ short TERMIO_PutChar(unsigned char letter) {
lcd_buf[lcd_row][lcd_col] = 'E'; lcd_buf[lcd_row][lcd_col] = 'E';
} else if (letter == CGRAM_EXP_NEG) { } else if (letter == CGRAM_EXP_NEG) {
lcd_buf[lcd_row][lcd_col] = '-'; lcd_buf[lcd_row][lcd_col] = '-';
} else if (letter == CGRAM_DOWN) {
lcd_buf[lcd_row][lcd_col] = 'V';
} else { } else {
lcd_buf[lcd_row][lcd_col] = letter; lcd_buf[lcd_row][lcd_col] = letter;
} }

4
src/main.c
View File

@ -140,7 +140,7 @@ static void latch_on(void)
__xdata char EntryBuf[MAX_CHARS_PER_LINE + 1]; __xdata char EntryBuf[MAX_CHARS_PER_LINE + 1];
__xdata uint8_t ExpBuf[2]; __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 { enum {
@ -530,7 +530,7 @@ int main()
TERMIO_PutChar(' '); TERMIO_PutChar(' ');
#endif #endif
} else if (IsShiftedDown){ } else if (IsShiftedDown){
TERMIO_PutChar('v'); TERMIO_PutChar(CGRAM_DOWN);
} }
#ifdef DESKTOP #ifdef DESKTOP