💥 emergency commit

csrohit · csrohit · commit 5cec9e117252 · 2022-12-06T12:06:59.000+05:30
diff --git a/cpp/.vscode/c_cpp_properties.json b/cpp/.vscode/c_cpp_properties.json
@@ -3,12 +3,14 @@
         {
             "name": "STM32",
             "includePath": [
-                "${workspaceFolder}/**"
+                "${workspaceFolder}/**",
+                "${workspaceFolder}/lib/usart",
+                "${workspaceFolder}/lib/**"
             ],
             "defines": [
                 "STM32F103xB"
             ],
-            "compilerPath": "/usr/bin/arm-none-eabi-gcc",
+            "compilerPath": "/Applications/ARM/bin/arm-none-eabi-gcc",
             "cStandard": "gnu17",
             "cppStandard": "gnu++17",
             "intelliSenseMode": "gcc-arm"
diff --git a/cpp/.vscode/launch.json b/cpp/.vscode/launch.json
@@ -7,7 +7,7 @@
         {
             "name": "Cortex Debug",
             "cwd": "${workspaceFolder}",
-            "executable": "./build/dma-usart.elf",
+            "executable": "./build/blink.elf",
             "request": "launch",
             "type": "cortex-debug",
             "runToEntryPoint": "main",
diff --git a/cpp/Makefile b/cpp/Makefile
@@ -15,9 +15,9 @@ CXXSTD		:= c++17
 
 # Project specific configuration
 BUILD_DIR 	:= build
-BUILD_TYPE	?= Debug
+BUILD_TYPE	?= Release
 SRC_DIR 	:= src lib/gpio
-INC_DIRS	= include lib/gpio
+INC_DIRS	= include lib/gpio lib/usart lib/system
 
 
 PREFIX		?= arm-none-eabi
@@ -47,17 +47,22 @@ INC_FLAGS 	= $(addprefix -I,$(INC_DIRS))
 
 # Target-specific flags
 CPU_FLAGS	?= -mfloat-abi=$(FLOAT_ABI) -m$(INSTR_SET) -mcpu=$(CPU)
+CPPFLAGS	?=$(DEFS) $(INC_FLAGS) -MMD 
 
-CPPFLAGS	?= -MMD $(DEFS) $(INC_FLAGS)
-CFLAGS		?=$(CPU_FLAGS) $(OPT)
-CXXFLAGS 	:=$(CFLAGS) -fno-exceptions -fno-rtti
-LDFLAGS		?=$(CPU_FLAGS)
-
+ifeq ($(BUILD_TYPE), Debug)
+CFLAGS 		+= -g -gdwarf-2
+CXXFLAGS 	+= -g -gdwarf-2
+LDFLAGS 	+= -g -gdwarf-2
 
+else
+CFLAGS		+= $(OPT)
+CXXFLAGS	+= $(OPT)
+ASFLAGS		+= $(OPT)
+endif
 
 # Do not link stdlib with executable
 CFLAGS		+= -nostdlib -fno-tree-loop-distribute-patterns -fdata-sections -ffunction-sections
-CXXFLAGS	+= -nostdlib -fno-tree-loop-distribute-patterns -fdata-sections -ffunction-sections
+CXXFLAGS	+= -nostdlib -fno-tree-loop-distribute-patterns -fdata-sections -ffunction-sections  -fno-exceptions -fno-rtti
 LDFLAGS		+= -nostdlib -fno-tree-loop-distribute-patterns 
 
 
@@ -69,15 +74,15 @@ CXXFLAGS	+= -Wall -Wextra -Wundef -Wshadow -Wredundant-decls -Weffc++ -Werror
 LDFLAGS		+= -T $(LDSCRIPT)
 LDFLAGS		+= -Wl,-Map=$(basename $@).map
 
-all: size bin
-size: $(BUILD_DIR)/$(TARGET).size
-elf: $(BUILD_DIR)/$(TARGET).elf
-bin: $(BUILD_DIR)/$(TARGET).bin
-hex: $(BUILD_DIR)/$(TARGET).hex
-srec: $(BUILD_DIR)/$(TARGET).srec
-list: $(BUILD_DIR)/$(TARGET).list
+all		: size bin
+size	: $(BUILD_DIR)/$(TARGET).size
+elf		: $(BUILD_DIR)/$(TARGET).elf
+bin		: $(BUILD_DIR)/$(TARGET).bin
+hex		: $(BUILD_DIR)/$(TARGET).hex
+srec	: $(BUILD_DIR)/$(TARGET).srec
+list	: $(BUILD_DIR)/$(TARGET).list
 
-asm: $(ASMS)
+asm		: $(ASMS)
 
 
 %.size: %.elf
@@ -90,21 +95,21 @@ asm: $(ASMS)
 $(BUILD_DIR)/%.s:%.cpp
 	@mkdir -p $(dir $@)
 	@echo "AS" $< " ==> " $@
-	$(CXX) $(CPPFLAGS) $(CXXLAGS) -o $@ -S $<
+	$(CXX) $(CPU_FLAGS) $(CPPFLAGS) $(CXXLAGS) -o $@ -S $<
 
 $(BUILD_DIR)/%.o:%.c
 	@mkdir -p $(dir $@)
 	@echo "CC" $< " ==> " $@
-	$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
+	$(CC) $(CPU_FLAGS) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 
 $(BUILD_DIR)/%.o:%.cpp
 	@mkdir -p $(dir $@)
 	@echo "CXX" $< " ==> " $@
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
+	$(CXX) $(CPU_FLAGS) $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
 	
 $(BUILD_DIR)/$(TARGET).elf: $(OBJS)
 	@echo "Linking sources into "$@
-	$(CC) $(LDFLAGS) -o $@ $^
+	$(CC) $(CPU_FLAGS) $(LDFLAGS) -o $@ $^
 
 
 flash: bin
diff --git a/cpp/lib/dma/dma.cpp b/cpp/lib/dma/dma.cpp
diff --git a/cpp/lib/dma/dma.hpp b/cpp/lib/dma/dma.hpp
diff --git a/cpp/lib/gpio/gpio.hpp b/cpp/lib/gpio/gpio.hpp
@@ -20,6 +20,7 @@
 #include <stm32f1xx.h>
 #include <stdint.h>
 
+#pragma once
 class GPIO
 {
 public:
@@ -111,19 +112,10 @@ class GPIO
     GPIO(GPIO_TypeDef *port, PIN newPin) : pin{newPin}, PORT{port} {}
 
     /**
-     * @brief Enable clock source for Port A
-     */
-    static void enable_PortA();
-
-    /**
-     * @brief Enable clock source for Port B
-     */
-    static void enable_PortB();
-
-    /**
-     * @brief Enable clock source for Port C
+     * @brief Enable Clock source for GPIO port
+     * @param port GPIO port instance
      */
-    static void enable_PortC();
+    constexpr static void enable_port(GPIO_TypeDef *port);
 
     /**
      * @brief Destroy the GPIO object
@@ -169,11 +161,20 @@ inline GPIO &GPIO::operator=(const GPIO &gpio)
     return *this;
 }
 
-inline void GPIO::enable_PortA() { RCC->APB2ENR |= RCC_APB2ENR_IOPAEN; }
-inline void GPIO::enable_PortB() { RCC->APB2ENR |= RCC_APB2ENR_IOPBEN; }
-inline void GPIO::enable_PortC()
+constexpr inline void GPIO::enable_port(GPIO_TypeDef *port)
 {
-    RCC->APB2ENR |= RCC_APB2ENR_IOPCEN;
+    if (port == GPIOA)
+    {
+        RCC->APB2ENR |= RCC_APB2ENR_IOPAEN;
+    }
+    else if (port == GPIOB)
+    {
+        RCC->APB2ENR |= RCC_APB2ENR_IOPBEN;
+    }
+    else if (port == GPIOC)
+    {
+        RCC->APB2ENR |= RCC_APB2ENR_IOPCEN;
+    }
 }
 
 inline void GPIO::setMode(MODE mode)
@@ -211,8 +212,8 @@ inline void GPIO::setConfig(GPIO_TypeDef *port, PIN newPin, CNF config)
     }
 }
 
-inline void GPIO::toggle() { this->PORT->ODR ^= 1 << this->pin; };
-inline void GPIO::toggle(GPIO_TypeDef *port, PIN newPin) { port->ODR ^= 1 << newPin; };
+inline void GPIO::toggle() { this->PORT->ODR ^= 1 << this->pin; }
+inline void GPIO::toggle(GPIO_TypeDef *port, PIN newPin) { port->ODR ^= 1 << newPin; }
 
 inline void GPIO::write(PIN_STATE state)
 {
diff --git a/cpp/lib/system/system.cpp b/cpp/lib/system/system.cpp
@@ -0,0 +1,9 @@
+#include<system.hpp>
+
+
+uint32_t Core::clock = 8000000U;
+volatile uint32_t Core::ms_ticks = 0;
+
+void SysTick_Handler(void){
+    Core::ms_ticks ++;
+}
diff --git a/cpp/lib/system/system.hpp b/cpp/lib/system/system.hpp
@@ -0,0 +1,16 @@
+#include <stm32f1xx.h>
+
+namespace Core
+{
+    uint32_t clock;
+    volatile uint32_t ms_ticks;
+} // namespace Core
+
+void delay_ms(uint32_t ms)
+{
+    uint64_t final = ms + Core::ms_ticks;
+    while (Core::ms_ticks < final)
+    {
+        __asm("nop");
+    }
+}
diff --git a/cpp/lib/uart/usart.hpp b/cpp/lib/uart/usart.hpp
diff --git a/cpp/lib/usart/usart.cpp b/cpp/lib/usart/usart.cpp
diff --git a/cpp/lib/usart/usart.hpp b/cpp/lib/usart/usart.hpp
@@ -0,0 +1,70 @@
+#pragma once
+#include <stm32f1xx.h>
+#include <system.hpp>
+
+typedef USART_TypeDef usart_t;
+class USART
+{
+public:
+    enum Feature : uint8_t{
+    Transmitter,
+    Receiver,
+    TransmitterInterrupt,
+    ReceiverInterrupt,
+    TransmitterDMARequest,
+    ReceiverDMARequest
+};
+
+private:
+    USART_TypeDef *usart;
+
+public:
+    USART(USART_TypeDef *new_usart) : usart{new_usart} {};
+    USART(const USART &old_usart) : usart{old_usart.usart} {};
+    USART& operator=(const USART & p_usart);
+    static void set_baudrate(usart_t * p_usart, uint32_t baud_rate);
+
+    static void enable(usart_t *p_usart, Feature feature);
+    ~USART();
+};
+
+USART::~USART()
+{
+}
+
+inline USART& USART::operator=(const USART &new_usart){
+    usart = new_usart.usart;
+    return *this;
+}
+
+
+
+inline void set_baudrate(usart_t * p_usart, uint32_t baud_rate){
+    p_usart->BRR = (uint32_t) baud_rate/Core::clock;
+}
+
+inline void USART::enable(usart_t *p_usart, Feature feature)
+{
+    switch (feature)
+    {
+    case Feature::Transmitter:
+        p_usart->CR1 |= USART_CR1_TE;
+        break;
+    case Feature::Receiver:
+        p_usart->CR1 |= USART_CR1_RE;
+        break;
+    case Feature::TransmitterInterrupt:
+        p_usart->CR1 |= USART_CR1_TXEIE;
+        break;
+    case Feature::ReceiverInterrupt:
+        p_usart->CR1 |= USART_CR1_RXNEIE;
+        break;
+    case Feature::TransmitterDMARequest:
+        p_usart->CR3 |= USART_CR3_DMAT;
+        break;
+    case Feature::ReceiverDMARequest:
+        p_usart->CR3 |= USART_CR3_DMAR;
+        break;
+    }
+}
+
diff --git a/cpp/src/main.cpp b/cpp/src/main.cpp
@@ -1,27 +1,22 @@
 #include <stdio.h>
 #include <stm32f1xx.h>
 #include <gpio.hpp>
-
-
-void ms_delay(int ms)
-{
-  while (ms-- > 0)
-  {
-    volatile int x = 500;
-    while (x-- > 0)
-      __asm("nop");
-  }
-}
+// #include <system.hpp>
+#include <usart.hpp>
 
 int main(void)
 {
-  GPIO::enable_PortC();
-  ms_delay(500);
+  USART::enable(USART1, USART::TransmitterDMARequest);
+  // delay = 200;
+  // SysTick_Config(Core::clock/1000);
+  // NVIC_EnableIRQ(SysTick_IRQn);
+
+  // GPIO::enable_port(GPIOC);
   // GPIO::setMode(GPIOC, GPIO::PIN_13,GPIO::OUTPUT_2MHZ);
   // GPIO::setConfig(GPIOC, GPIO::PIN_13,GPIO::OUTPUT_PUSH_PULL);
   // while (1)
   // {
   //   GPIO::toggle(GPIOC, GPIO::PIN_13);
-  //   ms_delay(1000U);
+  //   delay_ms(delay);
   // }
 }
diff --git a/cpp/src/startup_stm32f103.cpp b/cpp/src/startup_stm32f103.cpp
@@ -181,28 +181,24 @@ void Default_Handler(void)
 // Command: reset memory and restart user program
 [[noreturn]] void Reset_Handler(void)
 {
-  // copy .data section to SRAM
-  uint32_t data_size = (uint32_t)&_edata - (uint32_t)&_sdata;
-  
-  std::copy(&_la_data, &_la_data + data_size, &_sdata);
 
-  // init. the .bss section to zero in SRAM
-  std::fill(&_sbss, &_ebss, 0);
+  uint32_t *start_sram = (uint32_t *)&_sdata;
+  uint32_t *start_flash = (uint32_t *)&_la_data;
+  while (start_sram < (uint32_t *)&_edata)
+  {
+    *start_sram++ = *start_flash++;
+  }
+
+  uint32_t *start_bss = (uint32_t *)&_sbss;
+  while (start_bss < (uint32_t *)&_ebss)
+  {
+    *start_bss++ = 0;
+  }
 
   // now invoke main
   main();
   while (1)
   {
     __asm("nop");
   }
-  
-}
-
-void *memcpy(void *dest, const void *src, size_t n)
-{
-    for (size_t i = 0; i < n; i++)
-    {
-        ((char*)dest)[i] = ((char*)src)[i];
-    }
-    return dest;
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`{`
`8`	`8`	`"name": "Cortex Debug",`
`9`	`9`	`"cwd": "${workspaceFolder}",`
`10`		`- "executable": "./build/dma-usart.elf",`
	`10`	`+ "executable": "./build/blink.elf",`
`11`	`11`	`"request": "launch",`
`12`	`12`	`"type": "cortex-debug",`
`13`	`13`	`"runToEntryPoint": "main",`