Skip to content

Commit 76f5026

Browse files
davetccdavetcc
committed
ready examples for release
1 parent d964558 commit 76f5026

File tree

7 files changed

+40
-21
lines changed

7 files changed

+40
-21
lines changed

‎examples/arduino32/simpleU8g2/simpleU8g2.emf‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
{
77
"parentId": 0,
88
"type": "analogItem",
9+
"defaultValue": "0",
910
"item": {
1011
"maxValue": 10,
1112
"offset": 0,
1213
"divisor": 1,
1314
"unitName": "",
15+
"step": 1,
1416
"name": "Toaster power",
1517
"variableName": "",
1618
"id": 1,
@@ -23,6 +25,7 @@
2325
{
2426
"parentId": 0,
2527
"type": "enumItem",
28+
"defaultValue": "0",
2629
"item": {
2730
"enumEntries": [
2831
"Bread",
@@ -41,6 +44,7 @@
4144
{
4245
"parentId": 0,
4346
"type": "boolItem",
47+
"defaultValue": "false",
4448
"item": {
4549
"naming": "YES_NO",
4650
"name": "Frozen",
@@ -83,6 +87,7 @@
8387
{
8488
"parentId": 5,
8589
"type": "boolItem",
90+
"defaultValue": "false",
8691
"item": {
8792
"naming": "TRUE_FALSE",
8893
"name": "Safety lock",
@@ -97,6 +102,7 @@
97102
{
98103
"parentId": 5,
99104
"type": "textItem",
105+
"defaultValue": "",
100106
"item": {
101107
"textLength": 5,
102108
"itemType": "PLAIN_TEXT",
@@ -113,6 +119,7 @@
113119
{
114120
"parentId": 5,
115121
"type": "largeNumItem",
122+
"defaultValue": "0",
116123
"item": {
117124
"digitsAllowed": 8,
118125
"decimalPlaces": 0,
@@ -204,13 +211,8 @@
204211
"subsystem": "DISPLAY"
205212
},
206213
{
207-
"name": "PULLUP_LOGIC",
208-
"latestValue": "true",
209-
"subsystem": "INPUT"
210-
},
211-
{
212-
"name": "INTERRUPT_SWITCHES",
213-
"latestValue": "false",
214+
"name": "SW_POLLING_MODE",
215+
"latestValue": "SWITCHES_POLL_EVERYTHING",
214216
"subsystem": "INPUT"
215217
},
216218
{
@@ -243,6 +245,11 @@
243245
"latestValue": "-1",
244246
"subsystem": "INPUT"
245247
},
248+
{
249+
"name": "PULLUP_LOGIC",
250+
"latestValue": "true",
251+
"subsystem": "INPUT"
252+
},
246253
{
247254
"name": "ENCODER_IS_QUARTER_CYCLE",
248255
"latestValue": "false",
@@ -281,6 +288,11 @@
281288
"authenticatorDefinition": "",
282289
"projectIoExpanders": [
283290
"deviceIO:"
284-
]
291+
],
292+
"menuInMenuCollection": {
293+
"menuDefinitions": []
294+
},
295+
"packageNamespace": "",
296+
"appIsModular": false
285297
}
286298
}

‎examples/arduino32/simpleU8g2/simpleU8g2_menu.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ GraphicsDeviceRenderer renderer(30, applicationInfo.name, &gfxDrawable);
2323
const PROGMEM AnyMenuInfo minfoSettingsSaveSettings = { "SaveSettings", 9, 0xffff, 0, onSaveSettings };
2424
ActionMenuItem menuSettingsSaveSettings(&minfoSettingsSaveSettings, NULL);
2525
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsSerialNumberRtCall, largeNumItemRenderFn, "Serial Number", 7, NO_CALLBACK)
26-
EditableLargeNumberMenuItem menuSettingsSerialNumber(fnSettingsSerialNumberRtCall, 8, 8, 0, true, &menuSettingsSaveSettings);
26+
EditableLargeNumberMenuItem menuSettingsSerialNumber(fnSettingsSerialNumberRtCall, 8, 8, 0, true, LargeFixedNumber(0U, 0U, false), &menuSettingsSaveSettings);
2727
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsUserNameRtCall, textItemRenderFn, "User Name", 16, onNameChanged)
28-
TextMenuItem menuSettingsUserName(fnSettingsUserNameRtCall, 7, 5, &menuSettingsSerialNumber);
28+
TextMenuItem menuSettingsUserName(fnSettingsUserNameRtCall, "", 7, 5, &menuSettingsSerialNumber);
2929
const PROGMEM BooleanMenuInfo minfoSettingsSafetyLock = { "Safety lock", 6, 15, 1, NO_CALLBACK, NAMING_TRUE_FALSE };
3030
BooleanMenuItem menuSettingsSafetyLock(&minfoSettingsSafetyLock, false, &menuSettingsUserName);
3131
RENDERING_CALLBACK_NAME_INVOKE(fnSettingsRtCall, backSubItemRenderFn, "Settings", -1, NO_CALLBACK)
@@ -51,7 +51,7 @@ void setupMenu() {
5151
// Code generated by plugins.
5252
gfx.begin();
5353
renderer.setUpdatesPerSecond(10);
54-
switches.initialise(internalDigitalIo(), true);
54+
switches.init(internalDigitalIo(), SWITCHES_POLL_EVERYTHING, true);
5555
menuMgr.initForEncoder(&renderer, &menuToasterPower, 13, 12, 14);
5656
renderer.setTitleMode(BaseGraphicalRenderer::TITLE_FIRST_ROW);
5757
renderer.setUseSliderForAnalog(false);

‎examples/arduino32/stm32DuinoDemo/stm32DuinoDemo.emf‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
{
77
"parentId": 0,
88
"type": "analogItem",
9+
"defaultValue": "0",
910
"item": {
1011
"maxValue": 1000,
1112
"offset": 0,
@@ -25,6 +26,7 @@
2526
{
2627
"parentId": 0,
2728
"type": "analogItem",
29+
"defaultValue": "0",
2830
"item": {
2931
"maxValue": 255,
3032
"offset": 0,
@@ -43,6 +45,7 @@
4345
{
4446
"parentId": 0,
4547
"type": "largeNumItem",
48+
"defaultValue": "0",
4649
"item": {
4750
"digitsAllowed": 9,
4851
"decimalPlaces": 3,
@@ -74,6 +77,7 @@
7477
{
7578
"parentId": 4,
7679
"type": "enumItem",
80+
"defaultValue": "0",
7781
"item": {
7882
"enumEntries": [
7983
"Pizza",
@@ -92,6 +96,7 @@
9296
{
9397
"parentId": 4,
9498
"type": "boolItem",
99+
"defaultValue": "false",
95100
"item": {
96101
"naming": "YES_NO",
97102
"name": "Toppings",
@@ -106,6 +111,7 @@
106111
{
107112
"parentId": 4,
108113
"type": "boolItem",
114+
"defaultValue": "false",
109115
"item": {
110116
"naming": "ON_OFF",
111117
"name": "Power",
@@ -134,6 +140,7 @@
134140
{
135141
"parentId": 4,
136142
"type": "floatItem",
143+
"defaultValue": "0.0",
137144
"item": {
138145
"numDecimalPlaces": 2,
139146
"name": "Number",
@@ -148,6 +155,7 @@
148155
{
149156
"parentId": 4,
150157
"type": "scrollItem",
158+
"defaultValue": "0-",
151159
"item": {
152160
"itemWidth": 10,
153161
"eepromOffset": 0,
@@ -180,6 +188,7 @@
180188
{
181189
"parentId": 11,
182190
"type": "textItem",
191+
"defaultValue": "",
183192
"item": {
184193
"textLength": 5,
185194
"itemType": "PLAIN_TEXT",
@@ -236,6 +245,7 @@
236245
{
237246
"parentId": 0,
238247
"type": "enumItem",
248+
"defaultValue": "0",
239249
"item": {
240250
"enumEntries": [
241251
"1x",

‎examples/arduino32/stm32DuinoDemo/stm32DuinoDemo_menu.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const char pgmStrRuntimesIoTMonitorText[] = { "IoT Monitor" };
3838
RemoteMenuItem menuRuntimesIoTMonitor(pgmStrRuntimesIoTMonitorText, 14, &menuRuntimesAuthenticator);
3939
ListRuntimeMenuItem menuRuntimesCustomList(13, 0, fnRuntimesCustomListRtCall, &menuRuntimesIoTMonitor);
4040
RENDERING_CALLBACK_NAME_INVOKE(fnRuntimesTextRtCall, textItemRenderFn, "Text", 18, NO_CALLBACK)
41-
TextMenuItem menuRuntimesText(fnRuntimesTextRtCall, 12, 5, &menuRuntimesCustomList);
41+
TextMenuItem menuRuntimesText(fnRuntimesTextRtCall, "", 12, 5, &menuRuntimesCustomList);
4242
RENDERING_CALLBACK_NAME_INVOKE(fnRuntimesRtCall, backSubItemRenderFn, "Runtimes", -1, NO_CALLBACK)
4343
const SubMenuInfo minfoRuntimes = { "Runtimes", 11, 0xffff, 0, NO_CALLBACK };
4444
BackMenuItem menuBackRuntimes(fnRuntimesRtCall, &menuRuntimesText);
@@ -47,7 +47,7 @@ extern char ramDataSet[];
4747
RENDERING_CALLBACK_NAME_INVOKE(fnMoreItemsScrollRtCall, enumItemRenderFn, "Scroll", -1, NO_CALLBACK)
4848
ScrollChoiceMenuItem menuMoreItemsScroll(10, fnMoreItemsScrollRtCall, 0, ramDataSet, 10, 5, NULL);
4949
const FloatMenuInfo minfoMoreItemsNumber = { "Number", 9, 0xffff, 2, NO_CALLBACK };
50-
FloatMenuItem menuMoreItemsNumber(&minfoMoreItemsNumber, &menuMoreItemsScroll);
50+
FloatMenuItem menuMoreItemsNumber(&minfoMoreItemsNumber, 0.0, &menuMoreItemsScroll);
5151
const AnyMenuInfo minfoMoreItemsPressMe = { "Save", 8, 0xffff, 0, saveWasPressed };
5252
ActionMenuItem menuMoreItemsPressMe(&minfoMoreItemsPressMe, &menuMoreItemsNumber);
5353
const BooleanMenuInfo minfoMoreItemsPower = { "Power", 7, 17, 1, NO_CALLBACK, NAMING_ON_OFF };
@@ -65,7 +65,7 @@ const SubMenuInfo minfoMoreItems = { "More Items", 4, 0xffff, 0, NO_CALLBACK };
6565
BackMenuItem menuBackMoreItems(fnMoreItemsRtCall, &menuMoreItemsOptions);
6666
SubMenuItem menuMoreItems(&minfoMoreItems, &menuBackMoreItems, &menuRuntimes);
6767
RENDERING_CALLBACK_NAME_INVOKE(fnLgeNumRtCall, largeNumItemRenderFn, "Lge Num", 6, largeNumDidChange)
68-
EditableLargeNumberMenuItem menuLgeNum(fnLgeNumRtCall, 3, 9, 3, true, &menuMoreItems);
68+
EditableLargeNumberMenuItem menuLgeNum(fnLgeNumRtCall, 3, 9, 3, true, LargeFixedNumber(0U, 0U, false), &menuMoreItems);
6969
const AnalogMenuInfo minfoHalves = { "Halves", 2, 4, 255, NO_CALLBACK, 0, 2, "dB" };
7070
AnalogMenuItem menuHalves(&minfoHalves, 0, &menuLgeNum);
7171
const AnalogMenuInfo minfoDecimal = { "Decimal", 1, 2, 1000, decimalDidChange, 0, 10, "d" };

‎examples/mbed/stm32EncoderLcdI2c/stm32EncoderLcdI2c.emf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
},
136136
{
137137
"name": "I2C_ADDRESS",
138-
"latestValue": "0x27",
138+
"latestValue": "0x47",
139139
"subsystem": "DISPLAY"
140140
},
141141
{

‎examples/mbed/stm32EncoderLcdI2c/stm32EncoderLcdI2c_menu.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void setupMenu() {
4848
menuStatus.setReadOnly(true);
4949

5050
// Code generated by plugins.
51-
lcd.setIoAbstraction(ioFrom8574(0x27, 0xff, &i2cDisplay));
51+
lcd.setIoAbstraction(ioFrom8574(0x47, 0xff, &i2cDisplay));
5252
lcd.begin(16, 2);
5353
renderer.setUpdatesPerSecond(2);
5454
lcd.configureBacklightPin(3);

‎examples/mbed/stm32EncoderLcdI2c/tcmenu_main.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,13 @@
44
//
55
// Set up the logging support in IoAbstraction. For mbed we rely on an MBedLogger being created.
66
//
7-
#ifdef BUILD_FOR_MBED_6
87
BufferedSerial serPort(USBTX, USBRX);
9-
#else
10-
Serial serPort(USBTX, USBRX);
11-
#endif
128
MBedLogger LoggingPort(serPort);
139

14-
I2C i2cDisplay(PF_0, PF_1);
10+
I2C i2cDisplay(PB_9, PB_8);
1511

1612
void setup() {
13+
serPort.set_baud(115200);
1714
serdebugF("LCD mbed is starting");
1815
setupMenu();
1916
}

0 commit comments

Comments
 (0)