fixed SC1000 issues

rasteri · Sep 26, 2020 · f8aed01 · f8aed01
1 parent 9bf1aa9
commit f8aed01
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/software/Makefile b/software/Makefile
@@ -15,8 +15,8 @@
 # MA 02110-1301, USA.
 #
 
-CC=/root/buildroot-2018.08.4/output/host/usr/bin/arm-linux-gcc
-#CC=gcc -g
+#CC=/root/buildroot-2018.08.4/output/host/usr/bin/arm-linux-gcc
+CC=gcc -g
 # Libraries and dependencies
 
 INSTALL ?= install

diff --git a/software/deck.c b/software/deck.c
@@ -211,7 +211,7 @@ void deck_load_folder(struct deck *d, char *FolderName)
 	}
 	if (d->filesPresent)
 	{
-		//DumpFileStructure(FirstBeatFolder);
+		//DumpFileStructure(d->FirstFolder);
 		d->CurrentFolder = d->FirstFolder;
 		d->CurrentFile = d->CurrentFolder->FirstFile;
 		// Load first beat
@@ -248,6 +248,8 @@ void deck_next_file(struct deck *d)
 		printf("files present\n");
 		d->CurrentFile = d->CurrentFile->next;
 		load_track(d, track_acquire_by_import(d->importer, d->CurrentFile->FullPath));
+	} else {
+		printf("file not present\n");
 	}
 
 }
@@ -295,4 +297,4 @@ void deck_record(struct deck *d)
 {
 	if (deck[1].filesPresent)
 		d->player.recordingStarted = !d->player.recordingStarted;
-}
+}
diff --git a/software/sc_input.c b/software/sc_input.c
@@ -711,8 +711,8 @@ void process_pic()
 
 	if (!scsettings.disablevolumeadc)
 	{
-		deck[0].player.setVolume = (ADCs[2]) / 1024;
-		deck[1].player.setVolume = (ADCs[3]) / 1024;
+		deck[0].player.setVolume = ((double)ADCs[2]) / 1024;
+		deck[1].player.setVolume = ((double)ADCs[3]) / 1024;
 	}
 
 	faderCutPoint = faderOpen ? scsettings.faderclosepoint : scsettings.faderopenpoint; // Fader Hysteresis