Merge 8bf419a5bd into 8aaaac42cb

Waveform generation clock settings #255
Convert bitmaps to PNG format
2023-11-01 04:19:15 -07:00 · 2023-11-01 13:22:49 +11:00 · 2021-11-13 18:15:41 -06:00 · 2021-11-13 18:06:53 -06:00
11 changed files with 7 additions and 7 deletions
--- a/Desktop_Interface/buffer_0.bmp
+++ b/Desktop_Interface/buffer_0.bmp
--- a/Desktop_Interface/buffer_0.png
+++ b/Desktop_Interface/buffer_0.png
--- a/Desktop_Interface/buffer_1.bmp
+++ b/Desktop_Interface/buffer_1.bmp
--- a/Desktop_Interface/buffer_1.png
+++ b/Desktop_Interface/buffer_1.png
--- a/Desktop_Interface/buffer_2.bmp
+++ b/Desktop_Interface/buffer_2.bmp
--- a/Desktop_Interface/buffer_2.png
+++ b/Desktop_Interface/buffer_2.png
--- a/Desktop_Interface/genericusbdriver.cpp
+++ b/Desktop_Interface/genericusbdriver.cpp
@ -216,7 +216,7 @@ void genericUsbDriver::sendFunctionGenData(functionGen::ChannelID channelID)
    int validClockDivs[7] = {1, 2, 4, 8, 64, 256, 1024};
 	auto period = [&](int division) -> int
 	{
-		return CLOCK_FREQ / (division * channelData.samples.size() * channelData.freq);
+		return CLOCK_FREQ / (division * channelData.samples.size() * channelData.freq) - 0.5;
 	};

 	int* clkSettingIt = std::find_if(std::begin(validClockDivs), std::end(validClockDivs),
--- a/Desktop_Interface/resources.qrc
+++ b/Desktop_Interface/resources.qrc
@ -1,8 +1,8 @@
 <RCC>
    <qresource prefix="/bitmap">
-        <file>buffer_0.bmp</file>
-        <file>buffer_1.bmp</file>
-        <file>buffer_2.bmp</file>
+        <file>buffer_0.png</file>
+        <file>buffer_1.png</file>
+        <file>buffer_2.png</file>
        <file>diagram.png</file>
    </qresource>
 </RCC>
--- a/Desktop_Interface/resources/icon256/espotek-labrador.png
+++ b/Desktop_Interface/resources/icon256/espotek-labrador.png
--- a/Desktop_Interface/resources/icon48/espotek-labrador.png
+++ b/Desktop_Interface/resources/icon48/espotek-labrador.png
--- a/Desktop_Interface/ui_elements/buffercontrol.cpp
+++ b/Desktop_Interface/ui_elements/buffercontrol.cpp
@ -10,13 +10,13 @@ void bufferControl::refreshImage(void){

    switch(numBuffers){
    case 0:
-        bufferImage = QPixmap(":/bitmap/buffer_0.bmp");
+        bufferImage = QPixmap(":/bitmap/buffer_0.png");
        break;
    case 1:
-        bufferImage = QPixmap(":/bitmap/buffer_1.bmp");
+        bufferImage = QPixmap(":/bitmap/buffer_1.png");
        break;
    case 2:
-        bufferImage = QPixmap(":/bitmap/buffer_2.bmp");
+        bufferImage = QPixmap(":/bitmap/buffer_2.png");
        break;
    }
Author	SHA1	Message	Date
turboencabulator	9d48496cf5	Merge `8bf419a5bd` into `8aaaac42cb`	2023-11-01 04:19:15 -07:00
Chris Esposito	8aaaac42cb	Waveform generation clock settings #255	2023-11-01 13:22:49 +11:00
Kyle Guinn	8bf419a5bd	Convert bitmaps to PNG format Reduces file size by over 99% for the 3 buffer images.	2021-11-13 18:15:41 -06:00
Kyle Guinn	e8a854ee9b	Fix the 256x256 icon size Was an exact copy of the 48x48 icon. New file generated with the following command: convert PCB/labralogo.pretty/logo_edit.png -background '#008632' -resize 256x256 -gravity center -extent 256x256 -strip Desktop_Interface/resources/icon256/espotek-labrador.png Regenerate the 48x48 icon as well with a similar command since it reduces its file size by over a third.	2021-11-13 18:06:53 -06:00