Merge pull request #39 from wulffern/develop

Develop

Author: wulffern

.buildstatus_develop

@@ -0,0 +1,9 @@
+Date: Sun May 21 08:55:17 CEST 2017
+Error: 1 
+Message: 
+Compile OK
+LVS ALGIC001_SAR9B_CV FAIL
+LVS ALGIC002_SAR9B_EV OK
+LVS ALGIC004_SAR9BXL_CV FAIL
+LVS ALGIC005_SAR9BXLC_CV FAIL
+

Makefile

@@ -25,15 +25,18 @@ CMD=time ../bin/cic
 ifeq ($(OS),Windows_NT)
 	#- Not compatible with windows yet
 OSNAME=Windows
+OSBIN=windows
 GDS3D=WINDOWS
 else
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
 OSNAME=macOS
+OSBIN=darwin
 GDS3D=GDS3D/mac/GDS3D.app/Contents/MacOS/GDS3D
 endif
 ifeq ($(UNAME_S),Linux)
 OSNAME=Linux
+OSBIN=linux
 GDS3D=GDS3D/linux/GDS3D
 endif
 endif
@@ -48,6 +51,9 @@ lay:
 qmake:
 	qmake -o qmake.make ciccreator.pro 
 
+windeploy:
+	windeployqt bin/windows/cic-gui.exe
+
 xcode:
 	qmake -o qmake.make ciccreator.pro -spec  macx-xcode
 
@@ -84,17 +90,27 @@ minecraft: lay
 routes: lay
 	cd lay; ${CMD} ${EXAMPLE}/routes.json ${TECHFILE} routes ${OPT}
 
+esscircbulk:
+	cd examples; cp ${LIBNAME}.json SAR_ESSCIRC16_28NBULK.json
+	cd examples; cp ${LIBNAME}.hier SAR_ESSCIRC16_28NBULK.hier
+	${MAKE}	esscirc LIBNAME=SAR_ESSCIRC16_28NBULK
+
 esscirc: lay
-	cd lay; ${CMD} ${EXAMPLE}/${LIBNAME}.json ${TECHFILE} ${LIBNAME} ${OPT}
-	./scripts/cics2spice  lay/SAR_ESSCIRC16_28N.cics  lay/SAR_ESSCIRC16_28N.spice
-	cd lay	; ../bin/cic2eps ${EXAMPLE}/${LIBNAME}.json ${EXAMPLE}/tech_eps.json ${CELL}
-	cd lay	; ../bin/cic2png ${EXAMPLE}/${LIBNAME}.json ${TECHFILE} ${EXAMPLE}/${LIBNAME}.hier 
 
-view: lay
-	cd lay; ../bin/cic-gui ${TECHFILE} ${LIBNAME}.cicl &
+	cd lay; ../bin/${OSBIN}/cic ${EXAMPLE}/${LIBNAME}.json ${TECHFILE} ${LIBNAME} ${OPT}
+	-./scripts/cics2aimspice  lay/${LIBNAME}.cics  lay/${LIBNAME}.spice
+	cd lay	; ../bin/${OSBIN}/cic2eps ${EXAMPLE}/${LIBNAME}.json ${EXAMPLE}/tech_eps.json ${CELL}
+	cd lay	; ../bin/${OSBIN}/cic2png ${EXAMPLE}/${LIBNAME}.json ${TECHFILE} ${EXAMPLE}/${LIBNAME}.hier
+
 
+view: lay
+ifeq ($(UNAME_S),Darwin)
+	cd lay; ../bin/darwin/cic-gui.app/Contents/MacOS/cic-gui ${TECHFILE} ${LIBNAME}.cicl &
+else
+	cd lay; ../bin/${OSBIN}/cic-gui ${TECHFILE} ${LIBNAME}.cicl &
+endif
 view-routes: lay
-	cd lay; ../bin/cic-gui ${TECHFILE} routes.json &
+	cd lay; ../bin/${OSBIN}/cic-gui ${TECHFILE} routes.json &
 
 GDS3D:
 	wget https://sourceforge.net/projects/gds3d/files/GDS3D%201.8/GDS3D_1.8.tar.bz2/download

README.md

@@ -1,5 +1,5 @@
 # ciccreator
-Back in 2013 I started playing with the thought of generating a SAR ADC with a script, such that it would be easy to port between technologies. The prototype was written in Perl, and contained 16k lines of code. The Perl compiler is closed source, and not available outside NTNU. cIcCreator is the C++ version, it's been written from scratch to support the same input files as the Perl compiler, but with a vastly improved performance. 
+Back in 2013 I started playing with the thought of generating a SAR ADC with a script, such that it would be easy to port between technologies. The prototype was written in Perl, and contained 16k lines of code. The Perl compiler is closed source, and not available outside NTNU. cIcCreator is the C++ version, it's been written from scratch to support the same input files as the Perl compiler, but with a vastly improved performance.   
 
 # Master plan, part 1
 :white_check_mark: Create prototype of compiler in Perl that can compile SAR ADCs (Aug 2014) 
@@ -10,7 +10,7 @@ Back in 2013 I started playing with the thought of generating a SAR ADC with a s
 
 :white_check_mark: Rewrite the compiler in C++ under a GPL license and compile equivalent GDS with Perl compiler (Nov 2016)
 
-:x: Encourage development of open source, free IP blocks for academic use 
+:white_check_mark: Encourage development of open source, free IP blocks for academic use ([Open Source Custom IC Creator packages](https://github.com/wulffern/oscic))
 
 The vision is that "Custom IC Creator" will be a rapid layout generation tool for SAR ADCs. 
 
@@ -20,22 +20,55 @@ The vision is that "Custom IC Creator" will be a rapid layout generation tool fo
 # Compile
 Install > Qt5.4 (i.e http://download.qt.io/archive/qt/5.4/5.4.2/qt-opensource-linux-x64-5.4.2.run), and edit bashrc.config to point to your Qt5.4 path, then
 
+On Linux or Mac:
+
     source bashrc.config
     make
 
+On Windows, make sure you install MinGW > 4.9.2 with the Qt installation. Open console (Start - Qt - 5.x - MinGW  - Qt5.x for Desktop).
+
+    mingw32-make
+
+
 # Test
+On Linux or Mac:
 
     make esscirc
 
+On Windows:
+
+    mingw32-make esscirc
+
 # Viewing
 Open GDSII file or open built in viewer
 
+On Linux or Mac:
+
     make view
 
-Or you can use GDS3D from https://sourceforge.net/projects/gds3d/ 
+On Windows:
+
+    mingw32-make view
+
+Or on Linux or Mac you can use GDS3D from https://sourceforge.net/projects/gds3d/ 
 
     make view3d
 
+
+# Simulation
+The spice file that comes out of ciccreator is compatible with
+AimSpice (http://www.aimspice.com).
+
+
+On Mac: 
+- Install AimSpice
+- Run:
+
+	make esscircbulk
+- Open aimspice
+- Open sim/tb_sarbssw.cir
+- Press run
+
 # cIcCreator in action
 
 Minecraft video - https://youtu.be/J9lhEt0f3Wk 

bin/start_script.sh

@@ -47,8 +47,16 @@ if [ $platform == "darwin" ]; then
 	else
 		$dirname/${platform}/${appname} "$@"
 	fi
-fi
 
+else
+
+    export PATH=$dirname/windows/:$PATH
+    echo $PATH
+    execfile=$dirname/windows/${appname}.exe
+    if [ -f "$execfile" ]; then
+	$execfile "$@"
+    fi
+fi
 
 
 

cic-core/cic-core.pro

@@ -30,12 +30,13 @@
 
   osx:DESTDIR = ../lib/darwin
   linux:DESTDIR = ../lib/linux
+  win32:DESTDIR = ../lib/windows
 
   #- Add coverage information
   QMAKE_CFLAGS += $$(CFLAGS)
-                  QMAKE_LFLAGS += $$(LDFLAGS)
+  QMAKE_LFLAGS += $$(LDFLAGS)
 
-                  TARGET = cic
+  TARGET = cic
 
   OBJECTS_DIR=build
   MOC_DIR=build

cic-core/external/libgds_dist/write_gds_examples

@@ -37,28 +37,36 @@ void ConsoleOutput::startComment(QTextStream &out,AnsiColor color){
   out.setFieldAlignment(QTextStream::AlignRight);
   out << " ";
   out.setFieldWidth(0);
+#ifndef _WIN32
   out << "\033[0;" << color << "m";
+#endif
   out.setFieldAlignment(QTextStream::AlignLeft);
   out.setFieldWidth(20);
   out.setPadChar(' ');
 }
 
 void ConsoleOutput::endComment(QTextStream &out){
   out.setFieldWidth(1);
+#ifndef _WIN32
   out << "\033[0m" ;
+#endif
   out << endl;
 }
 
  void ConsoleOutput::commentStartClass(QString cell){
    QTextStream out(stdout);
    out.setFieldWidth(0);
+#ifndef _WIN32
    out << "\033[1;" << green << "m";
+#endif
    out.setFieldAlignment(QTextStream::AlignLeft);
    out.setFieldWidth(20);
    out.setPadChar(' ');
    out <<  cell;
    out.setFieldWidth(1);
+#ifndef _WIN32
     out << "\033[0m" ;
+#endif
    out << endl;
 
  }
@@ -69,7 +77,9 @@ void ConsoleOutput::endComment(QTextStream &out){
    out.setFieldAlignment(QTextStream::AlignRight);
    out << " ";
    out.setFieldWidth(0);
+#ifndef _WIN32
    out << "\033[0;" << color << "m";
+#endif
    out.setFieldAlignment(QTextStream::AlignLeft);
    out.setFieldWidth(0);
    out.setPadChar(' ');

cic-core/src/core/consoleoutput.cpp

@@ -52,24 +52,79 @@ namespace cIcCore{
         cellTranslator["Layout::LayoutCapCellSmall"] = "cIcCells::CapCell";
         nameTranslator["type"] = "mosType";
         console = new ConsoleOutput();
+        readError = false;
+        ignoreSetYoffsetHalf = false;
+        
+    }
+
+    bool fexists(const char *filename)
+    {
+        if (FILE *file = fopen(filename, "r")) {
+            fclose(file);
+            return true;
+        } else {
+            return false;
+        } 
 
     }
 
+    void Design::addIncludePath(QString filename)
+    {
+        _includePaths.append(filename);
+    }
+    
+
     bool Design::readCells(QString filename)
     {
         // Read file
         QString spice_file = filename;
         spice_file.replace(".json",".spi");
         _spice_parser.parseFile(spice_file);
+
+        console->comment("Reading '" + filename + "'",ConsoleOutput::green);
         QJsonObject obj = this->readJson( filename);
 
+        if(readError){
+            return false;
+        }
+
+        //Read options
+        QJsonValue options = obj["options"];
+        if(options.isObject()){
+            QJsonObject opt = options.toObject();
+            if(opt.contains("ignoreSetYoffsetHalf")){
+                ignoreSetYoffsetHalf = opt["ignoreSetYoffsetHalf"].toBool();
+            }
+        }
+        
+        
+
         //Read includes
         QJsonValue include = obj["include"];
         if(include.isArray()){
             QJsonArray includeArray  = include.toArray();
-            foreach (const QJsonValue & value, includeArray) {
+            foreach (const QJsonValue & value, includeArray) { 
                 QString incfile = value.toString();
-                this->readCells(incfile);
+                qDebug() << incfile;
+                
+                if(fexists(incfile.toStdString().c_str())){
+                    if(!this->readCells(incfile))
+                    {
+                        return false;
+                        
+                    }
+                    
+                }
+                
+                foreach (QString incpath,_includePaths){
+                    QString incf = QString("%1/%2").arg(incpath).arg(incfile);
+                    qDebug() << incf;
+                    if(fexists(incf.toStdString().c_str())){
+                        this->readCells(incf);
+                    }
+
+                }
+                
             }
 
 
@@ -390,7 +445,10 @@ namespace cIcCore{
 
         foreach( QString key, jobj.keys()){
             if(re.match(key).hasMatch()){ continue;}
-
+            if( ignoreSetYoffsetHalf && key == "setYoffsetHalf"){continue;}
+            
+            
+                
             QString method_key = key;
             if(nameTranslator.contains(key)){
                 method_key = nameTranslator[key];
@@ -508,6 +566,8 @@ namespace cIcCore{
         QJsonParseError err;
         QJsonDocument d = QJsonDocument::fromJson(val.toUtf8(),&err);
         if(QJsonParseError::NoError != err.error ){
+            readError = true;
+            
             QString verr = val.mid(0,err.offset);
             int charcount =0;
             int line_count = 0;