Skip to content

Commit

Permalink
fixing website
Browse files Browse the repository at this point in the history
  • Loading branch information
bwhitman committed Aug 27, 2024
1 parent 619fc75 commit 978787b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
3 changes: 2 additions & 1 deletion tulip/shared/keyscan.c
Original file line number Diff line number Diff line change
Expand Up @@ -409,8 +409,9 @@ void send_key_to_micropython(uint16_t c) {
mp_sched_schedule(ui_switch_callback, NULL);
} else {
// Call the callback if set
if(keyboard_callback != NULL)
if(keyboard_callback != NULL) {
mp_sched_schedule(keyboard_callback, mp_obj_new_int(c));
}

// If something is taking in chars from LVGL (text area etc), don't send the char to MP
if (c==mp_interrupt_char) {
Expand Down
4 changes: 1 addition & 3 deletions tulip/shared/py/editor.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ def __init__(self, filename):
def deactivate_editor_cb(self, screen):
tulip.keyboard_callback()
tulip.tfb_restore()
# Fudge the repl line as it got eaten during the TFB restore. This will never be a problem, lol
#print(">>> ",end='')


def quit_editor_cb(self, screen):
tulip.deinit_editor()
Expand All @@ -45,7 +44,6 @@ def activate_editor_cb(self,screen):
tulip.keyboard_callback(tulip.key_editor)
# The TFB switches over, but the REPL will print >>> after this runs,
# overwriting the first line. So wait a bit and activate then
# (This also means the >>> will print on the alternate TFB, so we have to fudge on reactivate)
tulip.defer(tulip.activate_editor, None, 50)
# And because of the TFB clearing, the buttons may get destroyed, so re-draw them
tulip.defer(draw, None, 100)
Expand Down
6 changes: 3 additions & 3 deletions www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -321,8 +321,8 @@ <h2 class="display-6">Buy a Tulip, DAC or Alles. Ships anywhere in the world.</h
</div>

<div class="alert alert-secondary" role="alert">
<strong>August 1 2024:</strong> Tulip's manufacturer sold out of the first batch of Tulips yesterday during our launch and are currently hard at work making more.
The next batch of Tulips are set to be ready by <strong>around August 20</strong>. Order now to get your Tulip as soon as possible! Please contact <A HREF="https://www.makerfabs.com/contact.html">Makerfabs</A> with any questions about your order or
<strong>August 27 2024:</strong> Makerfabs are now shipping Tulips from the <strong>second batch</strong> and are also kicking off the next one. They will continue to product Tulips in batches,
so order now to get your Tulip as soon as possible! Please contact <A HREF="https://www.makerfabs.com/contact.html">Makerfabs</A> with any questions about your order or
timing!
</div>
<div class="row vw-100 px-0 py-vh-1 align-items-top">
Expand All @@ -341,7 +341,7 @@ <h5 class="card-title">Tulip CC</h5>
<a href="https://www.makerfabs.com/mabee-dac-gp8413.html"><img src="img/mabee-dac.jpg" style="width:300px; height: 400px; object-fit:cover" class="card-img-top" alt="Mabee DAC"></a>
<div class="card-body py-vh-2">
<h5 class="card-title">Two-channel DAC</h5>
<p class="card-text">Plugs right into a Tulip to give you two channels of CV control over modular synths with standard 3.5mm patch cables. With some light modification, you can have up to 4 running at once for 8 channels.</p>
<p class="card-text">Plugs right into a Tulip to give you two channels of CV control over modular synths. <strong>Please note</strong>: this DAC is set up for TRS (stereo 3.5mm) cables. To use with a modular patch cable, you will need a stereo to mono <a href="https://www.amazon.com/3-5mm-Stereo-Adapter-Plated-Female/dp/B0919C5D93">adapter</a> or <a href="https://www.amazon.com/Gold-Plated-Connector-Splitter-RFAdapter-Headphone/dp/B096XNHTH3/">cable</a> plugged in at the DAC end. We are working on fixing this for future batches and will update this when we do.</p>
<a href="https://www.makerfabs.com/mabee-dac-gp8413.html" class="btn btn-success">US$5.80 on Makerfabs</a>
</div>
</div>
Expand Down

0 comments on commit 978787b

Please sign in to comment.