Add timer initialisation

3 files changed, 123 insertions, 6 deletions

diff --git a/sw/Makefile b/sw/Makefile
index 06d8dd4..393725f 100644
--- a/sw/Makefile
+++ b/sw/Makefile
@@ -13,8 +13,8 @@ PROG = dragon_isp
 PART=atmega328
 AVRDUDE_PART=m328
 
-# Cpu frequency is 16MHz, divider = 2
-F_CPU="(16000000UL/2)"
+# Cpu frequency is 16MHz, divider = 8
+F_CPU="(16000000UL/8)"
 
 # Directory for built objects
 BUILD_DIR=build
@@ -47,6 +47,7 @@ vpath %.hex ./$(BUILD_DIR)
 
 # GCC flags
 CFLAGS=-g -mmcu=$(PART) -O1 -Wall -Werror -DF_CPU=$(F_CPU)
+CXXFLAGS=$(CFLAGS) -std=c++11
 INCLUDES=-I. -I$(LIB_DIR)
 
 
@@ -68,21 +69,21 @@ $(APP_HEX): %.hex: %.elf
 
 # Application ELF files
 $(APP_ELF): %.elf: $(LIB_OBJECTS) $(LIB_CXX_OBJECTS) $(LIB_ASM_OBJECTS) $(APP_OBJECTS) $(APP_CXX_OBJECTS)
-	$(CXX) $(CFLAGS) $(BUILT_OBJECTS) --output $(BUILD_DIR)/$@ -Wl,-Map,$(BUILD_DIR)/$(basename $@).map
+	$(CXX) $(CXXFLAGS) $(BUILT_OBJECTS) --output $(BUILD_DIR)/$@ -Wl,-Map,$(BUILD_DIR)/$(basename $@).map
 
 # Application objects builder
 $(APP_OBJECTS): %.o: %.c
 	$(CC) -c $(CFLAGS) $(INCLUDES) $< -o $(BUILD_DIR)/$(notdir $@)
 
 $(APP_CXX_OBJECTS): %.o: %.cpp
-	$(CXX) -c $(CFLAGS) $(INCLUDES) $< -o $(BUILD_DIR)/$(notdir $@)
+	$(CXX) -c $(CXXFLAGS) $(INCLUDES) $< -o $(BUILD_DIR)/$(notdir $@)
 
 # Application objects builder
 $(LIB_OBJECTS): %.o: $(LIB_DIR)/%.c
 	$(CC) -c $(CFLAGS) $(INCLUDES) $< -o $(BUILD_DIR)/$(notdir $@)
 
 $(LIB_CXX_OBJECTS): %.o: $(LIB_DIR)/%.cpp
-	$(CXX) -c $(CFLAGS) $(INCLUDES) $< -o $(BUILD_DIR)/$(notdir $@)
+	$(CXX) -c $(CXXFLAGS) $(INCLUDES) $< -o $(BUILD_DIR)/$(notdir $@)
 
 $(LIB_ASM_OBJECTS): %.o: $(LIB_DIR)/%.s
 	$(CC) -c $(CFLAGS) -x assembler-with-cpp $(INCLUDES) $< -o $(BUILD_DIR)/$(notdir $@)
@@ -92,7 +93,7 @@ $(LIB_ASM_OBJECTS): %.o: $(LIB_DIR)/%.s
 	$(CC) $(CFLAGS) $(INCLUDES) -Wa,-al $< > $@
 
 %.lst: %.cpp
-	$(CXX) $(CFLAGS) $(INCLUDES) -Wa,-al $< > $@
+	$(CXX) $(CXXFLAGS) $(INCLUDES) -Wa,-al $< > $@
 
 # Clean
 clean:
diff --git a/sw/README.rst b/sw/README.rst
new file mode 100644
index 0000000..3125cbb
--- /dev/null
+++ b/sw/README.rst
@@ -0,0 +1,29 @@
+Description logiciel
+====================
+
+TODO
+----
+
+- Initialiser GPIO
+  - Ecire des fonctions pour contrôler les relais
+  - Definir le comportement par defaut au démarrage, pas de glitch!
+- Mettre en place un timer 100Hz pour pouvoir faire dormir le CPU
+- Configurer SPI pour LTC2400
+- Initialiser entrées analogiques
+- Initialiser DS18B20
+- Initialiser UART (uniquement TX, on verra si on a besoin du RX plus tard)
+  - Décider quel protocole utiliser sur le port série
+- Mettre en place un watchdog
+- Utiliser l'EEPROM pour stocker le compteur
+  - Risque de problemes après 10000 écritures (Estimation)
+  - Faire une vérification lecture après écriture et communiquer le problème
+
+
+Reglages eFuse
+--------------
+
+- Low: Horloge externe, diviseur /8 actif
+- High: tout par défaut
+- Ext: Brownout detector: 4.3V
+
+Commande AVRdude equivalente: `-U lfuse:w:0x50:m -U hfuse:w:0xd9:m -U efuse:w:0xfc:m`
diff --git a/sw/main.cpp b/sw/main.cpp
index a021b96..1f053d0 100644
--- a/sw/main.cpp
+++ b/sw/main.cpp
@@ -28,9 +28,96 @@
 #include <avr/pgmspace.h>
 #include <avr/io.h>
 #include <avr/interrupt.h>
+#include <avr/sleep.h>
+
+// Definitions allocation pin
+#define PIN(x) (1 << x)
+
+/* ALL relay signals PINx_Kx have external pulldown.
+ * All pins whose name ends in 'n' are active low */
+
+// PORT B
+constexpr uint8_t PINB_STATUSn = PIN(0);
+// Pins 2,3,4,5 = SPI
+constexpr uint8_t PINB_SPI_LTC_CSn = PIN(2); // with external pullup
+constexpr uint8_t PINB_SPI_MOSI = PIN(3);
+constexpr uint8_t PINB_SPI_MISO = PIN(4);
+constexpr uint8_t PINB_SPI_SCK = PIN(5);
+
+constexpr uint8_t PINB_OUTPUTS =
+    PINB_STATUSn | PINB_SPI_SCK | PINB_SPI_MOSI | PINB_SPI_LTC_CSn;
+
+// PORT C
+constexpr uint8_t PINC_ADC0 = PIN(0);
+constexpr uint8_t PINC_ADC1 = PIN(1);
+constexpr uint8_t PINC_K3_RESET = PIN(2);
+constexpr uint8_t PINC_K3_SET = PIN(3);
+constexpr uint8_t PINC_K2_RESET = PIN(4);
+constexpr uint8_t PINC_K2_SET = PIN(5);
+
+constexpr uint8_t PINC_OUTPUTS =
+    PINC_K3_RESET | PINC_K3_SET |
+    PINC_K2_RESET | PINC_K2_SET;
+
+// PORT D
+// Pins 0,1 = UART RX,TX
+constexpr uint8_t PIND_UART_RX = PIN(0);
+constexpr uint8_t PIND_UART_TX = PIN(1);
+
+constexpr uint8_t PIND_ONEWIRE = PIN(4); // with exteral pullup
+
+constexpr uint8_t PIND_K1_RESET = PIN(5);
+constexpr uint8_t PIND_K1_SET = PIN(6);
+
+constexpr uint8_t PIND_OUTPUTS =
+    PIND_UART_TX |
+    PIND_K1_RESET | PIND_K1_SET;
+
+
+/* Assuming F_CPU at 16MHz / 8:
+ *
+ * overflow for 100ms: F_CPU [ticks/s] / prescaler [unit-less] * interval [s] = [ticks/s*s] = [ticks]
+ * interval [s] = 0.1 = 1 / 10
+ *
+ * Actual interval after rounding:
+ * interval [s] = overflow [ticks] / (F_CPU [ticks/s] / prescaler [unit-less])
+ *              = 99.84 ms
+ */
+volatile uint8_t timer_counter; /* Timer */
+
+ISR(TIMER0_COMPA_vect)
+{
+    timer_counter++;
+}
 
 int main()
 {
+    /* Setup GPIO */
+    // Active-low outputs must be high
+    PORTB = PINB_STATUSn | PINB_SPI_LTC_CSn;
+    PORTC = 0;
+    PORTD = 0;
+
+    // Enable output
+    DDRB = PINB_OUTPUTS;
+    DDRC = PINC_OUTPUTS;
+    DDRD = PIND_OUTPUTS;
+
+    /* Setup 100Hz timer */
+    TCCR0B |= (1 << WGM02); // Set timer mode to CTC (datasheet 15.7.2)
+    TIMSK0 |= (1 << TOIE0); // enable overflow interrupt
+    OCR0A = (uint8_t)(F_CPU / 1024 / 10); // Overflow at 99.84 ms
+    TCCR0B |= (1 << CS02) | (1 << CS00); // Start timer at Fcpu/1024
+
+    /* Enable interrupts */
+    sei();
+
+    /* Put the CPU to sleep */
+    set_sleep_mode(SLEEP_MODE_IDLE);
+    sleep_enable();
+    while (true) {
+        sleep_cpu();
+    }
 
     return 0;
 }