Merge branch 'master' of [email protected]:pichenettes/avril

gpio.h

@@ -175,8 +175,8 @@ SetupGpio(22, PortC, NoPwmChannel, 6);
 SetupGpio(23, PortC, NoPwmChannel, 7);
 
 const uint8_t kSpiSlaveSelectPin = 4;
-const uint8_t kSpiDataOutPin = 5;
-const uint8_t kSpiDataInPin = 6;
+const uint8_t kSpiMosiPin = 5;
+const uint8_t kSpiMisoPin = 6;
 const uint8_t kSpiClockPin = 7;
 
 #else
@@ -204,8 +204,8 @@ SetupGpio(18, PortC, NoPwmChannel, 4);
 SetupGpio(19, PortC, NoPwmChannel, 5);
 
 const uint8_t kSpiSlaveSelectPin = 10;
-const uint8_t kSpiDataOutPin = 11;
-const uint8_t kSpiDataInPin = 12;
+const uint8_t kSpiMosiPin = 11;
+const uint8_t kSpiMisoPin = 12;
 const uint8_t kSpiClockPin = 13;
 
 #endif  // ATMEGA328P

parallel_io.h

@@ -29,7 +29,9 @@ namespace avrlib {
 enum ParallelPortMode {
   PARALLEL_BYTE,
   PARALLEL_NIBBLE_HIGH,
-  PARALLEL_NIBBLE_LOW
+  PARALLEL_NIBBLE_LOW,
+  PARALLEL_TRIPLE_HIGH,
+  PARALLEL_TRIPLE_LOW
 };
 
 template<ParallelPortMode mode>
@@ -56,6 +58,22 @@ struct ShiftMasks<PARALLEL_NIBBLE_LOW> {
   };
 };
 
+template<>
+struct ShiftMasks<PARALLEL_TRIPLE_HIGH> {
+  enum Masks {
+    mask = 0x78,
+    shift = 3,
+  };
+};
+
+template<>
+struct ShiftMasks<PARALLEL_TRIPLE_LOW> {
+  enum Masks {
+    mask = 0x07,
+    shift = 0,
+  };
+};
+
 template<typename Port, ParallelPortMode parallel_mode = PARALLEL_BYTE>
 struct ParallelPort {
   typedef ShiftMasks<parallel_mode> Masks;

spi.h

@@ -25,7 +25,6 @@
 //   around 15 cycles (not including the interrupt prelude/postlude), which is
 //   close to the transmission time at the fastest speed.
 // - the atmega is always configured as a master.
-// - no support for reading back from the slave.
 
 #ifndef AVRLIB_SPI_H_
 #define AVRLIB_SPI_H_
@@ -42,7 +41,7 @@ typedef BitInRegister<SPSRRegister, SPIF> TransferComplete;
 template<uint8_t slave_select_pin = 10,
          DataOrder order = MSB_FIRST,
          uint8_t speed = 4>
-class Spi {
+class SPIMaster {
  public:
   enum {
     buffer_size = 0,
@@ -105,11 +104,54 @@ class Spi {
  private:
   typedef Gpio<slave_select_pin> SlaveSelect;
   typedef Gpio<kSpiSlaveSelectPin> GlobalSlaveSelect;
-  typedef Gpio<kSpiDataOutPin> DataOut;
-  typedef Gpio<kSpiDataInPin> DataIn;
+  typedef Gpio<kSpiMosiPin> DataOut;
+  typedef Gpio<kSpiMisoPin> DataIn;
   typedef Gpio<kSpiClockPin> Clock;
 };
 
+template<uint8_t slave_select_pin = 10,
+         DataOrder order = MSB_FIRST,
+         bool enable_interrupt = false>
+class SPISlave {
+ public:
+  enum {
+    buffer_size = 128,
+    data_size = 8
+  };
+
+  static void Init() {
+    Clock::set_mode(DIGITAL_INPUT);
+    DataIn::set_mode(DIGITAL_INPUT);
+    DataOut::set_mode(DIGITAL_OUTPUT);
+    GlobalSlaveSelect::set_mode(DIGITAL_INPUT);  // Ohhh mistress, ohhhh!
+    SlaveSelect::set_mode(DIGITAL_INPUT);
+
+    // SPI enabled, configured as master.
+    uint8_t configuration = _BV(SPE);
+    if (order == LSB_FIRST) {
+      configuration |= _BV(DORD);
+    }
+    if (enable_interrupt) {
+      configuration |= _BV(SPIE);
+    }
+    SPCR = configuration;
+  }
+
+  static inline uint8_t Read(uint8_t v) {
+    while (!TransferComplete::value());
+    return SPDR;
+  }
+
+ private:
+  typedef Gpio<slave_select_pin> SlaveSelect;
+  typedef Gpio<kSpiSlaveSelectPin> GlobalSlaveSelect;
+  typedef Gpio<kSpiMisoPin> DataOut;
+  typedef Gpio<kSpiMosiPin> DataIn;
+  typedef Gpio<kSpiClockPin> Clock;
+};
+
+#define SPI_RECEIVE ISR(SPI_STC_vect)
+
 }  // namespace avrlib
 
 #endif AVRLIB_SPI_H_

tools/resources_compiler.py

@@ -57,6 +57,8 @@ def Canonicalize(x):
       out_chr[i] = ord('x')
     elif chr(i) == '"':
       out_chr[i] = ord('p')
+    elif chr(i) == '|':
+      out_chr[i] = ord('v')
     else:
       out_chr[i] = ord('_')
   table = string.maketrans(in_chr, ''.join(map(chr, out_chr)))
@@ -141,7 +143,7 @@ def GenerateCc(base_name, res):
     if python_type == str:
       for string in resource:
         args = (c_type, '%s_%s' % (prefix.lower(), Canonicalize(string)),
-                res.modifier, string.strip())
+                res.modifier, string.strip().replace('_', ' '))
         f.write('static const %s %s[] %s = "%s";\n' % args)
       if ram:
         args = (c_type, table_name)