Skip to content

Commit d75a4bd

Browse files
committed
corect fontH on SSD1306Ascii example
#134
1 parent 441f347 commit d75a4bd

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

examples/SSD1306Ascii/SSD1306Ascii/SSD1306Ascii.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ MENU(mainMenu,"Main menu",doNothing,noEvent,wrapStyle
102102
#define MAX_DEPTH 2
103103

104104
#define fontW 5
105-
#define fontH 7
105+
#define fontH 8
106106

107107
//describing a menu output device without macros
108108
//define at least one panel for menu output

examples/Serial/serialio/platformio.ini

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ src_dir=serialio
3535
; framework = arduino
3636
; build_flags = -DNODEBUG
3737
;
38-
; [env:nanoatmega328]
39-
; platform = atmelavr
40-
; board = nanoatmega328
41-
; framework = arduino
42-
; upload_port=/dev/ttyUSB*
43-
; upload_flags=-V
44-
; build_flags = -DNODEBUG
38+
[env:nanoatmega328]
39+
platform = atmelavr
40+
board = nanoatmega328
41+
framework = arduino
42+
upload_port=/dev/ttyUSB*
43+
upload_flags=-V
44+
build_flags = -DNODEBUG
4545
;
4646
; [env:teensy31]
4747
; platform = teensy
@@ -73,8 +73,8 @@ src_dir=serialio
7373
; board = uno
7474
; framework = arduino
7575
;
76-
[env:redbear_blenano2]
77-
platform = nordicnrf52
78-
board = redbear_blenano2
79-
framework = arduino
80-
build_flags =-DNODEBUG -DARDUINO=10805
76+
; [env:redbear_blenano2]
77+
; platform = nordicnrf52
78+
; board = redbear_blenano2
79+
; framework = arduino
80+
; build_flags =-DNODEBUG -DARDUINO=10805

src/macros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ Menu::outputsList id(id##_outPtrs,sizeof(id##_outPtrs)/sizeof(Menu::menuOut*));
257257
#define DECL_FIELD_(cnt,objType,ss,target,text,units,low,high,step,tune,action,mask,style)\
258258
constText fieldLabel##cnt[] MEMMODE=text;\
259259
constText fieldUnit##cnt[] MEMMODE=units;\
260-
constMEM MEMMODE Menu::menuFieldShadowRaw<typeof(target)> fieldShadowRaw##cnt={\
260+
constMEM MEMMODE Menu::menuFieldShadowRaw<decltype(target)> fieldShadowRaw##cnt={\
261261
(Menu::callback)action,\
262262
ss,\
263263
fieldLabel##cnt,\

src/menuIO/UCGLibOut.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ namespace Menu {
4343
this->offsetY=offsetY;
4444
}
4545

46-
size_t write(uint8_t ch) override {gfx.write(ch);}
46+
size_t write(uint8_t ch) override {return gfx.write(ch);}
4747

4848
inline rgb getColor(colorDefs color=bgColor,bool selected=false,status stat=enabledStatus,bool edit=false) const {
4949
rgb* cor=(rgb*)&(stat==enabledStatus?colors[color].enabled[selected+edit]:colors[color].disabled[selected]);

0 commit comments

Comments
 (0)