sfrp 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cda721742189d74dac30ae37d3d0ec59d4b97085
-  data.tar.gz: 2a9ebf80928a7718b4241d5718f6f8d5fa1e035b
+  metadata.gz: e9a7c8ab88c8c2982d435d3cdf05f98357cfead9
+  data.tar.gz: cc77e8fe3362408cb92f5fb9f4a8fd8c5a40e894
 SHA512:
-  metadata.gz: ead9d2c66049bd7bf9debe408f39ccaa4c7e842096c830274ac7c3ced18f4ee426f0522b845d3394eaba2023e5cebf18b3066b7a3dc9bf2de62779c45f8718cc
-  data.tar.gz: d658239d964311003df0fa64798981d0cb9dbcd75dfc63cdc8599fc6bef846707e8c9c5f4629d15753ed6d1654856944f22d257b9e9838abcffb7ae43191be69
+  metadata.gz: e3f05fb04cb256828eb17e25aa499da775d33860e86650057410e9b192f8071c43809a8cd485b6eccb97fd06a313c3c830e2147901c87718d718a367d82887e9
+  data.tar.gz: 8b8506c2f3d635273386f745a973f2f58734a572282046e773b464697154a779b0a69ec13d5683e75395b4804df9fe33b8dc0a87df958641994fec43d68b7acc

data/base-library/Base/AVR/ATMEGA8/GPIO.c

@@ -40,6 +40,12 @@ int portB(int port_num, int high_or_low) {
   return 0;
 }
 
+int portBs(int output) {
+  DDRB = 0b11111111;
+  PORTB = output;
+  return 0;
+}
+
 // PC
 
 int pinC(int num) {
@@ -59,6 +65,12 @@ int portC(int port_num, int high_or_low) {
   return 0;
 }
 
+int portCs(int output) {
+  DDRC = 0b11111111;
+  PORTC = output;
+  return 0;
+}
+
 // PD
 
 int pinD(int num) {
@@ -77,3 +89,9 @@ int portD(int port_num, int high_or_low) {
   PORTD = (~(1 << port_num) & PORTD) | (high_or_low << port_num);
   return 0;
 }
+
+int portDs(int output) {
+  DDRD = 0b11111111;
+  PORTD = output;
+  return 0;
+}

data/base-library/Base/AVR/ATMEGA8/GPIO.h

@@ -5,11 +5,18 @@
 int pinB(int);
 int posEdgePB(int);
 int portB(int, int);
+int portBs(int);
 
 // PC
+int pinC(int);
+int posEdgePC(int);
 int portC(int, int);
+int portCs(int);
 
 // PD
+int pinD(int);
+int posEdgePD(int);
 int portD(int, int);
+int portDs(int);
 
 #endif

data/base-library/Base/AVR/ATMEGA8/GPIO.sfrp

@@ -23,6 +23,7 @@ in @posEdgePB6 from $posEdgePB(6)
 in @posEdgePB7 from $posEdgePB(7)
 
 foreign portB as $portB(Int, Bool) : Unit
+foreign portBs as $portBs(Int) : Unit
 
 -- PC
 
@@ -47,6 +48,7 @@ in @posEdgePC6 from $posEdgePC(6)
 in @posEdgePC7 from $posEdgePC(7)
 
 foreign portC as $portC(Int, Bool) : Unit
+foreign portCs as $portCs(Int) : Unit
 
 -- PD
 
@@ -71,3 +73,4 @@ in @posEdgePD6 from $posEdgePD(6)
 in @posEdgePD7 from $posEdgePD(7)
 
 foreign portD as $portD(Int, Bool) : Unit
+foreign portDs as $portDs(Int) : Unit

data/base-library/Base/AVR/ATMEGA8/Timer.c

@@ -1,29 +1,59 @@
 #include<avr/io.h>
 #include <avr/interrupt.h>
 
-static unsigned int elapsed_time_counter = 0;
+static unsigned int elapsed_clock_div256 = 0;
 
 ISR(TIMER0_OVF_vect)
 {
-  elapsed_time_counter++;
+  elapsed_clock_div256++;
 }
 
-void initialize() {
+void initialize_timer() {
+  static int flag = 0;
+  if (!flag) {
+    flag = 1;
+    return;
+  }
   cli();
   TIMSK = 0b00000001;
-  //TCCR0 = 0b00000011;
-  TCCR0 = 0b00000010;
+  TCCR0 = 0b00000001; // No prescaling
   sei();
 }
 
-int elapsed_time() {
-  static int initial = 1;
-  int res;
-  if (initial) {
-    initialize();
-    initial = 0;
-  }
-  res = elapsed_time_counter * 2;
-  elapsed_time_counter = 0;
-  return res;
+int get_dsec(clk_io_kilohertz) {
+  static unsigned int last = 0;
+  unsigned int current;
+  unsigned int dsec;
+  initialize_timer();
+
+  current = elapsed_clock_div256;
+  dsec = (current - last) / (clk_io_kilohertz * 4); // clk_io_kilohertz * 1024 / 256
+  last = current - (current - last) % (clk_io_kilohertz * 4);
+  return dsec;
+}
+
+int get_dmsec(clk_io_kilohertz) {
+  static unsigned int last = 0;
+  unsigned int current;
+  unsigned int dmsec;
+  initialize_timer();
+
+  current = elapsed_clock_div256;
+  dmsec = (current - last) / (clk_io_kilohertz / 2); // clk_io_kilohertz * 1024 / 256 / 8
+  last = current - (current - last) % (clk_io_kilohertz / 2);
+  return dmsec * 125;
+}
+
+// This function assumes 0.97656(=1000/1024)msec as 1msec
+// so accumulates about 2% error.
+int get_uncertain_dmsec(clk_io_kilohertz) {
+  static unsigned int last = 0;
+  unsigned int current;
+  unsigned int dmsec;
+  initialize_timer();
+
+  current = elapsed_clock_div256;
+  dmsec = (current - last) / (clk_io_kilohertz / 256); // clk_io_kilohertz * 1024 / 256 / 1024
+  last = current - (current - last) % (clk_io_kilohertz / 256);
+  return dmsec;
 }

data/base-library/Base/AVR/ATMEGA8/Timer.h

@@ -1,6 +1,8 @@
 #ifndef BASE_IO_AVR_ATMEGA8_TIMER
 #define BASE_IO_AVR_ATMEGA8_TIMER
 
-int elapsed_time();
+int get_dsec(int);
+int get_dmsec(int);
+int get_uncertain_dmsec(int);
 
 #endif

data/base-library/Base/AVR/ATMEGA8/Timer.sfrp

@@ -1,4 +1,10 @@
 import Base
 
-foreign elapsed_time as $elapsedTime() : Int
-in @elapsedTime from $elapsedTime()
+foreign get_dsec as $getDsec(Int) : Int
+in @dsec : Int from $getDsec(1024)
+
+foreign get_dmsec as $getDmsec(Int) : Int
+in @dmsec : Int from $getDmsec(1024)
+
+foreign get_uncertain_dmsec as $getUncertainDmsec(Int) : Int
+in @uncertainDmsec : Int from $getUncertainDmsec(1024)

data/base-library/Base.sfrp

@@ -1,4 +1,4 @@
-ptype Int{int} = /^((0x)?[0-9]+)$/\1/
+ptype Int{int} = /^(((0x)|(0b))?[0-9]+)$/\1/
 ptype Float{float} = /^([0-9]+\.[0-9]+)$/\1f/
 ptype Bool{int} = True{1} | False{0}
 ptype Unit{int} = Unit{0}

data/lib/sfrp/raw/exception.rb

@@ -3,9 +3,8 @@ require 'sfrp/error'
 module SFRP
   module Raw
     class NameError < CompileError
-      def initialize(target_str, source_position)
+      def initialize(target_str)
         @target_str = target_str
-        @source_position = source_position
       end
 
       def message
@@ -14,10 +13,9 @@ module SFRP
     end
 
     class AmbiguousNameError < CompileError
-      def initialize(target_str, selection_strs, source_position)
+      def initialize(target_str, selection_strs)
         @target_str = target_str
         @selection_strs = selection_strs
-        @source_position = source_position
       end
 
       def message
@@ -27,9 +25,8 @@ module SFRP
     end
 
     class IllegalSideEffectError < CompileError
-      def initialize(target_str, source_position)
+      def initialize(target_str)
         @target_str = target_str
-        @source_position = source_position
       end
 
       def message

data/lib/sfrp/version.rb

@@ -1,3 +1,3 @@
 module SFRP
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfrp
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Kensuke Sawada
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-11 00:00:00.000000000 Z
+date: 2016-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler