Skip to content

Commit

Permalink
Fixed dodgy parsing! Slightly new CLI
Browse files Browse the repository at this point in the history
  • Loading branch information
@MMMZZZZ
MMMZZZZ committed Dec 2, 2020
1 parent 02ea775 commit 0bc4582
Show file tree
Hide file tree
Showing 10 changed files with 176 additions and 114 deletions.
8 changes: 4 additions & 4 deletions Example/Syntherrupter_Nextion_Code/MIDI_Chn_Set.txt
View file
Expand Up @@ -670,7 +670,7 @@ Page MIDI_Chn_Set
Number nNumCoarse
Properties
Scope : Local
Initial Value: 0
Initial Value: 42

Events
Touch Press Event
Expand Down Expand Up @@ -748,7 +748,7 @@ Page MIDI_Chn_Set
Number nDataCoarse
Properties
Scope : Local
Initial Value: 0
Initial Value: 8364

Events
Touch Press Event
Expand Down Expand Up @@ -805,7 +805,7 @@ Page MIDI_Chn_Set
Number nDataFine
Properties
Scope : Local
Initial Value: 0
Initial Value: 8364

Events
Touch Press Event
Expand Down Expand Up @@ -1176,7 +1176,7 @@ Page MIDI_Chn_Set
Properties
Scope : Global
Type : int32
Initial Value : 0
Initial Value : 704643072

Variable MIDIData
Properties
Expand Down
21 changes: 7 additions & 14 deletions Example/Syntherrupter_Nextion_Code/MIDI_Live.txt
View file
Expand Up @@ -735,13 +735,11 @@ Page MIDI_Live
Running : No

Events
Touch Press Event
p
e

Touch Release Event
p
e
Timer Event
tmTCButtonHold.en=0
MIDI_TC_Set.origin.val=dp
covx sCoil.txt,MIDI_TC_Set.coilNum.val,0,0
page MIDI_TC_Set

Variable sCoil
Properties
Expand Down Expand Up @@ -872,13 +870,8 @@ Page MIDI_Live
Running : No

Events
Touch Press Event
p
e

Touch Release Event
p
e
Timer Event
openEE.val=1

Variable openEE
Properties
Expand Down
64 changes: 57 additions & 7 deletions Example/Syntherrupter_Nextion_Code/MIDI_TC_Set.txt
View file
Expand Up @@ -1034,13 +1034,63 @@ Page MIDI_TC_Set
Running : No

Events
Touch Press Event
p
e

Touch Release Event
p
e
Timer Event
tmButtonHold.en=0
MIDI_Chn_Set.origin.val=dp
covx sChnNum.txt,MIDI_Chn_Set.chnNum.val,0,0
// Button has been hold, not pressed. Revert state change.
if(sChnNum.txt==btChn0.txt)
{
btChn0.val=1-btChn0.val
}else if(sChnNum.txt==btChn1.txt)
{
btChn1.val=1-btChn1.val
}else if(sChnNum.txt==btChn2.txt)
{
btChn2.val=1-btChn2.val
}else if(sChnNum.txt==btChn3.txt)
{
btChn3.val=1-btChn3.val
}else if(sChnNum.txt==btChn4.txt)
{
btChn4.val=1-btChn4.val
}else if(sChnNum.txt==btChn5.txt)
{
btChn5.val=1-btChn5.val
}else if(sChnNum.txt==btChn6.txt)
{
btChn6.val=1-btChn6.val
}else if(sChnNum.txt==btChn7.txt)
{
btChn7.val=1-btChn7.val
}else if(sChnNum.txt==btChn8.txt)
{
btChn8.val=1-btChn8.val
}else if(sChnNum.txt==btChn9.txt)
{
btChn9.val=1-btChn9.val
}else if(sChnNum.txt==btChn10.txt)
{
btChn10.val=1-btChn10.val
}else if(sChnNum.txt==btChn11.txt)
{
btChn11.val=1-btChn11.val
}else if(sChnNum.txt==btChn12.txt)
{
btChn12.val=1-btChn12.val
}else if(sChnNum.txt==btChn13.txt)
{
btChn13.val=1-btChn13.val
}else if(sChnNum.txt==btChn14.txt)
{
btChn14.val=1-btChn14.val
}else if(sChnNum.txt==btChn15.txt)
{
btChn15.val=1-btChn15.val
}
// Store settings before leaving the page
click fStore,1
page MIDI_Chn_Set

Variable sChnNum
Properties
Expand Down
8 changes: 4 additions & 4 deletions Example/Syntherrupter_Nextion_Code/Other_Settings.txt
View file
Expand Up @@ -111,7 +111,7 @@ Page Other_Settings
Number nHoldTime
Properties
Scope : Global
Initial Value: 0
Initial Value: 250

Events
Touch Press Event
Expand Down Expand Up @@ -477,7 +477,7 @@ Page Other_Settings
Number nSleepMin
Properties
Scope : Local
Initial Value: 0
Initial Value: 5

Events
Touch Press Event
Expand All @@ -498,7 +498,7 @@ Page Other_Settings
Number nSleepS
Properties
Scope : Local
Initial Value: 0
Initial Value: 30

Events
Touch Press Event
Expand Down Expand Up @@ -591,7 +591,7 @@ Page Other_Settings
Number nBackOff
Properties
Scope : Global
Initial Value: 0
Initial Value: 1

Events
Touch Press Event
Expand Down
2 changes: 1 addition & 1 deletion Example/Syntherrupter_Nextion_Code/Simple.txt
View file
Expand Up @@ -429,7 +429,7 @@ Page Simple
Number nBPS
Properties
Scope : Local
Initial Value: 0
Initial Value: 100

Events
Touch Press Event
Expand Down
3 changes: 3 additions & 0 deletions Example/Syntherrupter_Nextion_Code/Startup.txt
View file
Expand Up @@ -28,6 +28,9 @@ Page Startup
click pStartup,0

Picture pStartup
Properties
Scope: Local

Events
Touch Press Event

Expand Down
36 changes: 18 additions & 18 deletions Example/Syntherrupter_Nextion_Code/TC_Settings.txt
View file
Expand Up @@ -607,7 +607,7 @@ Page TC_Settings
Number nCoil1MinOff
Properties
Scope : Local
Initial Value: 0
Initial Value: 101

Events
Touch Press Event
Expand All @@ -628,7 +628,7 @@ Page TC_Settings
Float nCoil1Duty
Properties
Scope : Local
Initial Value : 0
Initial Value : 101
Divide by [10^x]: 1

Events
Expand Down Expand Up @@ -671,7 +671,7 @@ Page TC_Settings
Number nCoil2MinOff
Properties
Scope : Local
Initial Value: 0
Initial Value: 102

Events
Touch Press Event
Expand All @@ -692,7 +692,7 @@ Page TC_Settings
Float nCoil2Duty
Properties
Scope : Local
Initial Value : 0
Initial Value : 102
Divide by [10^x]: 1

Events
Expand Down Expand Up @@ -735,7 +735,7 @@ Page TC_Settings
Number nCoil3MinOff
Properties
Scope : Local
Initial Value: 0
Initial Value: 103

Events
Touch Press Event
Expand All @@ -756,7 +756,7 @@ Page TC_Settings
Float nCoil3Duty
Properties
Scope : Local
Initial Value : 0
Initial Value : 103
Divide by [10^x]: 1

Events
Expand Down Expand Up @@ -799,7 +799,7 @@ Page TC_Settings
Number nCoil4MinOff
Properties
Scope : Local
Initial Value: 0
Initial Value: 104

Events
Touch Press Event
Expand All @@ -820,7 +820,7 @@ Page TC_Settings
Float nCoil4Duty
Properties
Scope : Local
Initial Value : 0
Initial Value : 104
Divide by [10^x]: 1

Events
Expand Down Expand Up @@ -863,7 +863,7 @@ Page TC_Settings
Number nCoil5MinOff
Properties
Scope : Local
Initial Value: 0
Initial Value: 105

Events
Touch Press Event
Expand All @@ -884,7 +884,7 @@ Page TC_Settings
Float nCoil5Duty
Properties
Scope : Local
Initial Value : 0
Initial Value : 105
Divide by [10^x]: 1

Events
Expand Down Expand Up @@ -927,7 +927,7 @@ Page TC_Settings
Number nCoil6MinOff
Properties
Scope : Local
Initial Value: 0
Initial Value: 106

Events
Touch Press Event
Expand All @@ -948,7 +948,7 @@ Page TC_Settings
Float nCoil6Duty
Properties
Scope : Local
Initial Value : 0
Initial Value : 106
Divide by [10^x]: 1

Events
Expand Down Expand Up @@ -1561,7 +1561,7 @@ Page TC_Settings
Number nCoil1Voices
Properties
Scope : Local
Initial Value: 0
Initial Value: 1

Events
Touch Press Event
Expand All @@ -1582,7 +1582,7 @@ Page TC_Settings
Number nCoil2Voices
Properties
Scope : Local
Initial Value: 0
Initial Value: 2

Events
Touch Press Event
Expand All @@ -1603,7 +1603,7 @@ Page TC_Settings
Number nCoil3Voices
Properties
Scope : Local
Initial Value: 0
Initial Value: 3

Events
Touch Press Event
Expand All @@ -1624,7 +1624,7 @@ Page TC_Settings
Number nCoil4Voices
Properties
Scope : Local
Initial Value: 0
Initial Value: 4

Events
Touch Press Event
Expand All @@ -1645,7 +1645,7 @@ Page TC_Settings
Number nCoil5Voices
Properties
Scope : Local
Initial Value: 0
Initial Value: 5

Events
Touch Press Event
Expand All @@ -1666,7 +1666,7 @@ Page TC_Settings
Number nCoil6Voices
Properties
Scope : Local
Initial Value: 0
Initial Value: 6

Events
Touch Press Event
Expand Down

0 comments on commit 0bc4582

Please sign in to comment.