Skip to content

Commit

Permalink
Merge branch 'MobiFlight:main' into wo_NameBuffer
Browse files Browse the repository at this point in the history
  • Loading branch information
elral authored Oct 11, 2023
2 parents 62b309c + 426f428 commit d59e252
Show file tree
Hide file tree
Showing 7 changed files with 683 additions and 6 deletions.
3 changes: 1 addition & 2 deletions _Boards/Atmel/Board_Nano/MFBoards.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#define MAX_BUTTONS 18
#endif
#ifndef MAX_LEDSEGMENTS
#define MAX_LEDSEGMENTS 1
#define MAX_LEDSEGMENTS 4
#endif
#ifndef MAX_ENCODERS
#define MAX_ENCODERS 9
Expand Down Expand Up @@ -91,7 +91,6 @@
#ifndef MF_MAX_DEVICEMEM
#define MF_MAX_DEVICEMEM 300 // max. memory size for devices
#endif

#endif

// MFBoards.h
2 changes: 1 addition & 1 deletion _Boards/Atmel/Board_ProMicro/MFBoards.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#define MAX_BUTTONS 18
#endif
#ifndef MAX_LEDSEGMENTS
#define MAX_LEDSEGMENTS 1
#define MAX_LEDSEGMENTS 4
#endif
#ifndef MAX_ENCODERS
#define MAX_ENCODERS 9
Expand Down
2 changes: 1 addition & 1 deletion _Boards/Atmel/Board_Uno/MFBoards.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#define MAX_BUTTONS 18
#endif
#ifndef MAX_LEDSEGMENTS
#define MAX_LEDSEGMENTS 1
#define MAX_LEDSEGMENTS 4
#endif
#ifndef MAX_ENCODERS
#define MAX_ENCODERS 9
Expand Down
2 changes: 1 addition & 1 deletion platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
; Common build settings across all devices
[env]
lib_deps =
https://github.com/MobiFlight/LedControl#1.1.0
;https://github.com/MobiFlight/LedControl#1.1.0
waspinator/AccelStepper @ 1.61
https://github.com/MobiFlight/LiquidCrystal_I2C#v1.1.4
https://github.com/MobiFlight/Arduino-CmdMessenger#4.2.1
Expand Down
Loading

0 comments on commit d59e252

Please sign in to comment.