rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes some issues with sounds and the appropriate factory. Further moved the calculation of pin addresses with pin base into the factories

Browse Source
This commit is contained in:
Johannes Wendel
2020-01-07 00:47:59 +01:00
parent 02709e650f
commit ee5a87ae15
18 changed files with 145 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
FlippR-Driver/contrib/json_example/output/Sound_Config.json
View File

@@ -3,8 +3,8 @@
"port_extenders" :
[
{
"name" : "extender_0",
"i2c_address" : 34,
"name" : "extender_0",
"pin_base" : 81
}
],
@@ -13,339 +13,321 @@
"address" : 13,
"extender" : "extender_0"
},
"address_pins" : [ 15, 14, 12, 10, 8, 9, 11 ],
"address_pins" :
[
{
"id" : 0,
"address" : 15,
"extender" : "extender_0"
},
{
"id" : 1,
"address" : 14,
"extender" : "extender_0"
},
{
"id" : 2,
"address" : 12,
"extender" : "extender_0"
},
{
"id" : 3,
"address" : 10,
"extender" : "extender_0"
},
{
"id" : 4,
"address" : 8,
"extender" : "extender_0"
},
{
"id" : 5,
"address" : 9,
"extender" : "extender_0"
},
{
"id" : 6,
"address" : 11,
"extender" : "extender_0"
}
],
"sounds" :
[
{
"id" : 0,
"address" : 22,
"name" : "Sound 1",
"extender" : "extender_0",
"deactivation_time_milliseconds" : 10
},
{
"id" : 1,
"address" : 23,
"name" : "Sound 2",
"extender" : "extender_0"
"name" : "Sound 2"
},
{
"id" : 2,
"address" : 24,
"name" : "Sound 3",
"extender" : "extender_0"
"name" : "Sound 3"
},
{
"id" : 3,
"address" : 25,
"name" : "Sound 4",
"extender" : "extender_0"
"name" : "Sound 4"
},
{
"id" : 4,
"address" : 26,
"name" : "Sound 5",
"extender" : "extender_0"
"name" : "Sound 5"
},
{
"id" : 5,
"address" : 27,
"name" : "Sound 6",
"extender" : "extender_0"
"name" : "Sound 6"
},
{
"id" : 6,
"address" : 28,
"name" : "Sound 7",
"extender" : "extender_0"
"name" : "Sound 7"
},
{
"id" : 7,
"address" : 29,
"name" : "Sound 8",
"extender" : "extender_0"
"name" : "Sound 8"
},
{
"id" : 8,
"address" : 30,
"name" : "Sound 9",
"extender" : "extender_0"
"name" : "Sound 9"
},
{
"id" : 9,
"address" : 31,
"name" : "Sound 10",
"extender" : "extender_0"
"name" : "Sound 10"
},
{
"id" : 10,
"address" : 32,
"name" : "Sound 11",
"extender" : "extender_0"
"name" : "Sound 11"
},
{
"id" : 11,
"address" : 33,
"name" : "Sound 12",
"extender" : "extender_0"
"name" : "Sound 12"
},
{
"id" : 12,
"address" : 34,
"name" : "Sound 13",
"extender" : "extender_0"
"name" : "Sound 13"
},
{
"id" : 13,
"address" : 35,
"name" : "Sound 14",
"extender" : "extender_0"
"name" : "Sound 14"
},
{
"id" : 14,
"address" : 36,
"name" : "Sound 15",
"extender" : "extender_0"
"name" : "Sound 15"
},
{
"id" : 15,
"address" : 37,
"name" : "Sound 16",
"extender" : "extender_0"
"name" : "Sound 16"
},
{
"id" : 16,
"address" : 38,
"name" : "Sound 17",
"extender" : "extender_0"
"name" : "Sound 17"
},
{
"id" : 17,
"address" : 39,
"name" : "Sound 18",
"extender" : "extender_0"
"name" : "Sound 18"
},
{
"id" : 18,
"address" : 40,
"name" : "Sound 19",
"extender" : "extender_0"
"name" : "Sound 19"
},
{
"id" : 19,
"address" : 41,
"name" : "Sound 20",
"extender" : "extender_0"
"name" : "Sound 20"
},
{
"id" : 20,
"address" : 42,
"name" : "Sound 21",
"extender" : "extender_0"
"name" : "Sound 21"
},
{
"id" : 21,
"address" : 43,
"name" : "Sound 22",
"extender" : "extender_0"
"name" : "Sound 22"
},
{
"id" : 22,
"address" : 44,
"name" : "Sound 23",
"extender" : "extender_0"
"name" : "Sound 23"
},
{
"id" : 23,
"address" : 45,
"name" : "Sound 24",
"extender" : "extender_0"
"name" : "Sound 24"
},
{
"id" : 24,
"address" : 46,
"name" : "Sound 25",
"extender" : "extender_0"
"name" : "Sound 25"
},
{
"id" : 25,
"address" : 47,
"name" : "Sound 26",
"extender" : "extender_0"
"name" : "Sound 26"
},
{
"id" : 26,
"address" : 48,
"name" : "Sound 27",
"extender" : "extender_0"
"name" : "Sound 27"
},
{
"id" : 27,
"address" : 49,
"name" : "Sound 28",
"extender" : "extender_0"
"name" : "Sound 28"
},
{
"id" : 28,
"address" : 50,
"name" : "Speech 1: \"You're good! But I'm still the Champ!\"",
"extender" : "extender_0"
"name" : "Speech 1: \"You're good! But I'm still the Champ!\""
},
{
"id" : 29,
"address" : 51,
"name" : "Speech 2: \"Twenty\"",
"extender" : "extender_0"
"name" : "Speech 2: \"Twenty\""
},
{
"id" : 30,
"address" : 52,
"name" : "Speech 3: \"Seconds\"",
"extender" : "extender_0"
"name" : "Speech 3: \"Seconds\""
},
{
"id" : 31,
"address" : 53,
"name" : "Speech 4: \"Five, Four, Three, Two, One.\"",
"extender" : "extender_0"
"name" : "Speech 4: \"Five, Four, Three, Two, One.\""
},
{
"id" : 32,
"address" : 54,
"name" : "Speech 5: \"Challenge the champ!\"",
"extender" : "extender_0"
"name" : "Speech 5: \"Challenge the champ!\""
},
{
"id" : 33,
"address" : 55,
"name" : "Speech 6: \"Good. You're a champ!\"",
"extender" : "extender_0"
},
"name" : "Speech 6: \"Good. You're a champ!\""
},
{
"id" : 34,
"address" : 56,
"name" : "Speech 7: \"Wow.\"",
"extender" : "extender_0"
"name" : "Speech 7: \"Wow.\""
},
{
"id" : 35,
"address" : 57,
"name" : "Speech 8: \"This is a maximum score.\"",
"extender" : "extender_0"
"name" : "Speech 8: \"This is a maximum score.\""
},
{
"id" : 36,
"address" : 58,
"name" : "Speech 9: \"What a low score!\"",
"extender" : "extender_0"
"name" : "Speech 9: \"What a low score!\""
},
{
"id" : 37,
"address" : 59,
"name" : "Speech 10: \"Try harder!\"",
"extender" : "extender_0"
"name" : "Speech 10: \"Try harder!\""
},
{
"id" : 38,
"address" : 60,
"name" : "Speech 11: \"Be careful.\"",
"extender" : "extender_0"
"name" : "Speech 11: \"Be careful.\""
},
{
"id" : 39,
"address" : 61,
"name" : "Speech 12: \"The last ball.\"",
"extender" : "extender_0"
"name" : "Speech 12: \"The last ball.\""
},
{
"id" : 40,
"address" : 62,
"name" : "Speech 13: \"Be ready for the Game Time Bonus.\"",
"extender" : "extender_0"
"name" : "Speech 13: \"Be ready for the Game Time Bonus.\""
},
{
"id" : 41,
"address" : 63,
"name" : "Speech 14: \"That's naughty!\"",
"extender" : "extender_0"
"name" : "Speech 14: \"That's naughty!\""
},
{
"id" : 42,
"address" : 64,
"name" : "Speech 15: \"Another coin please.\"",
"extender" : "extender_0"
"name" : "Speech 15: \"Another coin please.\""
},
{
"id" : 43,
"address" : 65,
"name" : "Speech 16: \"Sorry. The time is over.\"",
"extender" : "extender_0"
"name" : "Speech 16: \"Sorry. The time is over.\""
},
{
"id" : 44,
"address" : 66,
"name" : "Speech 17: \"I am the champ! Challenge me!\"",
"extender" : "extender_0"
"name" : "Speech 17: \"I am the champ! Challenge me!\""
},
{
"id" : 45,
"address" : 67,
"name" : "Speech 18: \"Time is short.\"",
"extender" : "extender_0"
"name" : "Speech 18: \"Time is short.\""
},
{
"id" : 46,
"address" : 68,
"name" : "Speech 19: \"Once again for the special.\"",
"extender" : "extender_0"
"name" : "Speech 19: \"Once again for the special.\""
},
{
"id" : 47,
"address" : 69,
"name" : "Speech 20: \"Go for the high level board.\"",
"extender" : "extender_0"
"name" : "Speech 20: \"Go for the high level board.\""
},
{
"id" : 48,
"address" : 70,
"name" : "Speech 21: \"Play gently to beat me.\"",
"extender" : "extender_0"
"name" : "Speech 21: \"Play gently to beat me.\""
},
{
"id" : 49,
"address" : 71,
"name" : "Speech 22: \"Quick! Hit the special.\"",
"extender" : "extender_0"
"name" : "Speech 22: \"Quick! Hit the special.\""
},
{
"id" : 50,
"address" : 72,
"name" : "Speech 23: \"Shoot the special.\"",
"extender" : "extender_0"
"name" : "Speech 23: \"Shoot the special.\""
},
{
"id" : 51,
"address" : 73,
"name" : "Speech 24: \"Thirty\"",
"extender" : "extender_0"
"name" : "Speech 24: \"Thirty\""
},
{
"id" : 52,
"address" : 74,
"name" : "Speech 25: \"Red\"",
"extender" : "extender_0"
"name" : "Speech 25: \"Red\""
},
{
"id" : 53,
"address" : 75,
"name" : "Speech 27: \"Yellow\"",
"extender" : "extender_0"
"name" : "Speech 27: \"Yellow\""
},
{
"id" : 54,
"address" : 76,
"name" : "Speech 28: \"Go for the Special.\"",
"extender" : "extender_0"
"name" : "Speech 28: \"Go for the Special.\""
}
]
}