From 286b8dc6895bcfda4011d5ff68c287eef474c143 Mon Sep 17 00:00:00 2001
From: Manfred <Man-fred@users.noreply.github.com>
Date: Thu, 11 Jun 2020 18:50:56 +0200
Subject: [PATCH] Error if hostname is invalid in eeprom

---
 docs/commandref.html            |  51 ++++-
 libraries/ethernet/ethernet.cpp |  48 ++--
 libraries/fastrf/fastrf.c       |  83 -------
 libraries/ntp/ntp.c             | 210 -----------------
 libraries/rf_asksin/rf_asksin.c | 305 -------------------------
 libraries/rf_moritz/rf_moritz.c | 384 --------------------------------
 6 files changed, 78 insertions(+), 1003 deletions(-)
 delete mode 100644 libraries/fastrf/fastrf.c
 delete mode 100644 libraries/ntp/ntp.c
 delete mode 100644 libraries/rf_asksin/rf_asksin.c
 delete mode 100644 libraries/rf_moritz/rf_moritz.c

diff --git a/docs/commandref.html b/docs/commandref.html
index b92999b..3d70e4a 100644
--- a/docs/commandref.html
+++ b/docs/commandref.html
@@ -25,6 +25,8 @@
     <h3>culfw<br>reference</h3>
   </div>
   <div id="right">
+<h2>Work in progress</h2>
+<p>The differences between CUL-programming and the Arduino-IDE are not decribed here. See the wiki on Github</p>
 
 <h3>Contents</h3>
 <ul>
@@ -69,6 +71,7 @@ <h3>Contents</h3>
     <a href="#cmd_X">X</a>
     <a href="#cmd_Y">Y</a>
     <a href="#cmd_Z">Z</a>
+    <a href="#cmd_1">1</a>
   </ul>
   <a href="#protocol2">Protocol Part 2 (radio messages)</a><br>
   <a href="#FHT_8v">FHT_8v</a><br>
@@ -140,6 +143,7 @@ <h3>Introduction</h3>
     <li> HMS
     <li> ESA
     <li> ASKSIN (aka BidCos(R))
+		<li> MAX! with the moritz protocol
     <li> basic OneWire Protocol through the DS4282 (CUNO only)
     <li> UNIRoll
   </ul>
@@ -412,7 +416,7 @@ <h3>Protocol Part 1 (culfw configuration)</h3>
     <a name="cmd_E"></a>
     E&lt;x&gt;
     <ul>
-      (CUN only) eth debugging
+      (CUN only) eth debugging moved to command 1, E is used for RWE-devices
       <ul>
       <li> c<br>
         Print out the currently configured IP & MAC address.
@@ -885,12 +889,18 @@ <h3>Protocol Part 1 (culfw configuration)</h3>
     V
     <ul>
       Print the firmware version.
-      Example: V -&gt; V 1.30 CUL868
+      Example: V -&gt; V 1.67 CUL868
     </ul>
     VH
     <ul>
-      Print the hardware version on CUL_V3 and CUL_V4
-    </ul><br><br>
+      Print the hardware version on CUL_V3, CUL_V4 and CUL_ESP
+    </ul>
+    VI
+    <ul>
+      Print the image version. The bin-file for over the air updates should look similar with a higher version number.
+      Example: VI -&gt; V01-67-00.culfw-esp8266.ino.d1_mini
+    </ul>
+		<br><br>
 
     <a name="cmd_v"></a>
     v&lt;func&gt;[&lt;hex&gt;]
@@ -949,7 +959,11 @@ <h3>Protocol Part 1 (culfw configuration)</h3>
       <li>Win - IPV4 network mask
       <li>Wip - tcplink port
       <li>WiN - NTP sever
-      <li>Wio - GMT offset</li>
+      <li>Wio - GMT offset
+			<li>Wis - SSID (up to 20 character)</li>
+			<li>Wik - WPA-key (up to 20 character)</li>
+			<li>WiD - devicename (up to 20 character)</li>
+			<li>WiO - IPV4 Address of the OTA-server</li>
       Notes:
         <ul>
         <li>Factory reset: use DHCP, port 2323, NTP-Server = Router, GMT offset:0
@@ -1097,6 +1111,33 @@ <h3>Protocol Part 1 (culfw configuration)</h3>
       </ul>
     </ul><br><br>
 
+    <a name="cmd_1"></a>
+    1&lt;x&gt;
+    <ul>
+      (CUN only) eth debugging moved from command E, wich is used for RWE-devices
+      <ul>
+      <li> c<br>
+        Print out the currently configured IP & MAC address.
+        The IP address may be different from what you configured with Wia
+        if DHCP is enabled. 0.0.0.0 is shown if no IP address is set, e.g.
+        when DHCP is enabled but the network cable is unplugged or CUN
+        could not get an IP address over LAN. Note that the IP address
+        that you configured with Wia is disregarded if DHCP is enabled.
+
+      <li> d<br>
+        increase the debug level. Meaning of the levels
+        1: application debugging, e.g. the NTP module will display the time
+        2: print ETH header (mac adress + ETH frametype)
+        3: dump whole ethernet packet.
+
+      <li> i<br>
+        Reinitialize the ethernet subsystem, restart DHCP & NTP
+
+      <li> n<br>
+        Request an NTP update
+      </ul>
+    </ul><br><br>
+
 
     Unknown commands
     <ul>
diff --git a/libraries/ethernet/ethernet.cpp b/libraries/ethernet/ethernet.cpp
index a1cd52d..319b706 100644
--- a/libraries/ethernet/ethernet.cpp
+++ b/libraries/ethernet/ethernet.cpp
@@ -75,29 +75,45 @@ void EthernetClass::init(void)
 #else
   WiFi.persistent(false);
   WiFi.mode(WIFI_STA);
-  //#ifdef STANAME
-    WiFi.hostname(FNcol.ers(EE_NAME));
-  //#endif
+  Serial.print("Connecting ");
+  char sta_name[EE_STR_LEN];
+	uint8_t i = 0;
+	char test = 1;
+  for(i = 0; i < EE_STR_LEN && test > 0; i++) {
+		char test = FNcol.erb(EE_NAME + i);
+    if ((test >= '0' && test <= '9') || (test >= 'A' && test <= 'Z') || (test >= 'a' && test <= 'z') || test=='-' || test==0){
+			sta_name[i] = test;
+		} else {
+			i = 0;
+			break;
+		}
+	}
+	if (i > 0)
+		// hostname ok
+    WiFi.hostname(sta_name);
   if(!FNcol.erb(EE_USE_DHCP)) {
     set_eeprom_addr();
   }
   WiFi.begin(FNcol.ers(EE_WPA_SSID), FNcol.ers(EE_WPA_KEY));
-
-  //Serial.print("Connecting");
-  while (WiFi.status() != WL_CONNECTED)
+	i = 9;
+  while (i-- && WiFi.status() != WL_CONNECTED)
   {
     delay(500);
-    //Serial.print(".");
+    Serial.print(i);
   }
-  //Serial.println();
-  tcplink_port = FNcol.erw(EE_IP4_TCPLINK_PORT);
-  eth_initialized = Udp.begin(tcplink_port);
-  server.begin(tcplink_port);
-  IPAddress localIP = WiFi.localIP();
-  uip_hostaddr[0] = localIP[1]<<8 | localIP[0];
-  uip_hostaddr[1] = localIP[3]<<8 | localIP[2];
-  WiFi.macAddress(uip_ethaddr.addr);
-  Serial.printf("\nUDP %d, TCP %d on %s:%d\n", eth_initialized, tcp_initialized, WiFi.localIP().toString().c_str(), tcplink_port);
+	if (i){
+		//Serial.println();
+		tcplink_port = FNcol.erw(EE_IP4_TCPLINK_PORT);
+		eth_initialized = Udp.begin(tcplink_port);
+		server.begin(tcplink_port);
+		IPAddress localIP = WiFi.localIP();
+		uip_hostaddr[0] = localIP[1]<<8 | localIP[0];
+		uip_hostaddr[1] = localIP[3]<<8 | localIP[2];
+		WiFi.macAddress(uip_ethaddr.addr);
+		Serial.printf("\nUDP %d, TCP %d on %s:%d\n", eth_initialized, tcp_initialized, WiFi.localIP().toString().c_str(), tcplink_port);
+  } else {
+		Serial.println('\nNo WLan');
+	}
 #endif
 }
 
diff --git a/libraries/fastrf/fastrf.c b/libraries/fastrf/fastrf.c
deleted file mode 100644
index 032caa4..0000000
--- a/libraries/fastrf/fastrf.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "board.h"
-#ifdef HAS_FASTRF
-#include <string.h>
-#include <avr/pgmspace.h>
-#include "fastrf.h"
-#include "cc1100.h"
-#include "delay.h"
-#include "display.h"
-#include "rf_receive.h"
-#include "fncollection.h"
-#include "clock.h"
-
-uint8_t fastrf_on;
-
-void
-fastrf_func(char *in)
-{
-  uint8_t len = strlen(in);
-
-  if(in[1] == 'r') {                // Init
-    ccInitChip(EE_FASTRF_CFG);
-    ccRX();
-    fastrf_on = 1;
-
-  } else if(in[1] == 's') {         // Send
-
-    CC1100_ASSERT;
-    cc1100_sendbyte(CC1100_WRITE_BURST | CC1100_TXFIFO);
-    cc1100_sendbyte( len-2 );
-    for(uint8_t i=2; i< len; i++)
-      cc1100_sendbyte(in[i]);
-    CC1100_DEASSERT;
-    ccTX();
-    while(cc1100_readReg(CC1100_TXBYTES) & 0x7f) // Wait for the data to be sent
-      MYDELAY.my_delay_ms(1);
-    ccRX();                         // set reception again. MCSM1 does not work.
-
-  } else {
-    fastrf_on = 0;
-
-  }
-}
-
-void
-FastRF_Task(void)
-{
-  if(!fastrf_on)
-    return;
-
-  if(fastrf_on == 1) {
-    static uint8_t lasttick;         // Querying all the time affects reception.
-    if(lasttick != (uint8_t)ticks) {
-      if(cc1100_readReg(CC1100_MARCSTATE) == MARCSTATE_RXFIFO_OVERFLOW) {
-        ccStrobe(CC1100_SFRX);
-        ccRX();
-      }
-      lasttick = (uint8_t)ticks;
-    }
-    return;
-  }
-
-  uint8_t len = cc1100_readReg(CC1100_RXFIFO);
-  uint8_t buf[TTY_BUFSIZE];
-
-  if(len < sizeof(buf)) {
-    CC1100_ASSERT;
-    cc1100_sendbyte( CC1100_READ_BURST | CC1100_RXFIFO );
-    for(uint8_t i=0; i<len; i++)
-      buf[i] = cc1100_sendbyte( 0 );
-    CC1100_DEASSERT;
-
-    display_channel=DISPLAY_USB;
-    uint8_t i;
-    for(i=0; i<len; i++)
-      DC(buf[i]);
-    DNL();
-    display_channel=0xff;
-  }
-
-  fastrf_on = 1;
-}
-
-#endif
diff --git a/libraries/ntp/ntp.c b/libraries/ntp/ntp.c
deleted file mode 100644
index 090abd3..0000000
--- a/libraries/ntp/ntp.c
+++ /dev/null
@@ -1,210 +0,0 @@
-#include <string.h>
-#include "board.h"
-#include "uip.h"
-#include "uip_arp.h"            // uip_arp_out;
-#include "drivers/interfaces/network.h"            // network_send
-#include "display.h"
-#include "ntp.h"
-#include "clock.h"
-#include "fncollection.h"       // EE_IP4_GATEWAY
-#include "ethernet.h"           // eth_debug
-
-// Time of last sync.
-time_t        ntp_sec = 3461476149U; // 2009-09-09 09:09:09 (GMT)
-uint8_t       ntp_hsec;
- int8_t       ntp_gmtoff;
-struct uip_udp_conn *ntp_conn = 0;
-
-////////////////////////////////
-// Network part
-static void
-fill_packet(ntp_packet_t *p)
-{
-  memset(p, 0, sizeof(*p));
-  p->li_vn_mode = 0x23;           // LI:00:No Warning, VN:04, Mode:03: Client
-}
-
-void
-ntp_init(void)
-{
-  uip_ipaddr_t ipaddr;
-
-  ntp_gmtoff = erb(EE_IP4_NTPOFFSET);
-  erip(ipaddr, EE_IP4_NTPSERVER);
-  if(ipaddr[0] == 0 && ipaddr[1] == 0)
-    erip(ipaddr, EE_IP4_GATEWAY);
-  ntp_conn = uip_udp_new(&ipaddr, HTONS(NTP_PORT));
-  if(ntp_conn == NULL)
-    return;
-  uip_udp_bind(ntp_conn, HTONS(NTP_PORT));
-  //ntp_sendpacket();
-}
-
-////////////////////////////////
-void
-ntp_sendpacket()
-{
-  if(eth_debug) {
-    DC('n'); DC('s'); ntp_func(0);
-  }
-
-  if(ntp_conn == 0)
-    return;
-
-  uip_udp_conn = ntp_conn;
-  fill_packet((ntp_packet_t*)uip_appdata);
-  uip_send(uip_appdata, sizeof(ntp_packet_t));
-
-  uip_process(UIP_UDP_SEND_CONN);
-  uip_arp_out();
-  network_send();
-}
-
-////////////////////////////////
-void
-ntp_digestpacket()
-{
-  if(uip_len < sizeof(ntp_packet_t))
-    return;
-  ntp_packet_t *p = (ntp_packet_t*)uip_appdata;
-  uint8_t *f = (uint8_t *)&ntp_sec;
-  f[0] = p->tx_ts.u8[3];
-  f[1] = p->tx_ts.u8[2];
-  f[2] = p->tx_ts.u8[1];
-  f[3] = p->tx_ts.u8[0];
-  ntp_hsec = (uint16_t)(p->tx_ts.u8[4]*125)/256;
-  if(eth_debug) {
-    DC('n'); DC('r'); ntp_func(0);
-  }
-}
-
-
-
-/////////////////////////////////////////
-// Helper functions / conversion to/from readable format
-
-uint8_t mday[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-
-uint8_t
-dec2bcd(uint8_t in)
-{
-  return ((in/10)<<4) | (in%10);
-}
-
-uint8_t
-bcd2dec(uint8_t in)
-{
-  return ((in>>4)*10)+(in&0xf);
-}
-
-
-void
-ntp_sec2tm(time_t sec, tm_t *t)
-{
-  uint8_t m, y;
-  sec += (ntp_gmtoff*3600);
-  uint16_t day = (uint16_t)(sec / 86400) - 39812;
-
-  /////////// Year
-  for(y=9;;y++) {
-    uint16_t diy = (y&3 ? 365 : 366);
-    if(day < diy)
-      break;
-    day -= diy;
-  }
-
-  /////////// Month/Day
-  for(m = 0;;m++) {
-    uint8_t md = (m==1 && (y&3) == 0) ? 29 : mday[m];
-    if(day < md)
-      break;
-    day -= md;
-  }
-
-  t->tm_year = y;
-  t->tm_mon  = m+1;
-  t->tm_mday = day+1;
-  t->tm_hour = (sec / 3600) % 24;
-  t->tm_min  = (sec / 60) % 60;
-  t->tm_sec  = sec % 60;
-}
-
-time_t
-ntp_tm2sec(tm_t *t)
-{
-  uint8_t m, y;
-  uint16_t day = 39812;
-
-  for(y=9; y < t->tm_year ;y++)
-    day += (y&3 ? 365 : 366);
-
-  for(m = 0; m < t->tm_mon-1; m++)
-    day += (m==1 && (y&3) == 0) ? 29 : mday[m];
-
-  day += (t->tm_mday-1);
-
-  return (((time_t)day*24+
-                  (t->tm_hour-ntp_gmtoff))*60+
-                   t->tm_min)*60+
-                   t->tm_sec;
-}
-
-
-void
-ntp_func(char *in)
-{
-  uint8_t hb[6], t;
-
-  if(in == 0 || in[1] == 0) {
-    t = 1, hb[0] = 7;
-  } else  {
-    t = fromhex(in+1, hb, 6);
-  }
-
-  if(t == 1) {
-    t = hb[0];
-    ntp_get(hb);
-    if(t&1) {
-      DH2(hb[0]); DC('-');
-      DH2(hb[1]); DC('-');
-      DH2(hb[2]);
-    }
-    if((t&3) == 3)
-      DC(' ');
-
-    if(t&2) {
-      DH2(hb[3]); DC(':');
-      DH2(hb[4]); DC(':');
-      DH2(hb[5]);
-    }
-
-    if(t&4) {
-      DC('.'); display_udec((uint16_t)(ntp_hsec*100)/125, 2, '0');
-    }
-    DNL();
-
-  } else if(t == 6) {
-    tm_t t;
-    t.tm_year = bcd2dec(hb[0]);
-    t.tm_mon  = bcd2dec(hb[1]);
-    t.tm_mday = bcd2dec(hb[2]);
-    t.tm_hour = bcd2dec(hb[3]);
-    t.tm_min  = bcd2dec(hb[4]);
-    t.tm_sec  = bcd2dec(hb[5]);
-    ntp_sec = ntp_tm2sec(&t);
-
-  }
-}
-
-void
-ntp_get(uint8_t data[6])                // for the log function
-{
-  tm_t t;
-  ntp_sec2tm(ntp_sec, &t);
-  data[0] = dec2bcd(t.tm_year);
-  data[1] = dec2bcd(t.tm_mon);
-  data[2] = dec2bcd(t.tm_mday);
-  data[3] = dec2bcd(t.tm_hour);
-  data[4] = dec2bcd(t.tm_min);
-  data[5] = dec2bcd(t.tm_sec);
-}
diff --git a/libraries/rf_asksin/rf_asksin.c b/libraries/rf_asksin/rf_asksin.c
deleted file mode 100644
index 4047875..0000000
--- a/libraries/rf_asksin/rf_asksin.c
+++ /dev/null
@@ -1,305 +0,0 @@
-#include "board.h"
-#ifdef HAS_ASKSIN
-#include <string.h>
-#include <avr/pgmspace.h>
-#include "cc1100.h"
-#include "delay.h"
-#include "rf_receive.h"
-#include "display.h"
-#include "cc1101_pllcheck.h"
-#include "clock.h"
-
-#include "rf_asksin.h"
-
-uint8_t asksin_on = 0;
-
-const uint8_t PROGMEM ASKSIN_CFG[] = {
-     0x00, 0x07,
-     0x02, 0x2e,
-     0x03, 0x0d,
-     0x04, 0xE9,
-     0x05, 0xCA,
-     0x07, 0x0C,
-     0x0B, 0x06,
-     0x0D, 0x21,
-     0x0E, 0x65,
-     0x0F, 0x6A,
-     0x10, 0xC8,
-     0x11, 0x93,
-     0x12, 0x03,
-     0x15, 0x34,
-     0x17, 0x33, // go into RX after TX, CCA; EQ3 uses 0x03
-     0x18, 0x18,
-     0x19, 0x16,
-     0x1B, 0x43,
-     0x21, 0x56,
-     0x25, 0x00,
-     0x26, 0x11,
-     0x29, 0x59,
-     0x2c, 0x81,
-     0x2D, 0x35,
-     0x3e, 0xc3
-};
-
-#ifdef HAS_ASKSIN_FUP
-const uint8_t PROGMEM ASKSIN_UPDATE_CFG[] = {
-     0x0B, 0x08,
-     0x10, 0x5B,
-     0x11, 0xF8,
-     0x15, 0x47,
-     0x19, 0x1D,
-     0x1A, 0x1C,
-     0x1B, 0xC7,
-     0x1C, 0x00,
-     0x1D, 0xB2,
-     0x21, 0xB6,
-     0x23, 0xEA,
-};
-
-static unsigned char asksin_update_mode = 0;
-#endif
-
-static void rf_asksin_reset_rx(void);
-
-void
-rf_asksin_init(void)
-{
-
-  EIMSK &= ~_BV(CC1100_INT);                 // disable INT - we'll poll...
-  SET_BIT( CC1100_CS_DDR, CC1100_CS_PIN );   // CS as output
-
-  CC1100_DEASSERT;                           // Toggle chip select signal
-  my_delay_us(30);
-  CC1100_ASSERT;
-  my_delay_us(30);
-  CC1100_DEASSERT;
-  my_delay_us(45);
-
-  ccStrobe( CC1100_SRES );                   // Send SRES command
-  my_delay_us(100);
-
-  // load configuration
-  for (uint8_t i = 0; i < sizeof(ASKSIN_CFG); i += 2) {
-    cc1100_writeReg( pgm_read_byte(&ASKSIN_CFG[i]),
-                     pgm_read_byte(&ASKSIN_CFG[i+1]) );
-  }
-
-#ifdef HAS_ASKSIN_FUP
-  if (asksin_update_mode) {
-    for (uint8_t i = 0; i < sizeof(ASKSIN_UPDATE_CFG); i += 2) {
-      cc1100_writeReg( pgm_read_byte(&ASKSIN_UPDATE_CFG[i]),
-                       pgm_read_byte(&ASKSIN_UPDATE_CFG[i+1]) );
-    }
-  }
-#endif
-  
-  ccStrobe( CC1100_SCAL );
-
-  my_delay_ms(4);
-
-  // enable RX, but don't enable the interrupt
-  do {
-    ccStrobe(CC1100_SRX);
-  } while (cc1100_readReg(CC1100_MARCSTATE) != MARCSTATE_RX);
-}
-
-static void
-rf_asksin_reset_rx(void)
-{
-  ccStrobe( CC1100_SFRX  );
-  ccStrobe( CC1100_SIDLE );
-  ccStrobe( CC1100_SNOP  );
-  ccStrobe( CC1100_SRX   );
-}
-
-void
-rf_asksin_task(void)
-{
-  uint8_t msg[MAX_ASKSIN_MSG];
-  uint8_t this_enc, last_enc;
-  uint8_t rssi;
-  uint8_t l;
-
-  if(!asksin_on)
-    return;
-
-  // see if a CRC OK pkt has been arrived
-  if (bit_is_set( CC1100_IN_PORT, CC1100_IN_PIN )) {
-    msg[0] = cc1100_readReg( CC1100_RXFIFO ) & 0x7f; // read len
-
-    if (msg[0] >= MAX_ASKSIN_MSG) {
-      // Something went horribly wrong, out of sync?
-      rf_asksin_reset_rx();
-      return;
-    }
-
-    CC1100_ASSERT;
-    cc1100_sendbyte( CC1100_READ_BURST | CC1100_RXFIFO );
-    
-    for (uint8_t i=0; i<msg[0]; i++) {
-         msg[i+1] = cc1100_sendbyte( 0 );
-    }
-    
-    rssi = cc1100_sendbyte( 0 );
-    /* LQI = */ cc1100_sendbyte( 0 );
-
-    CC1100_DEASSERT;
-
-    do {
-      ccStrobe(CC1100_SRX);
-    } while (cc1100_readReg(CC1100_MARCSTATE) != MARCSTATE_RX);
-
-    last_enc = msg[1];
-    msg[1] = (~msg[1]) ^ 0x89;
-    
-    for (l = 2; l < msg[0]; l++) {
-         this_enc = msg[l];
-         msg[l] = (last_enc + 0xdc) ^ msg[l];
-         last_enc = this_enc;
-    }
-    
-    msg[l] = msg[l] ^ msg[2];
-    
-    if (tx_report & REP_BINTIME) {
-      
-      DC('a');
-      for (uint8_t i=0; i<=msg[0]; i++)
-      DC( msg[i] );
-         
-    } else {
-      DC('A');
-      
-      for (uint8_t i=0; i<=msg[0]; i++)
-        DH2( msg[i] );
-      
-      if (tx_report & REP_RSSI)
-        DH2(rssi);
-      
-      DNL();
-    }
-  }
-
-  switch(cc1100_readReg( CC1100_MARCSTATE )) {
-    case MARCSTATE_RXFIFO_OVERFLOW:
-      ccStrobe( CC1100_SFRX  );
-    case MARCSTATE_IDLE:
-      ccStrobe( CC1100_SIDLE );
-      ccStrobe( CC1100_SNOP  );
-      ccStrobe( CC1100_SRX   );
-      break;
-  }
-
-#ifdef HAS_CC1101_RX_PLL_LOCK_CHECK_TASK_WAIT
-  cc1101_RX_check_PLL_wait_task();
-#endif
-}
-
-void
-asksin_send(char *in)
-{
-  uint8_t msg[MAX_ASKSIN_MSG];
-  uint8_t ctl;
-  uint8_t l;
-  uint32_t ts1, ts2;
-
-  uint8_t hblen = fromhex(in+1, msg, MAX_ASKSIN_MSG-1);
-
-  if ((hblen-1) != msg[0]) {
-//  DS_P(PSTR("LENERR\r\n"));
-    return;
-  }
-
-  // in AskSin mode already?
-  if(!asksin_on) {
-    rf_asksin_init();
-    my_delay_ms(3);             // 3ms: Found by trial and error
-  }
-
-  ctl = msg[2];
-
-  // "crypt"
-  msg[1] = (~msg[1]) ^ 0x89;
-
-  for (l = 2; l < msg[0]; l++)
-    msg[l] = (msg[l-1] + 0xdc) ^ msg[l];
-  
-  msg[l] = msg[l] ^ ctl;
-
-  // enable TX, wait for CCA
-  CLOCK:get_timestamp(&ts1);
-  do {
-    ccStrobe(CC1100_STX);
-    if (cc1100_readReg(CC1100_MARCSTATE) != MARCSTATE_TX) {
-      get_timestamp(&ts2);
-      if (((ts2 > ts1) && (ts2 - ts1 > ASKSIN_WAIT_TICKS_CCA)) ||
-          ((ts2 < ts1) && (ts1 + ASKSIN_WAIT_TICKS_CCA < ts2))) {
-        DS_P(PSTR("ERR:CCA\r\n"));
-        goto out;
-      }
-    }
-  } while (cc1100_readReg(CC1100_MARCSTATE) != MARCSTATE_TX);
-
-  if (ctl & (1 << 4)) { // BURST-bit set?
-    // According to ELV, devices get activated every 300ms, so send burst for 360ms
-    for(l = 0; l < 3; l++)
-      my_delay_ms(120); // arg is uint_8, so loop
-  } else {
-  	my_delay_ms(10);
-  }
-
-  // send
-  CC1100_ASSERT;
-  cc1100_sendbyte(CC1100_WRITE_BURST | CC1100_TXFIFO);
-
-  for(uint8_t i = 0; i < hblen; i++) {
-    cc1100_sendbyte(msg[i]);
-  }
-
-  CC1100_DEASSERT;
-
-  // wait for TX to finish
-  while(cc1100_readReg( CC1100_MARCSTATE ) == MARCSTATE_TX)
-    ;
-
-out:
-  if (cc1100_readReg( CC1100_MARCSTATE ) == MARCSTATE_TXFIFO_UNDERFLOW) {
-      ccStrobe( CC1100_SFTX  );
-      ccStrobe( CC1100_SIDLE );
-      ccStrobe( CC1100_SNOP  );
-  }
-  
-  if(asksin_on) {
-    do {
-      ccStrobe(CC1100_SRX);
-    } while (cc1100_readReg(CC1100_MARCSTATE) != MARCSTATE_RX);
-  } else {
-    set_txrestore();
-  }
-}
-
-void
-asksin_func(char *in)
-{
-#ifndef HAS_ASKSIN_FUP
-  if(in[1] == 'r') {                // Reception on
-#else
-  if((in[1] == 'r') || (in[1] == 'R')) {                // Reception on
-    if (in[1] == 'R') {
-      asksin_update_mode = 1;
-    } else {
-      asksin_update_mode = 0;
-    }
-#endif
-    rf_asksin_init();
-    asksin_on = 1;
-
-  } else if(in[1] == 's') {         // Send
-    asksin_send(in+1);
-
-  } else {                          // Off
-    asksin_on = 0;
-
-  }
-}
-
-#endif
diff --git a/libraries/rf_moritz/rf_moritz.c b/libraries/rf_moritz/rf_moritz.c
deleted file mode 100644
index 343633a..0000000
--- a/libraries/rf_moritz/rf_moritz.c
+++ /dev/null
@@ -1,384 +0,0 @@
-#include "board.h"
-#ifdef HAS_MORITZ
-#include <string.h>
-#include <avr/pgmspace.h>
-#include <avr/interrupt.h>
-#include <avr/io.h>
-#include "cc1100.h"
-#include "delay.h"
-#include "rf_receive.h"
-#include "display.h"
-#include "clock.h"
-#include "rf_send.h" //credit_10ms
-
-#include "rf_moritz.h"
-
-void moritz_sendraw(uint8_t* buf, int longPreamble);
-void moritz_sendAck(uint8_t* enc);
-void moritz_handleAutoAck(uint8_t* enc);
-
-uint8_t moritz_on = 0;
-
-/*
- * CC1100_PKTCTRL0.LENGTH_CONFIG = 1 //Variable packet length mode. Packet length configured by the first byte after sync word
- *                 CRC_EN = 1
- *                 PKT_FORMAT = 00 //Use FIFOs
- *                 WHITE_DATA = 0
- * MDMCFG2.SYNC_MODE = 3: 30/32 sync word bits detected
- *        .MANCHESTER_EN = 0
- *        .MOD_FORMAT = 0: 2-FSK
- *        .DEM_DCFILT_OFF = 0
- *
- * EVENT0 = 34667
- * t_Event0 = 750/26Mhz * EVENT0 * 2^(5*WOR_RES) = 1 second
- *
- * One message with 12 payload bytes takes (4 byte preamble + 4 byte sync + 12 byte payload) / 1kbit/s = 160 ms.
- */
-const uint8_t PROGMEM MORITZ_CFG[60] = {
-//     0x00, 0x08,
-     0x00, 0x07, //IOCFG2: GDO2_CFG=7: Asserts when a packet has been received with CRC OK. De-asserts when the first byte is read from the RX FIFO
-     0x02, 0x46, //IOCFG0
-     0x04, 0xC6, //SYNC1
-     0x05, 0x26, //SYNC0
-     0x0B, 0x06, //FSCTRL1
-     0x10, 0xC8, //MDMCFG4 DRATE_E=8,
-     0x11, 0x93, //MDMCFG3 DRATE_M=147, data rate = (256+DRATE_M)*2^DRATE_E/2^28*f_xosc = (9992.599) 1kbit/s (at f_xosc=26 Mhz)
-     0x12, 0x03, //MDMCFG2 see above
-     0x13, 0x22,  //MDMCFG1 CHANSPC_E=2, NUM_PREAMBLE=2 (4 bytes), FEC_EN = 0 (disabled)
-    //0x13, 0x72,  //MDMCFG1 CHANSPC_E=2, NUM_PREAMBLE=7 (24 bytes), FEC_EN = 0 (disabled)
-     0x15, 0x34, //DEVIATN
-//     0x17, 0x00,
-     0x17, 0x3F, //MCSM1: TXOFF=RX, RXOFF=RX, CCA_MODE=3:If RSSI below threshold unless currently receiving a packet
-     0x18, 0x28, //MCSM0: PO_TIMEOUT=64, FS_AUTOCAL=2: When going from idle to RX or TX automatically
-     0x19, 0x16, //FOCCFG
-     0x1B, 0x43, //AGCTRL2
-     0x21, 0x56, //FREND1
-     0x25, 0x00, //FSCAL1
-     0x26, 0x11, //FSCAL0
-     0x0D, 0x21, //FREQ2
-     0x0E, 0x65, //FREQ1
-     0x0F, 0x6A, //FREQ0
-     0x07, 0x0C, //PKTCTRL1
-     0x16, 0x07, //MCSM2 RX_TIME = 7 (Timeout for sync word search in RX for both WOR mode and normal RX operation = Until end of packet) RX_TIME_QUAL=0 (check if sync word is found)
-     0x20, 0xF8, //WORCTRL, WOR_RES=00 (1.8-1.9 sec) EVENT1=7 (48, i.e. 1.333 – 1.385 ms)
-     0x1E, 0x87, //WOREVT1 EVENT0[high]
-     0x1F, 0x6B, //WOREVT0 EVENT0[low]
-     0x29, 0x59, //FSTEST
-     0x2C, 0x81, //TEST2
-     0x2D, 0x35, //TEST1
-     0x3E, 0xC3, //?? Readonly PATABLE?
-     0xff
-};
-
-static uint8_t autoAckAddr[3] = {0, 0, 0};
-static uint8_t fakeWallThermostatAddr[3] = {0, 0, 0};
-static uint32_t lastSendingTicks = 0;
-
-void
-rf_moritz_init(void)
-{
-  EIMSK &= ~_BV(CC1100_INT);                 // disable INT - we'll poll...
-  SET_BIT( CC1100_CS_DDR, CC1100_CS_PIN );   // CS as output
-
-  CC1100_DEASSERT;                           // Toggle chip select signal
-  my_delay_us(30);
-  CC1100_ASSERT;
-  my_delay_us(30);
-  CC1100_DEASSERT;
-  my_delay_us(45);
-
-  ccStrobe( CC1100_SRES );                   // Send SRES command
-  my_delay_us(100);
-
-  // load configuration
-  for (uint8_t i = 0; i<60; i += 2) {
-    if (pgm_read_byte( &MORITZ_CFG[i] )>0x40)
-      break;
-
-    cc1100_writeReg( pgm_read_byte(&MORITZ_CFG[i]),
-                     pgm_read_byte(&MORITZ_CFG[i+1]) );
-  }
-
-  ccStrobe( CC1100_SCAL );
-
-  my_delay_ms(4); // 4ms: Found by trial and error
-  //This is ccRx() but without enabling the interrupt
-  uint8_t cnt = 0xff;
-  //Enable RX. Perform calibration first if coming from IDLE and MCSM0.FS_AUTOCAL=1.
-  //Why do it multiple times?
-  while(cnt-- && (ccStrobe( CC1100_SRX ) & 0x70) != 1)
-    my_delay_us(10);
-
-  moritz_on = 1;
-}
-
-void
-moritz_handleAutoAck(uint8_t* enc)
-{
-  /* Debug ouput
-  DC('D');
-  DC('Z');
-  DH2(autoAckAddr[0]);
-  DH2(autoAckAddr[1]);
-  DH2(autoAckAddr[2]);
-  DC('-');
-  DH2(enc[0]);
-  DH2(enc[3]);
-  DH2(enc[7]);
-  DH2(enc[8]);
-  DH2(enc[9]);
-  DNL();
-  */
-
-  //Send acks to when required by "spec"
-  if((autoAckAddr[0] != 0 || autoAckAddr[1] != 0 || autoAckAddr[2] != 0) /* auto-ack enabled */
-      && (
-           enc[3] == 0x30 /* type ShutterContactState */
-        || enc[3] == 0x40 /* type SetTemperature */
-        || enc[3] == 0x50 /* type PushButtonState */
-        )
-      && enc[7] == autoAckAddr[0] /* dest */
-      && enc[8] == autoAckAddr[1]
-      && enc[9] == autoAckAddr[2])
-    moritz_sendAck(enc);
-
-  if((fakeWallThermostatAddr[0] != 0 || fakeWallThermostatAddr[1] != 0 || fakeWallThermostatAddr[2] != 0) /* fake enabled */
-      && enc[0] == 11 /* len */
-      && enc[3] == 0x40 /* type SetTemperature */
-      && enc[7] == fakeWallThermostatAddr[0] /* dest */
-      && enc[8] == fakeWallThermostatAddr[1]
-      && enc[9] == fakeWallThermostatAddr[2])
-    moritz_sendAck(enc);
-
-  return;
-}
-
-void
-rf_moritz_task(void)
-{
-  uint8_t enc[MAX_MORITZ_MSG];
-  uint8_t rssi;
-
-  if(!moritz_on)
-    return;
-
-  // see if a CRC OK pkt has been arrived
-  if(bit_is_set( CC1100_IN_PORT, CC1100_IN_PIN )) {
-    //errata #1 does not affect us, because we wait until packet is completely received
-    enc[0] = cc1100_readReg( CC1100_RXFIFO ) & 0x7f; // read len
-
-    if (enc[0]>=MAX_MORITZ_MSG)
-         enc[0] = MAX_MORITZ_MSG-1;
-
-    CC1100_ASSERT;
-    cc1100_sendbyte( CC1100_READ_BURST | CC1100_RXFIFO );
-
-    for (uint8_t i=0; i<enc[0]; i++) {
-         enc[i+1] = cc1100_sendbyte( 0 );
-    }
-
-    // RSSI is appended to RXFIFO
-    rssi = cc1100_sendbyte( 0 );
-    // And Link quality indicator, too
-    /* LQI = */ cc1100_sendbyte( 0 );
-
-    CC1100_DEASSERT;
-
-    moritz_handleAutoAck(enc);
-
-    if (tx_report & REP_BINTIME) {
-
-      DC('z');
-      for (uint8_t i=0; i<=enc[0]; i++)
-      DC( enc[i] );
-    } else {
-      DC('Z');
-      for (uint8_t i=0; i<=enc[0]; i++)
-        DH2( enc[i] );
-      if (tx_report & REP_RSSI)
-        DH2(rssi);
-      DNL();
-    }
-
-    return;
-  }
-
-  if(cc1100_readReg( CC1100_MARCSTATE ) == 17) {
-    ccStrobe( CC1100_SFRX  );
-    ccStrobe( CC1100_SIDLE );
-    ccStrobe( CC1100_SRX   );
-  }
-}
-
-void
-moritz_send(char *in)
-{
-  /* we are not affected by CC1101 errata #6, because MDMCFG2.SYNC_MODE != 0 */
-  uint8_t dec[MAX_MORITZ_MSG];
-
-  uint8_t hblen = fromhex(in+1, dec, MAX_MORITZ_MSG-1);
-
-  if ((hblen-1) != dec[0]) {
-    DS_P(PSTR("LENERR\r\n"));
-    return;
-  }
-  moritz_sendraw(dec, 1);
-}
-
-/* longPreamble is necessary for unsolicited messages to wakeup the receiver */
-void
-moritz_sendraw(uint8_t *dec, int longPreamble)
-{
-  uint8_t hblen = dec[0]+1;
-  //1kb/s = 1 bit/ms. we send 1 sec preamble + hblen*8 bits
-  uint32_t sum = (longPreamble ? 100 : 0) + (hblen*8)/10;
-  if (credit_10ms < sum) {
-    DS_P(PSTR("LOVF\r\n"));
-    return;
-  }
-  credit_10ms -= sum;
-
-  // in Moritz mode already?
-  if(!moritz_on) {
-    rf_moritz_init();
-  }
-
-  if(cc1100_readReg( CC1100_MARCSTATE ) != MARCSTATE_RX) { //error
-    DC('Z');
-    DC('E');
-    DC('R');
-    DC('R');
-    DC('1');
-    DH2(cc1100_readReg( CC1100_MARCSTATE ));
-    DNL();
-    rf_moritz_init();
-    return;
-  }
-
-  /* We have to keep at least 20 ms of silence between two sends
-   * (found out by trial and error). ticks runs at 125 Hz (8 ms per tick),
-   * so we wait for 3 ticks.
-   * This looks a bit cumbersome but handles overflows of ticks gracefully.
-   */
-  if(lastSendingTicks)
-    while(ticks == lastSendingTicks || ticks == lastSendingTicks+1)
-      my_delay_ms(1);
-
-  /* Enable TX. Perform calibration first if MCSM0.FS_AUTOCAL=1 (this is the case) (takes 809μs)
-   * start sending - CC1101 will send preamble continuously until TXFIFO is filled.
-   * The preamble will wake up devices. See http://e2e.ti.com/support/low_power_rf/f/156/t/142864.aspx
-   * It will not go into TX mode instantly if channel is not clear (see CCA_MODE), thus ccTX tries multiple times */
-  ccTX();
-
-  if(cc1100_readReg( CC1100_MARCSTATE ) != MARCSTATE_TX) { //error
-    DC('Z');
-    DC('E');
-    DC('R');
-    DC('R');
-    DC('2');
-    DH2(cc1100_readReg( CC1100_MARCSTATE ));
-    DNL();
-    rf_moritz_init();
-    return;
-  }
-
-  if(longPreamble) {
-    /* Send preamble for 1 sec. Keep in mind that waiting for too long may trigger the watchdog (2 seconds on CUL) */
-    for(int i=0;i<10;++i)
-      my_delay_ms(100); //arg is uint_8, so loop
-  }
-
-  // send
-  CC1100_ASSERT;
-  cc1100_sendbyte(CC1100_WRITE_BURST | CC1100_TXFIFO);
-
-  for(uint8_t i = 0; i < hblen; i++) {
-    cc1100_sendbyte(dec[i]);
-  }
-
-  CC1100_DEASSERT;
-
-  //Wait for sending to finish (CC1101 will go to RX state automatically
-  //after sending
-  uint8_t i;
-  for(i=0; i< 200;++i) {
-    if( cc1100_readReg( CC1100_MARCSTATE ) == MARCSTATE_RX)
-      break; //now in RX, good
-    if( cc1100_readReg( CC1100_MARCSTATE ) != MARCSTATE_TX)
-      break; //neither in RX nor TX, probably some error
-    my_delay_ms(1);
-  }
-
-  if(cc1100_readReg( CC1100_MARCSTATE ) != MARCSTATE_RX) { //error
-    DC('Z');
-    DC('E');
-    DC('R');
-    DC('R');
-    DC('3');
-    DH2(cc1100_readReg( CC1100_MARCSTATE ));
-    DNL();
-    rf_moritz_init();
-  }
-
-  if(!moritz_on) {
-    set_txrestore();
-  }
-  lastSendingTicks = ticks;
-}
-
-void
-moritz_sendAck(uint8_t* enc)
-{
-  uint8_t ackPacket[12];
-  ackPacket[0] = 11; /* len*/
-  ackPacket[1] = enc[1]; /* msgcnt */
-  ackPacket[2] = 0; /* flag */
-  ackPacket[3] = 2; /* type = Ack */
-  for(int i=0;i<3;++i) /* src = enc_dst*/
-    ackPacket[4+i] = enc[7+i];
-  for(int i=0;i<3;++i) /* dst = enc_src */
-    ackPacket[7+i] = enc[4+i];
-  ackPacket[10] = 0; /* groupid */
-  ackPacket[11] = 0; /* payload */
-
-  my_delay_ms(20); /* by experiments */
-
-  moritz_sendraw(ackPacket, 0);
-
-  //Inform FHEM that we send an autoack
-  DC('Z');
-  for (uint8_t i=0; i < ackPacket[0]+1; i++)
-    DH2( ackPacket[i] );
-  if (tx_report & REP_RSSI)
-    DH2( 0 ); //fake some rssi
-  DNL();
-}
-
-void
-moritz_func(char *in)
-{
-  if(in[1] == 'r') {                // Reception on
-    rf_moritz_init();
-
-  } else if(in[1] == 's' || in[1] == 'f' ) {         // Send/Send fast
-    uint8_t dec[MAX_MORITZ_MSG];
-    uint8_t hblen = fromhex(in+2, dec, MAX_MORITZ_MSG-1);
-    if ((hblen-1) != dec[0]) {
-      DS_P(PSTR("LENERR\r\n"));
-      return;
-    }
-    moritz_sendraw(dec, in[1] == 's');
-
-  } else if(in[1] == 'a') {         // Auto-Ack
-    fromhex(in+2, autoAckAddr, 3);
-
-  } else if(in[1] == 'w') {         // Fake Wall-Thermostat
-    fromhex(in+2, fakeWallThermostatAddr, 3);
-
-  } else {                          // Off
-    moritz_on = 0;
-
-  }
-}
-
-#endif