diff --git a/3d_printing_files/BOTTOM_DAMPENER.3mf b/3d_printing_files/BOTTOM_DAMPENER.3mf new file mode 100644 index 0000000..f53ef98 Binary files /dev/null and b/3d_printing_files/BOTTOM_DAMPENER.3mf differ diff --git a/3d_printing_files/FEET.3mf b/3d_printing_files/FEET.3mf new file mode 100644 index 0000000..ee33292 Binary files /dev/null and b/3d_printing_files/FEET.3mf differ diff --git a/3d_printing_files/KEY_STABILIZER.3mf b/3d_printing_files/KEY_STABILIZER.3mf new file mode 100644 index 0000000..c5a2774 Binary files /dev/null and b/3d_printing_files/KEY_STABILIZER.3mf differ diff --git a/3d_printing_files/MAIN_BODY.3mf b/3d_printing_files/MAIN_BODY.3mf new file mode 100644 index 0000000..6b06433 Binary files /dev/null and b/3d_printing_files/MAIN_BODY.3mf differ diff --git a/3d_printing_files/SUPPORT_BAR.3mf b/3d_printing_files/SUPPORT_BAR.3mf new file mode 100644 index 0000000..dfd06d2 Binary files /dev/null and b/3d_printing_files/SUPPORT_BAR.3mf differ diff --git a/3d_printing_files/TOP_DAMPENER.3mf b/3d_printing_files/TOP_DAMPENER.3mf new file mode 100644 index 0000000..4c4f1c0 Binary files /dev/null and b/3d_printing_files/TOP_DAMPENER.3mf differ diff --git a/README.md b/README.md index e69de29..c55be71 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,28 @@ +``` +_______________________ +| | | / \ | Macropad OS +| |_________| \____/ | +| | +| _____ _____ _____ | +||key1 | |key2 | |key3 || +||_____| |_____| |_____|| +| _____ _____ _____ | +||key4 | |key5 | |key6 || +||_____| |_____| |_____|| +| _____ _____ _____ | +||key7 | |key8 | |key9 || +||_____| |_____| |_____|| +| _____ _____ _____ | +||key11| |key13| |key12|| +||_____| |_____| |_____|| +|_______________________| +``` + +What is Macropad OS? + + +How to Build: + + +How to Install: +* Connect your complete \ No newline at end of file diff --git a/ReadMe.txt b/ReadMe.txt deleted file mode 100644 index 7a29156..0000000 --- a/ReadMe.txt +++ /dev/null @@ -1,17 +0,0 @@ - _______________________ -| | | / \ | -| |_________| \____/ | -| | -| _____ _____ _____ | -||key1 | |key2 | |key3 || -||_____| |_____| |_____|| -| _____ _____ _____ | -||key4 | |key5 | |key6 || -||_____| |_____| |_____|| -| _____ _____ _____ | -||key7 | |key8 | |key9 || -||_____| |_____| |_____|| -| _____ _____ _____ | -||key11| |key13| |key12|| -||_____| |_____| |_____|| -|_______________________| \ No newline at end of file diff --git a/config.json b/config.json deleted file mode 100644 index 71582cc..0000000 --- a/config.json +++ /dev/null @@ -1,87 +0,0 @@ -{ - "rgb_mode": { - "current_value": "rainbow", - "available_values": [ - "rainbow", - "static" - ] - }, - "rgb_green": { - "current_value": 100, - "value_range": { - "end": 1500, - "start": 0 - }, - "dependency": { - "rgb_mode": "static" - } - }, - "rgb_red": { - "current_value": 100, - "value_range": { - "end": 1500, - "start": 0 - }, - "dependency": { - "rgb_mode": "static" - } - }, - "key_tone_hz": { - "current_value": 690, - "value_range": { - "end": 1500, - "start": 0 - }, - "dependency": { - "key_tone": true - } - }, - "brightness": { - "current_value": 75, - "value_range": { - "end": 100, - "start": 1 - } - }, - "rgb_blue": { - "current_value": 100, - "value_range": { - "end": 1500, - "start": 0 - }, - "dependency": { - "rgb_mode": "static" - } - }, - "key_tone": { - "current_value": false, - "available_values": [ - true, - false - ] - }, - "dev_mode": { - "current_value": false, - "available_values": [ - true, - false - ] - }, - "debug_app": { - "current_value": true, - "available_values": [ - true, - false - ] - }, - "dev_mode_active": { - "current_value": false, - "available_values": [ - true, - false - ], - "dependency": { - "never resolving dependency": "asdf" - } - } -} \ No newline at end of file diff --git a/default_config.json b/default_config.json index fa8f1c3..71582cc 100644 --- a/default_config.json +++ b/default_config.json @@ -27,7 +27,7 @@ } }, "key_tone_hz": { - "current_value": 523, + "current_value": 690, "value_range": { "end": 1500, "start": 0 @@ -37,10 +37,10 @@ } }, "brightness": { - "current_value": 100, + "current_value": 75, "value_range": { "end": 100, - "start": 0 + "start": 1 } }, "rgb_blue": { @@ -54,7 +54,7 @@ } }, "key_tone": { - "current_value": true, + "current_value": false, "available_values": [ true, false @@ -67,6 +67,13 @@ false ] }, + "debug_app": { + "current_value": true, + "available_values": [ + true, + false + ] + }, "dev_mode_active": { "current_value": false, "available_values": [ diff --git a/macropad_os/app_utils/__init__.py b/macropad_os/app_utils/__init__.py index 23bd648..115c4ca 100644 --- a/macropad_os/app_utils/__init__.py +++ b/macropad_os/app_utils/__init__.py @@ -1,3 +1,3 @@ -from .light_patterns import * +from .static_lighting import * from .sound_patterns import * -from .helper_funcs import * \ No newline at end of file +from .helpers import * \ No newline at end of file diff --git a/macropad_os/app_utils/helper_funcs.py b/macropad_os/app_utils/helpers.py similarity index 99% rename from macropad_os/app_utils/helper_funcs.py rename to macropad_os/app_utils/helpers.py index 2364c6f..c1f94c3 100644 --- a/macropad_os/app_utils/helper_funcs.py +++ b/macropad_os/app_utils/helpers.py @@ -2,7 +2,6 @@ def clamp(num, min_value, max_value): return max(min(num, max_value), min_value) - def rgb_from_int(rgb): blue = rgb & 255 green = (rgb >> 8) & 255 diff --git a/macropad_os/app_utils/navigation_patterns.py b/macropad_os/app_utils/navigation_patterns.py deleted file mode 100644 index e69de29..0000000 diff --git a/macropad_os/app_utils/sound_patterns.py b/macropad_os/app_utils/sound_patterns.py deleted file mode 100644 index e69de29..0000000 diff --git a/macropad_os/app_utils/light_patterns.py b/macropad_os/app_utils/static_lighting.py similarity index 100% rename from macropad_os/app_utils/light_patterns.py rename to macropad_os/app_utils/static_lighting.py