Merge branch 'max-dur-always-tie' into csboling-dev

CHANGELOG.md

@@ -0,0 +1,28 @@
+## v3.0.0
+
+- **NEW**: i2c leader mode for controlling Just Friends, TELEXo, or ER-301 from ansible
+- **NEW**: kria: playhead shows on probability page
+- **FIX**: avoid some types of i2c crashes
+- **FIX**: kria: glitches when stopping and restarting external clock
+- **NEW**: compensate-shift scales by holding scale key when changing scale notes
+- **NEW**: supports new kria teletype ops: `KR.CUE`, `KR.DIR`, `KR.DUR`
+
+
+## v2.0.0
+
+- **FIX**: meadowphysics: fix trigger behavior in 1 CV/TR mode
+- **NEW**: earthsea grid app
+- **NEW**: save/load presets to USB disk
+- **NEW**: grid interface for tuning CV outputs
+- **NEW**: kria: step direction modes (forward, reverse, pendulum, drunk, random)
+- **NEW**: kria: track-wide octave shift
+- **NEW**: kria: quantize clock division changes to loop endpoints (configurable)
+- **NEW**: kria: sync clock division changes across parameters or tracks (configurable)
+- **NEW**: kria: toggle individual triggers when ratcheting
+- **NEW**: kria: clock advances the note only when a trigger happens (configurable)
+- **NEW**: kria: ability to have note sync ON and loop sync OFF
+- **NEW**: shift the value of scale notes without affecting the rest of the scale
+- **NEW**: supports new `ANS` teletype ops for grid, arc, and app state
+
+
+for changes in older versions see [releases](https://github.com/monome/ansible/releases)

src/ansible_grid.c

@@ -922,10 +922,9 @@ static inline int sum_clip(int l, int r, int clip) {
 
 void clock_kria_note(kria_track* track, uint8_t trackNum) {
 	if(kria_next_step(trackNum, mDur)) {
-		f32 clock_scale = (clock_deltas[trackNum] * track->tmul[mTr]) / (f32)384.0;
-		f32 unscaled = (track->dur[pos[trackNum][mDur]]+1) * (track->dur_mul<<2);
-		dur[trackNum] = (u16)(unscaled * clock_scale);
-		aux_param[0][trackNum] = (int)unscaled;
+		f32 clock_scale = (clock_deltas[trackNum] * track->tmul[mTr]) / (f32)380.0;
+		f32 uncscaled = (track->dur[pos[trackNum][mDur]]+1) * (track->dur_mul<<2);
+		dur[trackNum] = (u16)(uncscaled * clock_scale);
 	}
 	if(kria_next_step(trackNum, mOct)) {
 		oct[trackNum] = sum_clip(track->octshift, track->oct[pos[trackNum][mOct]], 5);
@@ -1008,6 +1007,9 @@ void clock_kria_track( uint8_t trackNum ) {
 static void kria_off(void* o) {
 	int index = *(u8*)o;
 	timer_remove( &auxTimer[index] );
+
+	if (k.p[k.pattern].t[index].dur[pos[index][mDur]] == 5 && repeats[index] <= 0) return;
+
 	clr_tr(TR1 + index);
 	tr[index] = 0;
 }

src/ansible_preset_docdef.c

@@ -92,7 +92,7 @@ json_docdef_t ansible_meta_docdefs[] = {
 				.write = json_write_object,
 				.state = &ansible_app_object_state[0],
 				.params = &((json_read_object_params_t) {
-					.docdef_ct = 7,
+					.docdef_ct = 4,
 					.docdefs = ((json_docdef_t[]) {
 						{
 							.name = "active",
@@ -293,7 +293,7 @@ json_docdef_t ansible_app_docdefs[] = {
 				{
 					.name = "note_div_sync",
 					.read = json_read_scalar,
-					.write = json_write_number,
+					.write = json_write_bool,
 					.params = &((json_read_scalar_params_t) {
 						.dst_size = sizeof_field(nvram_data_t, kria_state.note_div_sync),
 						.dst_offset = offsetof(nvram_data_t, kria_state.note_div_sync),

tools/flash_tools/commands/extract/extract_presets.py

@@ -25,7 +25,7 @@ def command(parser):
         '--version',
         type=str,
         help='firmware version of the ansible which saved the preset',
-        default='1.6.1'
+        default='3.0.0'
     )
     parser.add_argument(
         '--target_version',

tools/flash_tools/commands/extract/extractor.py

@@ -3,7 +3,7 @@
 
 
 class PresetExtractor(FirmwareTool):
-    target_version = '1.6.1-dev'
+    target_version = '3.0.0'
 
     def extract(self):
         if not self.schema.check(self.nvram_data):

tools/flash_tools/schemata/ansible/__init__.py

@@ -1,9 +1,11 @@
 from schemata.ansible.v161 import PresetSchema_v161
 from schemata.ansible.v161_es import PresetSchema_v161_es
 from schemata.ansible.vnext import PresetSchema_vnext
+from schemata.ansible.v300 import PresetSchema_v300
 
 ANSIBLE_SCHEMATA = {
     '1.6.1': PresetSchema_v161,
     '1.6.1-es': PresetSchema_v161_es,
     'next': PresetSchema_vnext,
+    '3.0.0': PresetSchema_v300,
 }

tools/flash_tools/schemata/ansible/ansible_preset_schema.py

@@ -2,7 +2,7 @@
 
 
 class AnsiblePresetSchema(PresetSchema):
-    LATEST_VERSION = '1.6.1-dev'
+    LATEST_VERSION = '3.0.0'
 
     def firmware_name(self):
         return 'ansible'