Skip to content

Commit 0505291

Browse files
committed
removing streaming dependency
1 parent e4e7e33 commit 0505291

File tree

5 files changed

+5
-40
lines changed

5 files changed

+5
-40
lines changed

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,15 +208,14 @@ Web browser (experimental) when using ESP devices
208208
## Dependencies
209209
This library depends on the following libraries:
210210
211-
- Streaming https://github.com/scottdky/Streaming (on debug mode)
212-
- Assert4a https://github.com/nettigo/Assert4a (on debug mode)
211+
- streamFlow https://github.com/neu-rah/streamFlow (on debug mode)
213212
214213
Depending on the type of input or output, other libraries might be needed. Essentially any library needed for your devices.
215214
216215
## Limits
217216
218217
- when using macros the menu is limited to 16 options (current macro limnit).
219-
- menus **must** have at least 2 options.
218+
- menus **must** have at least 2 options when built using macros.
220219
- maximum 127 options.
221220
- fast access (numeric keys) only supports 9 options (1 to 9)
222221
- prompts can overflow on panels with less than 4 characters width
@@ -255,7 +254,7 @@ multiple stream packing for input to mix encoder stream with encoder keyboard (u
255254
- More examples
256255
- Text edit fields with validation *
257256
- Pad style menus (horizontal list)
258-
- inline pad menus can input custom formats like IP/Date/Time, experimental and just for devices that can position a cursor
257+
- inline pad menus can input custom formats like IP/Date/Time, experimental and just for devices that can position a cursor
259258
- Plugins, alternative menu items potentially device specific
260259
- Allow multiple concurrent menus
261260
- Support UCGLib displays

examples/Serial/serialio/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ board = nanoatmega328
1717
framework = arduino
1818
upload_port=/dev/ttyUSB*
1919
upload_flags=-V
20-
build_flags = -Wno-comment -Wno-reorder -Wno-strict-aliasing -Wno-builtin-macro-redefined -DDEBUG
20+
build_flags = -Wno-comment -Wno-reorder -Wno-strict-aliasing -Wno-builtin-macro-redefined -DNODEBUG
2121

2222
; [env:teensy31]
2323
; platform = teensy

src/menu.h

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,11 @@ for correcting unsigned values validation
1818
#ifndef RSITE_ARDUINO_MENU_SYSTEM
1919
#define RSITE_ARDUINO_MENU_SYSTEM
2020
#include <Arduino.h>
21-
#if defined(DEBUG) //!defined(ArduinoStream_h)
22-
//#include <Streaming.h>
21+
#if defined(DEBUG)
2322
#include <streamFlow.h>
2423
#endif
2524
#include "menuBase.h"
2625
#include "shadows.h"
27-
//#include "dyn.h"
2826

2927
#if defined(DEBUG) && defined(TRACE)
3028
#define trace(x) x
@@ -42,20 +40,6 @@ for correcting unsigned values validation
4240
static constMEM char* numericChars="0123456789.";
4341

4442
#define _MAX(a,b) (((a)>(b))?(a):(b))
45-
//#if defined(ESP8266)
46-
//#if !defined(endl)
47-
// #if !defined(ARDUINO_STREAMING) || !defined(ArduinoStream_h)
48-
// #define endl "\r\n"
49-
// #endif
50-
// Streams
51-
//////////////////////////////////////////////////////////////////////////
52-
#ifdef DEBUG
53-
//template<typename T> inline Print& operator<<(Print& o, T t) {o.print(t);return o;}
54-
Print& operator<<(Print& o,prompt const &p);
55-
inline String& operator<<(String &s,prompt &p);
56-
//template<typename T> HardwareSerial& operator<<(HardwareSerial& o,T t) {o.print(t);return o;}
57-
//template<typename T> inline menuOut& operator<<(menuOut& o,const T x) {return o.operator<<(x);}
58-
#endif
5943

6044
// Menu objects and data
6145
//////////////////////////////////////////////////////////////////////////

src/menuBase.cpp

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,6 @@ idx_t Menu::print_P(Print& s,const char* at,idx_t len) {
3030
return at-p-1;
3131
}
3232

33-
/*static const char* cmdNames[] MEMMODE={"noCmd","escCmd","enterCmd","upCmd","downCmd","leftCmd","rightCmd","idxCmd","selCmd","scrlUpCmd","scrlDownCmd"};
34-
navCmds Menu::getCmd(String &name) {
35-
for(int n=0;n<sizeof(cmdNames)/sizeof(char*);n++)
36-
if (name==cmdNames[n]) return (navCmds)n;
37-
return noCmd;
38-
}*/
39-
40-
#ifdef DEBUG
41-
Print& Menu::operator<<(Print& o,prompt const &p) {
42-
print_P(o,p.getText());
43-
return o;
44-
}
45-
#endif
46-
4733
const navCodesDef Menu::defaultNavCodes={
4834
{noCmd,(char)0xff},
4935
{escCmd,'/'},

src/menuBase.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ www.r-site.net
2222
#endif
2323

2424
#include <Arduino.h>
25-
//#include <Streaming.h>//https://github.com/scottdky/Streaming
26-
#ifndef ARDUINO_SAM_DUE
27-
//#include <Assert4a.h> //https://github.com/nettigo/Assert4a
28-
#endif
2925
#define assert(x)
3026
#include "macros.h"
3127

0 commit comments

Comments
 (0)