Bugfix 01.02.01

ThBreuer · ThBreuer · commit 018e85f0e7b7 · 2024-01-11T12:32:51.000+01:00
diff --git a/Doc/Doc.zip b/Doc/Doc.zip
diff --git a/Doc/EmbSysLib-Manual.pdf b/Doc/EmbSysLib-Manual.pdf
diff --git a/Example/Project/Virtual/CodeBlocks/Virtual.cbp b/Example/Project/Virtual/CodeBlocks/Virtual.cbp
@@ -61,6 +61,7 @@
 			<Add library="${EMBSYSLIB}/Src/Hardware/MCU/Virtual/Sys/libusb-1.0.a" />
 		</Linker>
 		<Unit filename="../../../Src/Board/Virtual/ReportHandler.h" />
+		<Unit filename="../../../Src/Board/Virtual/board_pinout.txt" />
 		<Unit filename="../../../Src/lib.cpp" />
 		<Unit filename="../../../Src/main.cpp" />
 		<Extensions>
diff --git a/Example/Project/Virtual/_VirtualDeviceServer.bat b/Example/Project/Virtual/_VirtualDeviceServer.bat
@@ -1 +1 @@
-start "%EMBSYSLIB%\Tools\VirtualDeviceServer.exe" -d 320x240 -p 1000 -c "VirtualDeviceServer.config.txt"
+start "" "%EMBSYSLIB%\Tools\VirtualDeviceServer.exe" -d 320x240 -p 1000 -c "VirtualDeviceServer.config.txt"
diff --git a/Example/Src/Main/Device/DevDigital.cpp b/Example/Src/Main/Device/DevDigital.cpp
@@ -24,7 +24,7 @@ Usage:    Connect board with a terminal.
 #include "config.h"
 
 //*******************************************************************
-int main(void)
+int main( void )
 {
   terminal.printf( "\r\n\nDevDigital," __DATE__ "," __TIME__ "\r\n\n" );
 
diff --git a/Example/Src/Main/Hardware/HwUSBhost.cpp b/Example/Src/Main/Hardware/HwUSBhost.cpp
@@ -18,12 +18,15 @@ Code:     Select control or interrupt transfer with
 */
 
 //*******************************************************************
-#define CTRL          1
-#define INTER         2
+#define USB_CTRL          1
+#define USB_INTER         2
+
+#define USB_DEVICE_ENABLE
+
 
 ///------------------------------------------------------------------
 /// Select an USB transfer type (CTRL|INTER):
-#define TRANSFER_TYPE INTER
+#define TRANSFER_TYPE USB_INTER
 
 //*******************************************************************
 #include <stdio.h>
@@ -49,7 +52,7 @@ int main(int argc, char** argv)
   {
     bool err = true;
 
-    #if TRANSFER_TYPE == INTER
+    #if TRANSFER_TYPE == USB_INTER
     //------------------------
     if( usb.writeInterrupt( writeBuffer ) )
     {
@@ -61,7 +64,7 @@ int main(int argc, char** argv)
       }
     }
 
-    #elif TRANSFER_TYPE == CTRL
+    #elif TRANSFER_TYPE == USB_CTRL
     //------------------------
     if( usb.writeCtrl( writeBuffer ) )
     {
diff --git a/Src/Control/DigitalEncoder.h b/Src/Control/DigitalEncoder.h
@@ -33,7 +33,7 @@ The FIFO can be read out asynchronously.
 
 \example CtrlDigitalEncoder.cpp
 */
-class DigitalEncoder : public TaskManager::Task
+class DigitalEncoder : protected TaskManager::Task
 {
   public:
     //---------------------------------------------------------------
@@ -80,15 +80,15 @@ class DigitalEncoder : public TaskManager::Task
     //
     //---------------------------------------------------------------
     // Checks Ctrl-Button.
-    // The default implementation returns the event CTRL_DWN or 
-    // CTRL_UP if the button was pressed/released, otherwise NONE. 
+    // The default implementation returns the event CTRL_DWN or
+    // CTRL_UP if the button was pressed/released, otherwise NONE.
     // The method can be overridden.
     //
     virtual Event getCtrl( void );
 
     //---------------------------------------------------------------
     // Checks Increment (Right/Left).
-    // Returns LEFT, RIGHT, NONE depending on the event. 
+    // Returns LEFT, RIGHT, NONE depending on the event.
     // Abstract method that must be implemented by derived class.
     virtual Event getIncrement( void ) = 0;
 
diff --git a/Src/Control/DigitalIndicator.cpp b/Src/Control/DigitalIndicator.cpp
@@ -88,7 +88,6 @@ void DigitalIndicator::blink( WORD time, WORD duty )
   repeat    = true;
   maximum   = ((DWORD)time*1000)/cycleTime;
   limit     = ((DWORD)MIN(duty,(WORD)100))*maximum/100;
-  t         = 0;
   runUpdate = true;
 }
 
diff --git a/Src/Device/Digital/Digital.h b/Src/Device/Digital/Digital.h
@@ -22,7 +22,7 @@ namespace Dev {
 /*!
 \class   Digital
 
-\brief   Access to a digital GPIO port pin
+\brief   Access to a digital port pin
 
 This class is an interface to digital I/O devices.
 
diff --git a/Src/Hardware/Common/Display/DisplayGraphic.cpp b/Src/Hardware/Common/Display/DisplayGraphic.cpp
@@ -34,9 +34,9 @@ DisplayGraphic::DisplayGraphic( WORD moduleId,
 , report( moduleId )
 {
   Hsize = width;
-	Vsize = height;
+  Vsize = height;
 
-  BackColor  = RGB2color(  0,  0,255);  // Blue
+  BackColor  = RGB2color(  0,  0,  0);  // Black
   PaintColor = RGB2color(128,128,128);  // Gray
   TextColor  = RGB2color(255,255,255);  // White
 
diff --git a/Src/Hardware/MCU/STM32L1xx/Src/USBdevice_Mcu.cpp b/Src/Hardware/MCU/STM32L1xx/Src/USBdevice_Mcu.cpp
@@ -42,10 +42,10 @@ typedef struct
 {
     struct
     {
-      WORD addr;
-      WORD reserved2;
-      WORD count;
-      WORD reserved1;
+      volatile WORD addr;
+      volatile WORD reserved2;
+      volatile WORD count;
+      volatile WORD reserved1;
     } bufDesc[16];
 
 } USB_BufferDescriptionTable;
@@ -66,7 +66,7 @@ typedef struct
 //*******************************************************************
 //-------------------------------------------------------------------
 USBdevice_Mcu *USBdevice_Mcu::usbPtr = 0;
-WORD           USBdevice_Mcu::EPconfig::offset = sizeof(USB_BufferDescriptionTable);
+volatile WORD           USBdevice_Mcu::EPconfig::offset = sizeof(USB_BufferDescriptionTable);
 
 //-------------------------------------------------------------------
 USBdevice_Mcu::USBdevice_Mcu( USBdeviceDescriptor &desc )
@@ -79,7 +79,7 @@ USBdevice_Mcu::USBdevice_Mcu( USBdeviceDescriptor &desc )
 //-------------------------------------------------------------------
 inline void USBdevice_Mcu::isr(void)
 {
-  DWORD istr = USB->ISTR;
+  volatile DWORD istr = USB->ISTR;
 
   if( istr & USB_ISTR_RESET )
   {
@@ -257,7 +257,7 @@ WORD USBdevice_Mcu::readEP( BYTE  epAddr,
                             WORD  len )
 {
   BYTE  num = epAddr & 0x07;
-  WORD *ptr = EP[num].rxPtr;
+  volatile WORD *ptr = EP[num].rxPtr;
 
   if( !(epAddr & 0x80) && ptr )
   {
@@ -284,7 +284,7 @@ WORD USBdevice_Mcu::writeEP( BYTE  epAddr,
                              WORD  cnt )
 {
   BYTE  num = epAddr & 0x07;
-  WORD *ptr = EP[num].txPtr;
+  volatile WORD *ptr = EP[num].txPtr;
 
   if( (epAddr & 0x80) && ptr)
   {
diff --git a/Src/Hardware/MCU/STM32L1xx/Src/USBdevice_Mcu.h b/Src/Hardware/MCU/STM32L1xx/Src/USBdevice_Mcu.h
@@ -87,16 +87,16 @@ class USBdevice_Mcu : public USBdevice
         void setSTAT_TX(DWORD stat );
 
         //-----------------------------------------------------------
-        DWORD  config;
-        DWORD *regPtr;
-        DWORD  addr;
-        WORD   rxSize;
-        WORD   txSize;
-        WORD  *txPtr;
-        WORD  *rxPtr;
+        volatile DWORD  config;
+        volatile DWORD *regPtr;
+        volatile DWORD  addr;
+        volatile WORD   rxSize;
+        volatile WORD   txSize;
+        volatile WORD  *txPtr;
+        volatile WORD  *rxPtr;
 
         //------------------------------------------------------------
-        static WORD offset;
+        volatile static WORD offset;
 
     };  //class EPconfig
     //***************************************************************
diff --git a/Src/Hardware/MCU/STM32L1xx/System.cpp b/Src/Hardware/MCU/STM32L1xx/System.cpp
@@ -180,7 +180,10 @@ void SystemInit( void )
 
   // Power Control Register
   PWR->CR = PWR_CR_VOS_0;             // Voltage scaling range selection: range 1 (1.8 V)
-  while( PWR->CSR & PWR_CSR_VOSF );   // Wait until voltage regulator is ready
+  while( PWR->CSR & PWR_CSR_VOSF )    // Wait until voltage regulator is ready
+  {
+    asm volatile("nop");
+  }
 
   // Clock Configuration Register
   RCC->CFGR |= RCC_CFGR_HPRE_DIV1;    // AHB prescaler:                   HCLK  = SYSCLK
@@ -256,14 +259,21 @@ void SystemInit( void )
         RCC->CR |= (RCC_CR_HSEON | RCC_CR_HSEBYP);
       #endif
       const DWORD pll_Src = RCC_CFGR_PLLSRC_HSE;
-      while( !(RCC->CR & RCC_CR_HSERDY) ); // wait for HSE ready
-  
+      while( !(RCC->CR & RCC_CR_HSERDY) ) // wait for HSE ready
+      {
+        asm volatile("nop");
+      }
+
   //--- HSI --------------------------------------------------------
   #elif OSCSRC == HSI
 
       RCC->CR |= RCC_CR_HSION;
       const DWORD pll_Src = RCC_CFGR_PLLSRC_HSI;
-      while( !(RCC->CR & RCC_CR_HSIRDY) ); // wait for HSI ready
+      while( !(RCC->CR & RCC_CR_HSIRDY) ) // wait for HSI ready
+      {
+        asm volatile("nop");
+      }
+
       #undef  OSCFREQ
       #define OSCFREQ 16000
 
@@ -304,13 +314,20 @@ void SystemInit( void )
 
   // Clock control register
   RCC->CR |= RCC_CR_PLLON;            // PLL enable: ON
-  while( !(RCC->CR & RCC_CR_PLLRDY) );// Wait until PLL is ready
+  while( !(RCC->CR & RCC_CR_PLLRDY) )// Wait until PLL is ready
+  {
+    asm volatile("nop");
+  }
 
   // Clock Configuration Register
   RCC->CFGR |= RCC_CFGR_SW_PLL;       // System clock switch: PLL used as system clock
 
   // Wait for system clock switch is ready
-  while( (RCC->CFGR & RCC_CFGR_SWS) != RCC_CFGR_SWS_PLL );
+  while( (RCC->CFGR & RCC_CFGR_SWS) != RCC_CFGR_SWS_PLL )
+  {
+    asm volatile("nop");
+  }
+
 
   //<<< Enable HSE or clock, set PLL <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
diff --git a/Src/Module/USB/USB_Uart.h b/Src/Module/USB/USB_Uart.h
@@ -8,8 +8,8 @@ License: See file "LICENSE"
 */
 
 //*******************************************************************
-#ifndef _HW_USB_Uart_H
-#define _HW_USB_Uart_H
+#ifndef _MOD_USB_Uart_H
+#define _MOD_USB_Uart_H
 
 //*******************************************************************
 #include "Mcu_Types.h"
diff --git a/Src/Module/USB/USBdeviceSimpleIO.h b/Src/Module/USB/USBdeviceSimpleIO.h
@@ -8,8 +8,8 @@ License: See file "LICENSE"
 */
 
 //*******************************************************************
-#ifndef _HW_USB_DEVICE_SIMPLE_IO_H
-#define _HW_USB_DEVICE_SIMPLE_IO_H
+#ifndef _MOD_USB_DEVICE_SIMPLE_IO_H
+#define _MOD_USB_DEVICE_SIMPLE_IO_H
 
 //*******************************************************************
 namespace EmbSysLib {
diff --git a/Src/Module/USB/USBinterfClassHID.h b/Src/Module/USB/USBinterfClassHID.h
@@ -8,8 +8,8 @@ License: See file "LICENSE"
 */
 
 //*******************************************************************
-#ifndef _HW_USB_INTERF_CLASS_HID_H
-#define _HW_USB_INTERF_CLASS_HID_H
+#ifndef _MOD_USB_INTERF_CLASS_HID_H
+#define _MOD_USB_INTERF_CLASS_HID_H
 
 //*******************************************************************
 namespace EmbSysLib {
diff --git a/Version.txt b/Version.txt
@@ -1,3 +1,13 @@
+ver-01.02.01
+============
+* Bug fix: 
+    - Additional "" in batch files starting an app
+    - typo corrected
+    - #defines corrected (name missmatch)
+    - DisplayGraphic default black background
+    - STM32L1xx: asm("NOP") and "volatile" added to avoid compiler optimization
+    - Missing ATmega Documentation
+    
 ver-01.02.00
 ============
 * Bug fix: 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-start "%EMBSYSLIB%\Tools\VirtualDeviceServer.exe" -d 320x240 -p 1000 -c "VirtualDeviceServer.config.txt"`
	`1`	`+start "" "%EMBSYSLIB%\Tools\VirtualDeviceServer.exe" -d 320x240 -p 1000 -c "VirtualDeviceServer.config.txt"`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ Usage: Connect board with a terminal.`
`24`	`24`	`#include "config.h"`
`25`	`25`
`26`	`26`	`//*******************************************************************`
`27`		`-int main(void)`
	`27`	`+int main( void )`
`28`	`28`	`{`
`29`	`29`	`terminal.printf( "\r\n\nDevDigital," __DATE__ "," __TIME__ "\r\n\n" );`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ void DigitalIndicator::blink( WORD time, WORD duty )`
`88`	`88`	`repeat = true;`
`89`	`89`	`maximum = ((DWORD)time*1000)/cycleTime;`
`90`	`90`	`limit = ((DWORD)MIN(duty,(WORD)100))*maximum/100;`
`91`		`- t = 0;`
`92`	`91`	`runUpdate = true;`
`93`	`92`	`}`
`94`	`93`