version 2.0.4

Nanobot567 · web-flow · commit af2ac9a3cc4c · 2025-01-20T14:50:23.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ TODO.md
 stub.lua
 CHANGELOG.md
 CS-16.pdx.zip
+CS-16.pdx_withExtraVisualizers.zip
diff --git a/MANUAL.md b/MANUAL.md
@@ -143,8 +143,6 @@ If you would like to change an effect intensity (signified by the decimal number
 
 In the `song` screen, you can view and modify your song's global options, such as the tempo and pattern length (these can be modified via the crank). Your song name and author name is displayed at the top.
 
-> IMPORTANT NOTE! currently, the tempo can only be changed by intervals of 7.5 because of a bug in Playdate OS. as soon as a fix is implemented, this message will be deleted. 
-
 Here you can also save and load your songs via the Playdate OS menu. If you select `load`, you can also perform file operations on your songs, such as renaming, deleting, and cloning. You can press `right` to view file metadata as well.
 
 ![](assets/fileops.gif)
@@ -160,15 +158,16 @@ In the system menu, you can also access and change CS-16 settings, such as dark
 - `behavior/`
 	- `play on load` (play pattern immediately on song load)
 	- `stop if sampling` (stop the pattern if you are currently sampling audio)
+    - `precise tempo chg` (enables precise tempo editing [increment / decrement tempo by 0.1 instead of 1 when editing])
 	- `tempo edit stop` (stop the pattern when tempo is modified)
-	- `save .wav samples` (alongside .pda audio, save .wav files when sampling)
 	- `crank docked screen` (which screen appears when the crank is docked. `none` disables changing the screen)
 - `recording/` (as in tapping in a pattern)
 	- (button) `button track` (when record is active, this button will correspond to this track)
 	- `quantization` (quantize recording, can be either off [1], every 16th note [2], or every 8th note [4])
 - `sampling/`
 	- `sample format` (16 bit or 8 bit)
 	- `save waveforms` (save waveform images along with audio)
+	- `save .wav samples` (alongside .pda audio, save .wav files when sampling)
 - `ui/`
 	- `dark mode`
 	- `visualizer` (song screen visualizer options)
diff --git a/assets/banner.png b/assets/banner.png
diff --git a/justfile b/justfile
@@ -38,3 +38,9 @@ release:
   just build
   -rm CS-16.pdx.zip
   zip -rq CS-16.pdx.zip CS-16.pdx
+
+  mv visualizers/ src/
+  pdc -q -sdkpath ~/Documents/PlaydateSDK/ src CS-16
+  mv src/visualizers .
+  -rm CS-16_withExtraVisualizers.pdx.zip
+  zip -rq CS-16_withExtraVisualizers.pdx.zip CS-16.pdx
diff --git a/src/fnt/modified-tron-8x8.fnt b/src/fnt/modified-tron-8x8.fnt
@@ -1,6 +1,6 @@
 --metrics={"baseline":6,"xHeight":2,"capHeight":3,"pairs":{},"left":[],"right":[]}
-datalen=1712
-data=iVBORw0KGgoAAAANSUhEUgAAAFAAAABICAYAAABhlHJbAAAEyklEQVR4Xu2cbXPcMAiEm///o5u5m9gl3MIuCPvi1P2UVkJCK14eeTr5+HP/WVLg48v6b7DKNo6GHzaqPVrfrt0Zf/i0sr+1f/zsfWD+Pe2tA14sK5AiYMXer139u/cH+VrxfxMw0iNcf0pAJrAdtzetOlwVQ0nL7NLYhe6CdwXcRFBTCEWMT0GfMlIKNUtQ1f+wxE0LmNVMFIVHXoCvcWx/dGHRefYL8AfIooA5gIpylqLRAX10+PpkC35n/VH7yQhAdaezfiTg1PqRgNn6YQlSU85HX8dOKeyXm1MVAnXQ7dBVjppsEoxjJ8YhplUEZK3dgzXrqqzeZusxblM4kWWVtL8qoK1L28IIBbpc1+E8dkAm0Or4c39FwOiZ5UVdKfKocWRdH0Wg35+ViAxbZE5UBLRda0MPXwsZenTGOwJSbgu6VMc/OQKjJmE5ru3A1+JH2LMLYOO+RHhuLQto0wY1FLiBEyhKs4kuqZQQFqHMv5fGp6bw5fjsLIch2wibV5DGF3y0/FkRyCKsMv7U7icJ6BGIYQrjTl+js7MijGLr3wKaABoVEEWmD22Zk5IuG3VBC+rq1yJFANZkWIRCe2S0ImD0PKuA8pECZl24AtZ7XVcFZNjS4bh3ROBbBWQpMMGBjwN2I7DqH7pA1oVvDhQQrTTFF2l2A9m4UoSzGskwhkW4sn/k/1bT7Lj0MSL6/BTBL+p2ylylRh4tIGNeifsMVXzjwEgYhC+oEKsY8a4IRGmZvabkl5aawpsDEY4oEZa9DKw9aiIsxdg4eiqyFPX+ShzYEco6H0WYT/MMizpduOt3ZudTGtbgqAZWIu2qAkoCmZpHBcw4Sr3hyS6HUiiL8OgiUXpvflaeiqUURpPvfwMKqE3kJ3yvYxgS4VS1A6N1QkpROVDBlOidqRyssz6zyTJGxhRTA+H5MgGtA8xZxpFHjDOfThfQdxkvIOxCrktZG8ZZlc9HrISwJufF9JTB1o+o5OX/GGefexQBK/adC+p2YVXA7KUEA6zaxssbJBx1poAZuEf4wzjx6f/ZXZhFqI8U9YJZCndSFAn44l/WOW/uExQ4OwJZhFXGWZOqZljGmeHHEoQx0WOebcC6asXes2OV2yL2jHCKIdF/KSBKwEMF3EK+8zlJvcEsRVmEIkHUEqQ2GZUy9vOiLnekgFkXZiUg41DGeasChiXltwjIOO8SAiopdhQHMs5TBYxKjIXtbc7zLDcHCqyXTalgTFaDVpvI4jF2c/96mAoQ6WOCF5O9BZmzlfFbQFAOqt8AUR2rRJBaBzuXJUVgxoFhETXe+AOwpxbivqyIKwdHCKbYsTnLAoZPGbdztFHoAPNcHD8y+mzwvGTEFAeqmBCRPtNJuQBWc9kerXH1KTQVgd0UfbeANIVb6t9GN0j75qi8lL7Nyb6A2ABTUuiqAameDc67Bfz3G4sYc6YCrkLsVaMvRRQF0dQIvLJAzPc7hZlCZHxUwGgvdZPFs7zF3Jav5S48cYLfLPaLPqzzdASNXi2PtdgNd8c7fo7YTAvY+ZigRqw6b0QYdRFFwAriZAKuRtdlBVQvo3tA1U6dp/o7Mm8yArsHVO3UeSPCqIt0v8/59VcOp9qq89Szj8xDH1Q7C68ejtmz8Y7PIzafD03xZ0iqhq8AAAAASUVORK5CYII=
+datalen=1704
+data=iVBORw0KGgoAAAANSUhEUgAAAFAAAABICAYAAABhlHJbAAAEw0lEQVR4Xu1abZvaMAzb/v+P3p4ywoxOtuSkLQdXfRqkcWxFfim7378uLOH3ffefxMpYZ9j2uPuZ/Wh7Zn3Dyvlx/wb0Qfl32x8dQLIiQQ6Bnf1ou/sZwXzt+D8IzPhI7e9FoCI4It6063CXDAfVpVVrA7dnZgkcJLgpxBSDKYgpY6XQZAnq+p+WuL0JxDTO0A1g5gKwxrEsqDLA2o83WKlAOYAHYpNhimKEI7lYn8ZnpWCLgKBg17+n85FABAswC4Bhxn5G4F72Z/xHPHzMCKqgCvqPQpdA1kEHunMUS5ksA9D2gKvwPfbTMQ2/7ChvZQyo9sYLyWrUSMNqPUJljZoj5RyoEOvSMMY6aRaQIuyIAFcJVPuf5kClPJZaSCpDN8XcpsUUyHzMysuGquvaY1bmMAJrX/Y5G4PQoYyAVQI7+1FhjFQ55rkEjoCzW54hCOfEqQDuDrHzFUFq3fKvQ2BUDatpDgHqAo5eVwpV53/JsC6BFwB0tjFY6nZVp8syYIoqhZy5fvPtOxGII1D1Lh3LCf57fI7xTc959xtJBXMR+A9dgh/PMwKZMhH2nBQcrOxmg3q1v6tQVSIqMaWvgnsT2JkDI84iEOMdUFNFOqa5BE4f8M0U+FICGSqC2CCquuRmL75rH2GfIU3RQgD2u/CFAsiwUki17hThqkaqMQab0J5NZAOqEH2lsWdzzjBYkYJNoHo2LcIhRY4mUMVSXYicA9WbQtatqu+tl/GTCMzqnpMRTExf5kBVRCNRmEpR/u4YU3V11kRUiql1Fp9K0RinPQfOEOUQiLfYJVCVgFm/q31WBmU1kDmcEfWuBFoEhRKDmfc0xuyVwogqTWZSKCsRlZJYeg9IgoBAxPV74Cokw+oGTlxXYwjW2QrpWBLiUWp/ymk2xnQHVQwwgtlX653zs8AznELgaoBq/+q6uvTTFbghU5EaI2bmLNZEsqK+2uQQGI+yj88/kDmsDsR6kx4QasoeF6TqkvIj88cVyBeBVQSuzkmYoq8ksBrchxjQPxX/0wZXwgi8ALWuSkRnf1YD2UW58WUKb7/KXTDRVZBSyJnrrAmtnF/NmWmN7PycpA5QXbWzf9Ql5h+usc+d75xnfySBDNlAr2ZKi8BRfIcx1YU6bwpOEVcKZXBL0AAjYigQm08V/2ONjTFHEogkxcBUCagCRHSIcghMS8qnEKjmvFUFnkKgk2KVArv7WYohWFlAJUcFVvuxDN1sZwFdMNEZY6oa5Hax6ob3gGpss7B+TEAyqy6U1oQAFQwjfRXqzFm8nECGrPBHdEoM1qiBjo0MFoEjRdkYMxRXBUeL7B24huWA2WfPKGS+r2KZwHQSB8+689deYBc0cwGHKfAIAjs1kJ2POKr+lcBBGsEG7ZiWXQVm9hVeTaBM4QuTQAX9RMT66bwpPT3DUpAZcVLoXeHGRp+7CPz/l6kqG0sCnTntU3GKAj8ZpxDoHvKOcGOzamAG95B3xK5deA98MtnTbwIdZK99G9ScNbPuvmYeAtW6u5j5McFVrGvbtbcLHAI7I04V5Iy6IhxinGd2hUOgi1nn3X3qObV+CBwCXQXOBuDuq55zbewO/M9sh1CGlQDcvd+6BrpBHDUnqvOV+qq/ajgUfwF1r/xn/jkm2QAAAABJRU5ErkJggg==
 width=8
 height=8
 
@@ -16,7 +16,7 @@ tracking=1
 7	8
 8	8
 9	8
-space	8
+space	3
 �	8
 A	8
 B	8
@@ -86,10 +86,11 @@ z	7
 Ć	5
 [	3
 ]	4
-,	8
+,	3
 =	5
 /	6
 '	3
 (	3
 )	4
+%	6
 
diff --git a/src/img/note_off.png b/src/img/note_off.png
diff --git a/src/lists.lua b/src/lists.lua
@@ -3,10 +3,9 @@
 listviewContents = {}
 
 listview = pd.ui.gridview.new(0, 10)
-listview.backgroundImage = gfx.image.new(10, 10, gfx.kColorWhite)
 listview:setNumberOfRows(16)
 listview:setCellPadding(0, 0, 5, 10)
-listview:setContentInset(24, 24, 13, 11)
+listview:setContentInset(20, 20, 10, 10)
 
 function listview:drawCell(section, row, column, selected, x, y, width, height)
   if selected then
@@ -26,10 +25,9 @@ end
 filePickListContents = {}
 
 filePickList = pd.ui.gridview.new(0, 10)
-filePickList.backgroundImage = gfx.image.new(10, 10, gfx.kColorWhite)
 filePickList:setNumberOfRows(1)
 filePickList:setCellPadding(0, 0, 5, 10)
-filePickList:setContentInset(24, 24, 13, 11)
+filePickList:setContentInset(20, 20, 15, 10)
 
 function filePickList:drawCell(section, row, column, selected, x, y, width, height)
   if filePickListContents[row] == ".." then
@@ -57,10 +55,9 @@ end
 settingsListContents = {}
 
 settingsList = pd.ui.gridview.new(0, 10)
-settingsList.backgroundImage = gfx.image.new(10, 10, gfx.kColorWhite)
 settingsList:setNumberOfRows(1)
 settingsList:setCellPadding(0, 0, 5, 10)
-settingsList:setContentInset(24, 24, 13, 11)
+settingsList:setContentInset(20, 20, 15, 13)
 
 function settingsList:drawCell(section, row, column, selected, x, y, width, height)
   if selected then
diff --git a/src/main.lua b/src/main.lua
@@ -86,7 +86,7 @@ function pd.update()
 
   local crank = 0
   if crankMode == "tempo" then
-    crank = pd.getCrankTicks(8)
+    crank = pd.getCrankTicks(10)
   elseif crankMode == "turn knob" then
     crank = pd.getCrankTicks(8)
   else
@@ -214,7 +214,15 @@ function pd.update()
 
       screenAnim(b)
     elseif crankMode == "tempo" then
-      seq:setTempo(math.max(16, math.min(512, seq:getTempo() + (crank * 8))))
+      local tm = getTempoFromSPS(seq:getTempo()) -- this is some goofy math but it works lol
+
+      if settings["smallerTempoIncrements"] then
+        tm = getSPSfromTempo(tm + (crank / 1.25))
+      else
+        tm = getSPSfromTempo(tm + (crank * 8))
+      end
+
+      seq:setTempo(math.max(16, math.min(512, tm)))
       sinetimer.duration = 400 - (getTempoFromSPS(seq:getTempo()) / 8)
       if seq:isPlaying() and settings["stopontempo"] then
         seq:stop()
@@ -337,6 +345,7 @@ function pd.update()
     local selRow = listview:getSelectedRow()
     if listviewContents[1] ~= "*Ā*" then
       if listview.needsDisplay or textTimer.timeLeft ~= 0 then
+        gfx.clear()
         listview:drawInRect(0, 0, 400, 240)
 
         if instrument.allMuted == true then
@@ -412,10 +421,9 @@ function pd.update()
     end
     gfx.drawTextInRect(toDraw .. " by " .. songAuthor, 0, 0, 400, 240, nil, nil, align.center)
 
-    gfx.drawTextAligned(curMet .. (getTempoFromSPS(seq:getTempo() / 8)), 400, 222, align.right)
+    gfx.drawTextAligned(curMet .. (math.round(getTempoFromSPS(seq:getTempo() / 8), 2)), 400, 222, align.right)
     gfx.drawText(math.floor(stepCount / 8) .. " steps", 0, 222)
 
-
     if settings["visualizer"]["sine"] then -- sine wave
       gfx.setLineWidth(2)
       gfx.drawSineWave(0, 120, 405, 120, (stepCount / 2) / 8, (stepCount / 2) / 8,
diff --git a/src/pdxinfo b/src/pdxinfo
@@ -2,6 +2,6 @@ name=CS-16
 author=nanobot567
 description=cranky synth 16: a 16-track synthesizer/sampler for playdate.
 bundleID=com.nano.cs16
-version=2.0.3
-buildNumber=4625
+version=2.0.4
+buildNumber=4752
 imagePath=SystemAssets/
diff --git a/src/save.lua b/src/save.lua
@@ -174,7 +174,7 @@ function loadSave(name)
 
   log.append("setting tempo to " .. tmp[2][1] .. "...")
 
-  seq:setTempo(tmp[2][1] * 8) -- TODO: be sure to implement real world bpm changes once fix is pushed!
+  seq:setTempo(tmp[2][1] * 8)
   sinetimer.duration = 400 - (getTempoFromSPS(seq:getTempo()) / 8)
 
   log.append("setting stepcount...")
diff --git a/src/setup.lua b/src/setup.lua
@@ -33,7 +33,8 @@ settings = {
   ["logscreens"] = true,
   ["fxvfx"] = false,
   ["crankDockedScreen"] = "pattern",
-  ["foldersPrecedeFiles"] = true
+  ["foldersPrecedeFiles"] = true,
+  ["smallerTempoIncrements"] = false
 }
 settings = loadSettings()
 saveSettings()
diff --git a/src/ui/screens/filepicker.lua b/src/ui/screens/filepicker.lua
@@ -58,6 +58,7 @@ function filePicker.update(force)
   end
 
   if filePickList.needsDisplay == true or (filePicker.animator ~= nil and filePicker.animator:ended() == false) or force then
+    gfx.clear()
     filePickList:drawInRect(filePicker.animator:currentValue(), 0, 400, 240)
     fnt8x8:drawTextAligned("choose a " .. ftype, 200, 0, align.center)
   end
@@ -77,7 +78,7 @@ function filePicker.update(force)
           songData[3][1],
           "\n\n",
           "tempo: ",
-          songData[2][1] * 8,
+          math.round(getTempoFromSPS(songData[2][1]), 2),
           ", ",
           songData[2][2],
           " steps",
diff --git a/src/ui/screens/settings.lua b/src/ui/screens/settings.lua
@@ -207,7 +207,7 @@ function settingsScreen.AButtonDown()
       end
     elseif settingsScreen.subMenu == "ui/visualizer/" then
       if text ~= "----- external -----" then
-        text = string.split(text, ": ")[1]
+        text = pd.string.trimTrailingWhitespace(string.split(text, ":")[1])
 
         settings["visualizer"][text] = not settings["visualizer"][text]
       end
@@ -217,8 +217,10 @@ function settingsScreen.AButtonDown()
       elseif row == 3 then
         settings["stoponsample"] = not settings["stoponsample"]
       elseif row == 4 then
-        settings["stopontempo"] = not settings["stopontempo"]
+        settings["smallerTempoIncrements"] = not settings["smallerTempoIncrements"]
       elseif row == 5 then
+        settings["stopontempo"] = not settings["stopontempo"]
+      elseif row == 6 then
         settings["crankDockedScreen"] = table.cycle(crankDockList, settings["crankDockedScreen"])
       end
     elseif settingsScreen.subMenu == "recording/" then
@@ -324,6 +326,7 @@ function settingsScreen.updateSettings()
       "*Ā*",
       "play on load: " .. tostring(settings["playonload"]),
       "stop if sampling: " .. tostring(settings["stoponsample"]),
+      "precise tempo chg: " .. tostring(settings["smallerTempoIncrements"]),
       "tempo edit stop: " .. tostring(settings["stopontempo"]),
       "crank dock screen: " .. tostring(screen)
     })
diff --git a/visualizers/cpustats.lua b/visualizers/cpustats.lua
@@ -0,0 +1,66 @@
+-- moar stats!!!!
+
+local RECT = pd.geometry.rect.new(0, 30, 400, 210)
+
+local t = {}
+local pdstats, stats = {}, {
+  kernel = "0",
+  serial = "0",
+  game = "0",
+  GC = "0",
+  wifi = "0",
+  audio = "0",
+  idle = "0"
+}
+
+local ticks = 0
+
+local refresh = math.floor(pd.display.getRefreshRate() / 2)
+
+local function statsUpdate()
+  ticks = ticks + 1
+
+  if ticks == refresh then -- to reduce calls to stats
+    ticks = 0
+    pdstats = pd.getStats()
+
+    if pdstats == nil then
+      pdstats = {}
+    end
+
+    stats = {
+      kernel = "0",
+      serial = "0",
+      game = "0",
+      GC = "0",
+      wifi = "0",
+      audio = "0",
+      idle = "0"
+    }
+
+
+    for k, v in pairs(pdstats) do
+      stats[k] = v
+    end
+
+    t = {
+      "-- CPU --\n",
+      "idle: ",
+      stats.idle,
+      "\nkernel: ",
+      stats.kernel,
+      "\ngame: ",
+      stats.game,
+      "\ngc: ",
+      stats.GC,
+      "\naudio: ",
+      stats.audio
+    }
+  end
+
+  gfx.setImageDrawMode(gfx.kDrawModeCopy)
+
+  fnt8x8:drawText(table.concat(t), RECT)
+end
+
+return { "cpu stats", statsUpdate }
diff --git a/visualizers/ditherednotes.lua b/visualizers/ditherednotes.lua
@@ -0,0 +1,27 @@
+-- dithered active notes
+
+local DITHER_TYPE = gfx.image.kDitherTypeDiagonalLine
+
+local img = gfx.image.new(20, 20)
+local inst
+
+local function ditheredNotesUpdate(data)
+  for i = 1, 16 do
+    inst = data["instruments"][i]
+    if inst:isPlaying() then
+      gfx.setColor(gfx.kColorXOR)
+
+      gfx.pushContext(img)
+      gfx.setColor(gfx.kColorBlack)
+      gfx.fillRoundRect(0, 0, 20, 20, 2)
+      gfx.popContext()
+
+      gfx.setImageDrawMode(gfx.kDrawModeCopy)
+      img:drawFaded((i * 25) - 22, 110, (instrumentTable[i]:getEnvelope():getValue()), DITHER_TYPE)
+
+      gfx.setColor(gfx.kColorBlack)
+    end
+  end
+end
+
+return { "dithered notes", ditheredNotesUpdate }
diff --git a/visualizers/ramona/ramona.lua b/visualizers/ramona/ramona.lua
@@ -31,7 +31,9 @@ local speechOptions = {
   "we getting out of\nthe playdate with\nthis one.",
   "let. them. cook!!",
   "betcha didn't know\nthere's lore behind\ncs-16...",
-  "hopefully i don't\nsound like a\nbroken record, haha..."
+  "hopefully i don't\nsound like a\nbroken record, haha...",
+  "anyway, hope you've\n been doing\nalright!",
+  "man, it gets boring\nin here\nsometimes..."
 }
 local speech = ""
 local lastSpeech = "blannnnk"
