Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
portapack-mayhem
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mcules
portapack-mayhem
Commits
2d3a6313
Commit
2d3a6313
authored
7 years ago
by
NotPike
Committed by
Furrtek
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Touchtunes Update (#173)
* Update ui_touchtunes.hpp * Update ui_touchtunes.cpp
parent
3ddc6553
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
firmware/application/apps/ui_touchtunes.cpp
+1
-1
1 addition, 1 deletion
firmware/application/apps/ui_touchtunes.cpp
firmware/application/apps/ui_touchtunes.hpp
+8
-7
8 additions, 7 deletions
firmware/application/apps/ui_touchtunes.hpp
with
9 additions
and
8 deletions
firmware/application/apps/ui_touchtunes.cpp
+
1
−
1
View file @
2d3a6313
...
@@ -121,7 +121,7 @@ void TouchTunesView::start_tx(const uint32_t button_index) {
...
@@ -121,7 +121,7 @@ void TouchTunesView::start_tx(const uint32_t button_index) {
baseband
::
set_ook_data
(
baseband
::
set_ook_data
(
bitstream_length
,
bitstream_length
,
OOK_SAMPLERATE
/
17
8
6
,
// 560us
OOK_SAMPLERATE
/
17
6
6
,
// 560us
TOUCHTUNES_REPEATS
,
TOUCHTUNES_REPEATS
,
100
// Pause
100
// Pause
);
);
...
...
This diff is collapsed.
Click to expand it.
firmware/application/apps/ui_touchtunes.hpp
+
8
−
7
View file @
2d3a6313
/*
/*
* Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
* Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.
* Copyright (C) 2017 Furrtek
* Copyright (C) 2017 Furrtek
* Copyright (C) 201
7
NotPike (notpike@horsefucker.org)
* Copyright (C) 201
8
NotPike (notpike@horsefucker.org)
*
*
* This file is part of PortaPack.
* This file is part of PortaPack.
*
*
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
// The format is actually very simple if it is rather seen as short and long gaps between pulses (as seen in many OOK remotes).
// The format is actually very simple if it is rather seen as short and long gaps between pulses (as seen in many OOK remotes).
// The frames and data rate suspiciously match the NEC infrared protocol (http://www.sbprojects.com/knowledge/ir/nec.php) without
// The frames and data rate suspiciously match the NEC infrared protocol (http://www.sbprojects.com/knowledge/ir/nec.php) without
// the address complement. The exact data rate would be 1786 baud (560us/fragment).
// the address complement. The exact data rate would be 1786 baud (560us/fragment).
// NotPike: The data rate should be 1786 but the remote was transmitting at 1766
// Pin 0 - On/Off
// Pin 0 - On/Off
// ffff00 a2888a2aaaa8888aa2aa2220
// ffff00 a2888a2aaaa8888aa2aa2220
...
@@ -66,16 +67,16 @@
...
@@ -66,16 +67,16 @@
// Each 16bit button code is actually 8bit followed by its complement
// Each 16bit button code is actually 8bit followed by its complement
const
uint8_t
button_codes
[
32
]
=
{
const
uint8_t
button_codes
[
32
]
=
{
0x
B
3
,
// Pause
0x3
2
,
// Pause
0x78
,
// On/Off
0x78
,
// On/Off
0x
F1
,
// P1
0x
70
,
// P1
0x60
,
// P2
0x60
,
// P2
0xCA
,
// P3
0xCA
,
// P3
0x20
,
// F1
0x20
,
// F1
0xF2
,
// Up
0xF2
,
// Up
0xA0
,
// F2
0xA0
,
// F2
0x84
,
// Left
0x84
,
// Left
0x
DD
,
// OK
0x
44
,
// OK
0xC4
,
// Right
0xC4
,
// Right
0x30
,
// F3
0x30
,
// F3
0x80
,
// Down
0x80
,
// Down
...
@@ -92,9 +93,9 @@ const uint8_t button_codes[32] = {
...
@@ -92,9 +93,9 @@ const uint8_t button_codes[32] = {
0x18
,
// Music_Karaoke
0x18
,
// Music_Karaoke
0x98
,
// 0
0x98
,
// 0
0x58
,
// Lock_Queue
0x58
,
// Lock_Queue
0x
F4
,
// Zone 1 Vol+
0x
D0
,
// Zone 1 Vol+
0x
F6
,
// Zone 2 Vol+
0x
90
,
// Zone 2 Vol+
0x
F
C
,
// Zone 3 Vol+
0xC
0
,
// Zone 3 Vol+
0x50
,
// Zone 1 Vol-
0x50
,
// Zone 1 Vol-
0x10
,
// Zone 2 Vol-
0x10
,
// Zone 2 Vol-
0x40
,
// Zone 3 Vol-
0x40
,
// Zone 3 Vol-
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment